merge upstream

# Conflicts:
#	fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppAuthController.java

@@ -4,14 +4,13 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.fuyuanshen.app.model.AppSmsLoginBody;
 import com.fuyuanshen.app.service.AppLoginService;
 import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.domain.model.AppLoginBody;
-import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
+import com.fuyuanshen.common.core.domain.model.AppSmsRegisterBody;
+import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
 import com.fuyuanshen.common.core.utils.*;
-import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.tenant.helper.TenantHelper;
@@ -24,8 +23,8 @@ import com.fuyuanshen.system.service.ISysTenantService;
 import com.fuyuanshen.web.domain.vo.LoginTenantVo;
 import com.fuyuanshen.web.domain.vo.LoginVo;
 import com.fuyuanshen.web.domain.vo.TenantListVo;
+import com.fuyuanshen.web.service.AppRegisterService;
 import com.fuyuanshen.web.service.IAuthStrategy;
-import com.fuyuanshen.web.service.SysRegisterService;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -51,7 +50,7 @@ import java.util.List;
 public class AppAuthController {
 
     private final AppLoginService loginService;
-    private final SysRegisterService registerService;
+    private final AppRegisterService registerService;
     private final ISysConfigService configService;
     private final ISysTenantService tenantService;
     private final ISysClientService clientService;
@@ -64,15 +63,15 @@ public class AppAuthController {
      */
 //    @ApiEncrypt
     @PostMapping("/login")
-    public R<LoginVo> login(@RequestBody AppSmsLoginBody appSmsLoginBody) {
+    public R<LoginVo> login(@RequestBody AppLoginBody appLoginBody) {
 //        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
-        ValidatorUtils.validate(appSmsLoginBody);
+        ValidatorUtils.validate(appLoginBody);
-        SmsLoginBody loginBody = new SmsLoginBody();
+        PasswordLoginBody loginBody = new PasswordLoginBody();
-        loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber());
+        loginBody.setUsername(appLoginBody.getUserName());
-        loginBody.setSmsCode(appSmsLoginBody.getSmsCode());
+        loginBody.setPassword(appLoginBody.getPassword());
-        loginBody.setTenantId(appSmsLoginBody.getTenantId());
+        loginBody.setTenantId(appLoginBody.getTenantId());
-        loginBody.setClientId("ca839698e245d60aa2f0e59bd52b34f8");
+        loginBody.setClientId("835b15335d389c9fcfdf99421fa8019b");
-        loginBody.setGrantType("appSms");
+        loginBody.setGrantType("appPassword");
         // 授权类型和客户端id
         String clientId = loginBody.getClientId();
         String grantType = loginBody.getGrantType();
@@ -100,19 +99,15 @@ public class AppAuthController {
      */
     @PostMapping("/logout")
     public R<Void> logout() {
-        loginService.logout();
+//        loginService.logout();
         return R.ok("退出成功");
     }
 
     /**
      * 用户注册
      */
-    @ApiEncrypt
     @PostMapping("/register")
-    public R<Void> register(@Validated @RequestBody RegisterBody user) {
+    public R<Void> register(@Validated @RequestBody AppSmsRegisterBody user) {
-        if (!configService.selectRegisterEnabled(user.getTenantId())) {
-            return R.fail("当前系统没有开启注册功能！");
-        }
         registerService.register(user);
         return R.ok();
     }

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceController.java

@@ -1,19 +1,16 @@
 package com.fuyuanshen.app.controller;
 
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.APPReNameDTO;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.app.service.equipment.APPDeviceService;
-import com.fuyuanshen.app.service.AppDeviceBizService;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
-import jakarta.validation.constraints.NotNull;
+import com.fuyuanshen.equipment.service.DeviceService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -21,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * APP设备信息管理
+ * APP 设备信息管理
  */
 @Validated
 @RequiredArgsConstructor
@@ -29,16 +26,18 @@ import java.util.List;
 @RequestMapping("/app/device")
 public class AppDeviceController extends BaseController {
 
-    private final AppDeviceBizService appDeviceService;
+    private final DeviceService deviceService;
 
 
+    private final APPDeviceService appDeviceService;
+
     /**
      * 查询设备列表
      */
     @GetMapping("/list")
     public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
 
-        return appDeviceService.queryAppDeviceList(bo,pageQuery);
+        return deviceService.queryAppDeviceList(bo,pageQuery);
     }
 
     /**
@@ -46,7 +45,7 @@ public class AppDeviceController extends BaseController {
      */
     @PostMapping("/bind")
     public R<Void> bind(@RequestBody AppDeviceBo bo) {
-        return toAjax(appDeviceService.bindDevice(bo));
+        return toAjax(deviceService.bindDevice(bo));
     }
 
 
@@ -55,7 +54,7 @@ public class AppDeviceController extends BaseController {
      */
     @DeleteMapping("/unBind")
     public R<Void> unBind(Long id) {
-        return toAjax(appDeviceService.unBindDevice(id));
+        return toAjax(deviceService.unBindDevice(id));
     }
 
     /**
@@ -77,31 +76,4 @@ public class AppDeviceController extends BaseController {
         appDeviceService.reName(reNameDTO);
         return R.ok("重命名成功！！！");
     }
-
-    /**
-     * 获取设备详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                             @PathVariable Long id) {
-        return R.ok(appDeviceService.getInfo(id));
-    }
-
-    /**
-     * 人员信息登记
-     */
-    @PostMapping(value = "/registerPersonInfo")
-    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService.registerPersonInfo(bo));
-    }
-
-    /**
-     * 发送信息
-     */
-    @PostMapping(value = "/sendMessage")
-    public R<Void> sendMessage(@RequestBody AppDeviceBo bo) {
-        return toAjax(appDeviceService.sendMessage(bo));
-    }
 }

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java

@@ -1,110 +0,0 @@
-package com.fuyuanshen.app.controller;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import cn.hutool.core.util.RandomUtil;
-import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.app.service.AppDeviceShareService;
-import com.fuyuanshen.app.service.IAppDeviceShareService;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.validate.AddGroup;
-import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.web.core.BaseController;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
-import lombok.RequiredArgsConstructor;
-import org.dromara.sms4j.api.SmsBlend;
-import org.dromara.sms4j.api.entity.SmsResponse;
-import org.dromara.sms4j.core.factory.SmsFactory;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.Duration;
-import java.util.LinkedHashMap;
-
-import static com.fuyuanshen.common.core.constant.GlobalConstants.DEVICE_SHARE_CODES_KEY;
-
-/**
- * APP 设备分享
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/app/deviceShare")
-public class AppDeviceShareController extends BaseController {
-
-    private final IAppDeviceShareService deviceShareService;
-
-    private final AppDeviceShareService appDeviceShareService;
-
-    /**
-     * 分享管理列表
-     */
-    @GetMapping("/deviceShareList")
-    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
-        return deviceShareService.queryPageList(bo, pageQuery);
-    }
-
-    /**
-     * 获取设备分享详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<AppDeviceShareDetailVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(appDeviceShareService.getInfo(id));
-    }
-
-    /**
-     * 新增设备分享
-     */
-    @RepeatSubmit()
-    @PostMapping("/deviceShare")
-    public R<Void> deviceShare(@Validated(AddGroup.class) @RequestBody AppDeviceShareBo bo) {
-        return toAjax(appDeviceShareService.deviceShare(bo));
-    }
-
-    /**
-     * 移除分享用户
-     *
-     * @param ids 主键串
-     */
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Long[] ids) {
-        return toAjax(appDeviceShareService.remove(ids));
-    }
-
-    /**
-     * 短信验证码
-     *
-     * @param phonenumber 用户手机号
-     */
-    @SaIgnore
-    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
-    @GetMapping("/sms/code")
-    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
-        String key = DEVICE_SHARE_CODES_KEY + phonenumber;
-        String code = RandomUtil.randomNumbers(4);
-        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-        map.put("code", code);
-        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
-        if (!smsResponse.isSuccess()) {
-            return R.fail(smsResponse.getData().toString());
-        }
-        return R.ok();
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppUserController.java

@@ -0,0 +1,62 @@
+package com.fuyuanshen.app.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fuyuanshen.app.domain.dto.APPForgotPasswordDTO;
+import com.fuyuanshen.app.domain.dto.APPForgotPasswordSmsDTO;
+import com.fuyuanshen.app.domain.dto.APPUpdateUserDTO;
+import com.fuyuanshen.app.domain.vo.APPUserInfoVo;
+import com.fuyuanshen.app.service.IAppUserService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * APP 用户管理
+ * @date 2025-06-27
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/user")
+public class AppUserController extends BaseController {
+
+    private final IAppUserService appUserService;
+
+    /**
+     * 个人中心
+     */
+    @GetMapping("/getUserInfo")
+    public R<APPUserInfoVo> getUserInfo() {
+        return R.ok(appUserService.getUserInfo());
+    }
+
+    /**
+     * 修改个人信息
+     */
+    @PostMapping("/updateUser")
+    public R<Void> updateUser(@Validated @ModelAttribute APPUpdateUserDTO bo) {
+        return toAjax(appUserService.updateUser(bo));
+    }
+
+    /**
+     * 忘记密码
+     */
+    @SaIgnore
+    @PostMapping("/forgotPassword")
+    public R<Void> forgotPassword(@RequestBody APPForgotPasswordDTO bo) {
+        return toAjax(appUserService.forgotPassword(bo));
+    }
+
+
+
+    /**
+     * 发送忘记密码短信
+     */
+    @SaIgnore
+    @PostMapping("/sendForgotPasswordSms")
+    public R<Void> sendForgotPasswordSms(@Validated @RequestBody APPForgotPasswordSmsDTO dto) throws Exception {
+        return toAjax(appUserService.sendForgotPasswordSms(dto));
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java

@@ -1,167 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fuyuanshen.app.domain.AppPersonnelInfo;
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
-import com.fuyuanshen.app.domain.dto.APPReNameDTO;
-import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
-import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
-import com.fuyuanshen.common.core.utils.MapstructUtils;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
-import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
-import com.fuyuanshen.equipment.enums.BindingStatusEnum;
-import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AppDeviceBizService {
-
-    private final APPDeviceMapper appDeviceMapper;
-    private final DeviceMapper deviceMapper;
-    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
-    private final DeviceTypeMapper deviceTypeMapper;
-
-
-    public List<APPDeviceTypeVo> getTypeList() {
-        Long userId = AppLoginHelper.getUserId();
-        return appDeviceMapper.getTypeList(userId);
-    }
-
-    public void reName(APPReNameDTO reNameDTO) {
-        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", reNameDTO.getId())
-                .eq("binding_user_id", AppLoginHelper.getUserId())
-                .set("device_name", reNameDTO.getDeviceName());
-        deviceMapper.update(updateWrapper);
-    }
-
-
-    public int sendMessage(AppDeviceBo bo) {
-        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", bo.getDeviceId())
-                .eq("binding_user_id", AppLoginHelper.getUserId())
-                .set("send_msg", bo.getSendMsg());
-        return deviceMapper.update(updateWrapper);
-    }
-
-
-    public TableDataInfo<AppDeviceVo> queryAppDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
-        if (bo.getBindingUserId() == null) {
-            Long userId = AppLoginHelper.getUserId();
-            bo.setBindingUserId(userId);
-        }
-        Page<AppDeviceVo> result = deviceMapper.queryAppBindDeviceList(pageQuery.build(), bo);
-        return TableDataInfo.build(result);
-    }
-
-    public int bindDevice(AppDeviceBo bo) {
-        Integer mode = bo.getCommunicationMode();
-        Long userId = AppLoginHelper.getUserId();
-        if (mode == CommunicationModeEnum.FOUR_G.getValue()) {
-
-            String deviceImei = bo.getDeviceImei();
-            QueryWrapper<Device> qw = new QueryWrapper<Device>()
-                    .eq("device_imei", deviceImei);
-            List<Device> devices = deviceMapper.selectList(qw);
-            if (devices.isEmpty()) {
-                throw new RuntimeException("请先将设备入库！！！");
-            }
-            Device device = devices.get(0);
-            if (device.getBindingStatus() != null && device.getBindingStatus() == BindingStatusEnum.BOUND.getCode()) {
-                throw new RuntimeException("设备已绑定");
-            }
-            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-            deviceUpdateWrapper.eq("id", device.getId())
-                    .set("binding_status", BindingStatusEnum.BOUND.getCode())
-                    .set("binding_user_id", userId)
-                    .set("binding_time", new Date());
-
-
-            return deviceMapper.update(null, deviceUpdateWrapper);
-        } else if (mode == CommunicationModeEnum.BLUETOOTH.getValue()) {
-            String deviceMac = bo.getDeviceMac();
-            QueryWrapper<Device> qw = new QueryWrapper<Device>()
-                    .eq("device_mac", deviceMac);
-            List<Device> devices = deviceMapper.selectList(qw);
-            if (devices.isEmpty()) {
-                throw new RuntimeException("请先将设备入库！！！");
-            }
-            Device device = devices.get(0);
-            if (device.getBindingStatus() != null && device.getBindingStatus() == BindingStatusEnum.BOUND.getCode()) {
-                throw new RuntimeException("设备已绑定");
-            }
-            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-            deviceUpdateWrapper.eq("id", device.getId())
-                    .set("binding_status", BindingStatusEnum.BOUND.getCode())
-                    .set("binding_user_id", userId)
-                    .set("binding_time", new Date());
-            return deviceMapper.update(null, deviceUpdateWrapper);
-        } else {
-            throw new RuntimeException("通讯方式错误");
-        }
-
-    }
-
-    public int unBindDevice(Long id) {
-        Device device = deviceMapper.selectById(id);
-        if (device == null) {
-            throw new RuntimeException("请先将设备入库！！！");
-        }
-        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-        deviceUpdateWrapper.eq("id", device.getId())
-                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
-                .set("binding_user_id", null)
-                .set("binding_time", null);
-        return deviceMapper.update(null, deviceUpdateWrapper);
-    }
-
-    public AppDeviceDetailVo getInfo(Long id) {
-        Device device = deviceMapper.selectById(id);
-        AppDeviceDetailVo vo = new AppDeviceDetailVo();
-        vo.setDeviceId(device.getId());
-        vo.setDeviceName(device.getDeviceName());
-        vo.setDevicePic(device.getDevicePic());
-        vo.setDeviceImei(device.getDeviceImei());
-        vo.setDeviceMac(device.getDeviceMac());
-        vo.setDeviceStatus(device.getDeviceStatus());
-        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        if(deviceType!=null){
-            vo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
-            vo.setTypeName(deviceType.getTypeName());
-        }
-        vo.setBluetoothName(device.getBluetoothName());
-
-        AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectById(device.getId());
-        if(appPersonnelInfo != null){
-            AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
-            vo.setPersonnelInfo(personnelInfoVo);
-        }
-        return vo;
-    }
-
-    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
-        AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
-        return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java

@@ -1,135 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import com.fuyuanshen.app.domain.AppPersonnelInfo;
-import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
-import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.exception.ServiceException;
-import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
-import com.fuyuanshen.common.core.utils.MessageUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class AppDeviceShareService {
-
-    private final AppDeviceShareMapper appDeviceShareMapper;
-    
-    private final DeviceMapper deviceMapper;
-
-    private final DeviceTypeMapper deviceTypeMapper;
-
-    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
-
-    public AppDeviceShareDetailVo getInfo(Long id) {
-
-        LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AppDeviceShare::getDeviceId, id);
-        List<AppDeviceShareVo> appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper);
-        if(appDeviceShareVos==null || appDeviceShareVos.isEmpty()){
-            return null;
-        }
-
-        AppDeviceShareVo shareVo = appDeviceShareVos.get(0);
-        AppDeviceShareDetailVo shareDetailVo = new AppDeviceShareDetailVo();
-        shareDetailVo.setId(shareVo.getId());
-        shareDetailVo.setDeviceId(shareVo.getDeviceId());
-        shareDetailVo.setPhonenumber(shareVo.getPhonenumber());
-        shareDetailVo.setPermission(shareVo.getPermission());
-
-        Device device = deviceMapper.selectById(shareVo.getDeviceId());
-        shareDetailVo.setDeviceName(device.getDeviceName());
-        shareDetailVo.setDeviceImei(device.getDeviceImei());
-        shareDetailVo.setDeviceMac(device.getDeviceMac());
-
-        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        if(deviceType!=null){
-            shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
-        }
-        shareDetailVo.setDevicePic(device.getDevicePic());
-        shareDetailVo.setTypeName(deviceType.getTypeName());
-        shareDetailVo.setBluetoothName(device.getBluetoothName());
-        shareDetailVo.setDeviceStatus(device.getDeviceStatus());
-        shareDetailVo.setSendMsg(device.getSendMsg());
-
-        LambdaQueryWrapper<AppPersonnelInfo> qw = new LambdaQueryWrapper<>();
-        qw.eq(AppPersonnelInfo::getDeviceId, device.getId());
-        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
-        if(appPersonnelInfoVos!=null && !appPersonnelInfoVos.isEmpty()){
-            shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0));
-        }
-
-        return shareDetailVo;
-    }
-    /**
-     * 校验短信验证码
-     */
-    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
-        String code = RedisUtils.getCacheObject(GlobalConstants.DEVICE_SHARE_CODES_KEY + phonenumber);
-        if (StringUtils.isBlank(code)) {
-            throw new ServiceException("验证码失效");
-        }
-        return code.equals(smsCode);
-    }
-    public int deviceShare(AppDeviceShareBo bo) {
-        boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode());
-        if(!flag){
-            throw new ServiceException("验证码错误");
-        }
-
-        Device device = deviceMapper.selectById(bo.getDeviceId());
-        if(device==null){
-            throw new ServiceException("设备不存在");
-        }
-        Long userId = AppLoginHelper.getUserId();
-        LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
-        lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
-        lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());
-        Long count = appDeviceShareMapper.selectCount(lqw);
-        if(count>0){
-
-            UpdateWrapper<AppDeviceShare> uw = new UpdateWrapper<>();
-            uw.eq("device_id", bo.getDeviceId());
-            uw.eq("phonenumber", bo.getPhonenumber());
-            uw.set("permission", bo.getPermission());
-            uw.set("update_by", userId);
-            uw.set("update_time", new Date());
-
-            return appDeviceShareMapper.update(uw);
-        }else {
-            AppDeviceShare appDeviceShare = new AppDeviceShare();
-            appDeviceShare.setDeviceId(bo.getDeviceId());
-            appDeviceShare.setPhonenumber(bo.getPhonenumber());
-            appDeviceShare.setPermission(bo.getPermission());
-            appDeviceShare.setCreateBy(userId);
-            return appDeviceShareMapper.insert(appDeviceShare);
-        }
-    }
-
-    public int remove(Long[] ids) {
-        return appDeviceShareMapper.deleteByIds(Arrays.asList(ids));
-    }
-}

fys-admin/src/main/java/com/fuyuanshen/app/service/AppLoginService.java

@@ -2,14 +2,11 @@ package com.fuyuanshen.app.service;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.fuyuanshen.app.domain.vo.AppRoleVo;
 import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.common.core.constant.Constants;
 import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.constant.TenantConstants;
-import com.fuyuanshen.common.core.domain.dto.RoleDTO;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.enums.LoginType;
 import com.fuyuanshen.common.core.exception.user.UserException;
@@ -31,7 +28,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Supplier;
 
 /**

fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java

@@ -63,12 +63,11 @@ public class CaptchaController {
         String code = RandomUtil.randomNumbers(4);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         // 验证码模板id 自行处理 (查数据库或写死均可)
-        String templateId = "SMS_322180518";
+        String templateId = "";
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("code", code);
         SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-//        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
-        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
         if (!smsResponse.isSuccess()) {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());

fys-admin/src/main/java/com/fuyuanshen/web/service/AppRegisterService.java

@@ -0,0 +1,129 @@
+package com.fuyuanshen.web.service;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fuyuanshen.app.domain.AppUser;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.model.AppSmsRegisterBody;
+import com.fuyuanshen.common.core.exception.BadRequestException;
+import com.fuyuanshen.common.core.exception.user.CaptchaException;
+import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
+import com.fuyuanshen.common.core.exception.user.UserException;
+import com.fuyuanshen.common.core.utils.MessageUtils;
+import com.fuyuanshen.common.core.utils.ServletUtils;
+import com.fuyuanshen.common.core.utils.SpringUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.log.event.LogininforEvent;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
+import com.fuyuanshen.system.mapper.SysUserMapper;
+import com.fuyuanshen.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 注册校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Service
+public class AppRegisterService {
+
+    private final ISysUserService userService;
+    private final SysUserMapper userMapper;
+    private final CaptchaProperties captchaProperties;
+    private final AppUserMapper appUserMapper;
+
+    /**
+     * 注册
+     */
+    public void register(AppSmsRegisterBody registerBody) {
+        String phoneNumber = registerBody.getPhoneNumber();
+        LambdaQueryWrapper<AppUser> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppUser::getPhonenumber, phoneNumber);
+        AppUserVo appUserVo = appUserMapper.selectVoOne(wrapper);
+        if (appUserVo != null) {
+            throw new BadRequestException("该手机号已被注册");
+        }
+        String verificationCode = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber);
+        if (verificationCode == null) {
+            throw new BadRequestException("验证码已过期");
+        }
+        if(!registerBody.getVerificationCode().equals(verificationCode)){
+            throw new BadRequestException("验证码错误");
+        }
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getPhoneNumber();
+        String password = registerBody.getPassword();
+
+        AppUser appUser = new AppUser();
+        appUser.setUserName(username);
+        appUser.setNickName(username);
+        appUser.setPhonenumber(phoneNumber);
+        appUser.setPassword(password);
+        appUser.setUserType("app_user");
+        appUser.setTenantId(tenantId);
+        appUser.setLoginIp(ServletUtils.getClientIP());
+        appUser.setStatus("0");
+        appUser.setDelFlag("0");
+        appUser.setCreateTime(new Date());
+
+
+        boolean exist = TenantHelper.dynamic(tenantId, () -> {
+            return appUserMapper.exists(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getUserName, appUser.getUserName()));
+        });
+        if (exist) {
+            throw new UserException("user.register.save.error", username);
+        }
+        appUserMapper.insert(appUser);
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    public void validateCaptcha(String tenantId, String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     * @return
+     */
+    private void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/impl/AppPasswordAuthStrategy.java

@@ -0,0 +1,122 @@
+package com.fuyuanshen.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fuyuanshen.app.domain.AppUser;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.app.service.AppLoginService;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.constant.SystemConstants;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
+import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.exception.user.CaptchaException;
+import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
+import com.fuyuanshen.common.core.exception.user.UserException;
+import com.fuyuanshen.common.core.utils.MessageUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.core.utils.ValidatorUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
+import com.fuyuanshen.system.domain.vo.SysClientVo;
+import com.fuyuanshen.web.domain.vo.LoginVo;
+import com.fuyuanshen.web.service.IAuthStrategy;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 密码认证策略
+ *
+ * @author Michelle.Chung
+ */
+@Slf4j
+@Service("appPassword" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppPasswordAuthStrategy implements IAuthStrategy {
+
+    private final CaptchaProperties captchaProperties;
+    private final AppLoginService loginService;
+    private final AppUserMapper appUserMapper;
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String tenantId = loginBody.getTenantId();
+        String username = loginBody.getUsername();
+        String password = loginBody.getPassword();
+        String code = loginBody.getCode();
+        String uuid = loginBody.getUuid();
+
+//        boolean captchaEnabled = captchaProperties.getEnable();
+//        // 验证码开关
+//        if (captchaEnabled) {
+//            validateCaptcha(tenantId, username, code, uuid);
+//        }
+        AppLoginUser loginUser = TenantHelper.dynamic(tenantId, () -> {
+            AppUserVo user = loadUserByUsername(username);
+            loginService.checkLogin(LoginType.PASSWORD, tenantId, username, () -> !password.equals(user.getPassword()));
+            // 此处可根据登录用户的数据不同 自行创建 loginUser
+            return loginService.buildLoginUser(user);
+        });
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        AppLoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    private void validateCaptcha(String tenantId, String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            loginService.recordLogininfor(tenantId, username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    private AppUserVo loadUserByUsername(String username) {
+        AppUserVo user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserName, username));
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", username);
+            throw new UserException("user.not.exists", username);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", username);
+            throw new UserException("user.blocked", username);
+        }
+        return user;
+    }
+
+}

fys-admin/src/main/resources/application-dev.yml

@@ -49,9 +49,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://47.120.79.150:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://120.79.224.186:3366/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: Jq_123456#
+          password: 1fys@QWER..
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -98,13 +98,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 47.120.79.150
+    host: 120.79.224.186
     # 端口，默认为6379
-    port: 6379
+    port: 26379
     # 数据库索引
     database: 2
     # redis 密码必须配置
-    password: xhYc_djkl382^#780!
+    password: 1fys@QWER..
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -300,8 +300,8 @@ file:
 # MQTT配置
 mqtt:
   username: admin
-  password: #YtvpSfCNG
+  password: fys123456
-  url: tcp://47.120.79.150:2883
+  url: tcp://47.107.152.87:1883
   subClientId: fys_subClient
   subTopic: worker/alert/#,worker/location/#
   pubTopic: worker/location

fys-admin/src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@ spring.servlet.multipart.location: /fys/server/temp
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -16,7 +16,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "fys_group"
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表

fys-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8000
+  port: 8001
   servlet:
     # 应用的访问路径
     context-path: /

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/GlobalConstants.java

@@ -18,9 +18,9 @@ public interface GlobalConstants {
     String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:";
 
     /**
-     * 设备分享验证码 redis key
+     * 验证码 redis key
      */
-    String DEVICE_SHARE_CODES_KEY = GLOBAL_REDIS_KEY + "device_share_codes:";
+    String APP_FORGOT_PASSWORD_SMS_KEY = GLOBAL_REDIS_KEY + "app_sms_forgotPassword:";
 
     /**
      * 防重提交 redis key

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/AppLoginBody.java

@@ -0,0 +1,22 @@
+package com.fuyuanshen.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class AppLoginBody {
+
+    /**
+     * 手机号不能为空
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String userName;
+
+    /**
+     * 密码不能为空
+     */
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    private String tenantId;
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/AppSmsRegisterBody.java

@@ -0,0 +1,22 @@
+package com.fuyuanshen.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class AppSmsRegisterBody {
+
+    @NotBlank(message = "手机号不能为空")
+    private String phoneNumber;
+
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    @NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/domain/model/PasswordLoginBody.java

@@ -18,14 +18,14 @@ public class PasswordLoginBody extends LoginBody {
      * 用户名
      */
     @NotBlank(message = "{user.username.not.blank}")
-    @Length(min = 2, max = 30, message = "{user.username.length.valid}")
+//    @Length(min = 2, max = 30, message = "{user.username.length.valid}")
     private String username;
 
     /**
      * 用户密码
      */
     @NotBlank(message = "{user.password.not.blank}")
-    @Length(min = 5, max = 30, message = "{user.password.length.valid}")
+//    @Length(min = 5, max = 30, message = "{user.password.length.valid}")
     private String password;
 
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java

@@ -1,105 +0,0 @@
-//package com.fuyuanshen.app.controller;
-//
-//import java.util.List;
-//
-//import lombok.RequiredArgsConstructor;
-//import jakarta.servlet.http.HttpServletResponse;
-//import jakarta.validation.constraints.*;
-//import cn.dev33.satoken.annotation.SaCheckPermission;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.validation.annotation.Validated;
-//import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
-//import com.fuyuanshen.common.log.annotation.Log;
-//import com.fuyuanshen.common.web.core.BaseController;
-//import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-//import com.fuyuanshen.common.core.domain.R;
-//import com.fuyuanshen.common.core.validate.AddGroup;
-//import com.fuyuanshen.common.core.validate.EditGroup;
-//import com.fuyuanshen.common.log.enums.BusinessType;
-//import com.fuyuanshen.common.excel.utils.ExcelUtil;
-//import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-//import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
-//import com.fuyuanshen.app.service.IAppDeviceShareService;
-//import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-//
-///**
-// * 设备分享
-// *
-// * @author Lion Li
-// * @date 2025-07-16
-// */
-//@Validated
-//@RequiredArgsConstructor
-//@RestController
-//@RequestMapping("/app/deviceShare")
-//public class AppDeviceShareController extends BaseController {
-//
-//    private final IAppDeviceShareService appDeviceShareService;
-//
-//    /**
-//     * 查询设备分享列表
-//     */
-//    @SaCheckPermission("app:deviceShare:list")
-//    @GetMapping("/list")
-//    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
-//        return appDeviceShareService.queryPageList(bo, pageQuery);
-//    }
-//
-//    /**
-//     * 导出设备分享列表
-//     */
-//    @SaCheckPermission("app:deviceShare:export")
-//    @Log(title = "设备分享", businessType = BusinessType.EXPORT)
-//    @PostMapping("/export")
-//    public void export(AppDeviceShareBo bo, HttpServletResponse response) {
-//        List<AppDeviceShareVo> list = appDeviceShareService.queryList(bo);
-//        ExcelUtil.exportExcel(list, "设备分享", AppDeviceShareVo.class, response);
-//    }
-//
-//    /**
-//     * 获取设备分享详细信息
-//     *
-//     * @param id 主键
-//     */
-//    @SaCheckPermission("app:deviceShare:query")
-//    @GetMapping("/{id}")
-//    public R<AppDeviceShareVo> getInfo(@NotNull(message = "主键不能为空")
-//                                     @PathVariable Long id) {
-//        return R.ok(appDeviceShareService.queryById(id));
-//    }
-//
-//    /**
-//     * 新增设备分享
-//     */
-//    @SaCheckPermission("app:deviceShare:add")
-//    @Log(title = "设备分享", businessType = BusinessType.INSERT)
-//    @RepeatSubmit()
-//    @PostMapping()
-//    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppDeviceShareBo bo) {
-//        return toAjax(appDeviceShareService.insertByBo(bo));
-//    }
-//
-//    /**
-//     * 修改设备分享
-//     */
-//    @SaCheckPermission("app:deviceShare:edit")
-//    @Log(title = "设备分享", businessType = BusinessType.UPDATE)
-//    @RepeatSubmit()
-//    @PutMapping()
-//    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppDeviceShareBo bo) {
-//        return toAjax(appDeviceShareService.updateByBo(bo));
-//    }
-//
-//    /**
-//     * 删除设备分享
-//     *
-//     * @param ids 主键串
-//     */
-//    @SaCheckPermission("app:deviceShare:remove")
-//    @Log(title = "设备分享", businessType = BusinessType.DELETE)
-//    @DeleteMapping("/{ids}")
-//    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-//                          @PathVariable Long[] ids) {
-//        return toAjax(appDeviceShareService.deleteWithValidByIds(List.of(ids), true));
-//    }
-//}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/equipment/APPDeviceController.java

@@ -3,6 +3,7 @@ package com.fuyuanshen.app.controller.equipment;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.app.domain.APPDevice;
 import com.fuyuanshen.app.domain.APPDeviceType;
+import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
 import com.fuyuanshen.app.service.equipment.APPDeviceService;
 import com.fuyuanshen.common.core.domain.R;

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppDeviceShare.java

@@ -1,51 +0,0 @@
-package com.fuyuanshen.app.domain;
-
-import com.fuyuanshen.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serial;
-
-/**
- * 设备分享对象 app_device_share
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("app_device_share")
-public class AppDeviceShare extends TenantEntity {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    private Long deviceId;
-
-    /**
-     * 手机号
-     */
-    private String phonenumber;
-
-    /**
-     * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
-以逗号分隔
-     */
-    private String permission;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppPersonnelInfo.java

@@ -36,6 +36,11 @@ public class AppPersonnelInfo extends TenantEntity {
      */
     private String name;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
     /**
      * 单位名称
      */

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppUser.java

@@ -1,13 +1,14 @@
 package com.fuyuanshen.app.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * APP用户信息对象 app_user
@@ -95,5 +96,9 @@ public class AppUser extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 地区
+     */
+    private String region;
 
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java

@@ -1,49 +0,0 @@
-package com.fuyuanshen.app.domain.bo;
-
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-
-/**
- * 设备分享业务对象 app_device_share
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = AppDeviceShare.class, reverseConvertGenerate = false)
-public class AppDeviceShareBo extends BaseEntity {
-
-    /**
-     * 主键id
-     */
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    private Long deviceId;
-
-    /**
-     * 手机号
-     */
-    private String phonenumber;
-
-    /**
-     * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
-以逗号分隔
-     */
-    private String permission;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-
-    private String smsCode;
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/dto/APPForgotPasswordDTO.java

@@ -0,0 +1,19 @@
+package com.fuyuanshen.app.domain.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+@Data
+public class APPForgotPasswordDTO {
+
+    @NotBlank(message = "手机号不能为空")
+    private String phoneNumber;
+
+
+    @NotBlank(message = "密码不能为空")
+    private String password;
+
+    @NotBlank(message = "验证码不能为空")
+    private String verificationCode;
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/dto/APPForgotPasswordSmsDTO.java

@@ -0,0 +1,12 @@
+package com.fuyuanshen.app.domain.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+
+@Data
+public class APPForgotPasswordSmsDTO {
+
+    @NotBlank(message = "手机号不能为空")
+    private String phoneNumber;
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/dto/APPReNameDTO.java

@@ -1,8 +1,6 @@
 package com.fuyuanshen.app.domain.dto;
 
-import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
 

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/dto/APPUpdateUserDTO.java

@@ -0,0 +1,33 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-06-1818:36
+ */
+@Data
+public class APPUpdateUserDTO {
+
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户地区
+     */
+    private String region;
+
+    /**
+     * 用户性别
+     */
+    private String gender;
+
+    /**
+     * 用户头像
+     */
+    private MultipartFile file;
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/APPUserInfoVo.java

@@ -0,0 +1,39 @@
+package com.fuyuanshen.app.domain.vo;
+
+import lombok.Data;
+
+
+@Data
+public class APPUserInfoVo {
+
+    /**
+     * 用户ID
+     */
+    private Long id;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 性别
+     */
+    private String gender;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 头像地址
+     */
+    private String avatarPath;
+
+    /**
+     * 地区
+     */
+    private String region;
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceDetailVo.java

@@ -1,72 +0,0 @@
-package com.fuyuanshen.app.domain.vo;
-
-import cn.idev.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.io.Serial;
-
-@Data
-public class AppDeviceDetailVo {
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 设备ID
-     */
-    @ExcelProperty(value = "设备ID")
-    private Long deviceId;
-
-    /**
-     * 手机号
-     */
-    @ExcelProperty(value = "手机号")
-    private String phonenumber;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 设备IMEI
-     */
-    private String deviceImei;
-
-    /**
-     * 设备MAC
-     */
-    private String deviceMac;
-
-    /**
-     * 通讯方式 0:4G;1:蓝牙
-     */
-    private Integer communicationMode;
-
-    /**
-     * 设备图片
-     */
-    private String devicePic;
-
-    /**
-     * 设备类型
-     */
-    private String typeName;
-
-    /**
-     *  蓝牙名称
-     */
-    private String bluetoothName;
-
-    /**
-     * 设备状态
-     * 0 失效
-     * 1 正常
-     */
-    private Integer deviceStatus;
-
-
-    /**
-     * 人员信息
-     */
-    private AppPersonnelInfoVo personnelInfo;
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareDetailVo.java

@@ -1,107 +0,0 @@
-package com.fuyuanshen.app.domain.vo;
-
-import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
-import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
-import io.github.linpeilie.annotations.AutoMapper;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-
-
-/**
- * 设备分享视图对象 app_device_share
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = AppDeviceShare.class)
-public class AppDeviceShareDetailVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ExcelProperty(value = "主键id")
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @ExcelProperty(value = "设备ID")
-    private Long deviceId;
-
-    /**
-     * 手机号
-     */
-    @ExcelProperty(value = "手机号")
-    private String phonenumber;
-
-    /**
-     * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
-以逗号分隔
-     */
-    @ExcelProperty(value = "功能权限", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "1=：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息")
-    private String permission;
-
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
-    /**
-     * 设备IMEI
-     */
-    private String deviceImei;
-
-    /**
-     * 设备MAC
-     */
-    private String deviceMac;
-
-    /**
-     * 通讯方式 0:4G;1:蓝牙
-     */
-    private Integer communicationMode;
-
-    /**
-     * 设备图片
-     */
-    private String devicePic;
-
-    /**
-     * 设备类型
-     */
-    private String typeName;
-
-    /**
-     *  蓝牙名称
-     */
-    private String bluetoothName;
-
-    /**
-     * 设备状态
-     * 0 失效
-     * 1 正常
-     */
-    private Integer deviceStatus;
-
-
-    /**
-     * 人员信息
-     */
-    private AppPersonnelInfoVo personnelInfo;
-
-    /**
-     * 发送信息
-     */
-    private String sendMsg;
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java

@@ -1,72 +0,0 @@
-package com.fuyuanshen.app.domain.vo;
-
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
-import cn.idev.excel.annotation.ExcelProperty;
-import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
-import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
-import io.github.linpeilie.annotations.AutoMapper;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serial;
-import java.io.Serializable;
-import java.util.Date;
-
-
-
-/**
- * 设备分享视图对象 app_device_share
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-@Data
-@ExcelIgnoreUnannotated
-@AutoMapper(target = AppDeviceShare.class)
-public class AppDeviceShareVo implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @ExcelProperty(value = "主键id")
-    private Long id;
-
-    /**
-     * 设备ID
-     */
-    @ExcelProperty(value = "设备ID")
-    private Long deviceId;
-
-    /**
-     * 设备名称
-     */
-    @ExcelProperty(value = "设备名称")
-    private String deviceName;
-
-    /**
-     * 手机号
-     */
-    @ExcelProperty(value = "手机号")
-    private String phonenumber;
-
-    /**
-     * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
-以逗号分隔
-     */
-    @ExcelProperty(value = "功能权限", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "1=：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息")
-    private String permission;
-
-    /**
-     * 备注
-     */
-    @ExcelProperty(value = "备注")
-    private String remark;
-
-    // 设备图片
-    private String devicePic;
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java

@@ -23,4 +23,8 @@ public class AppFileVo {
      * 文件url
      */
     private String fileUrl;
+    /**
+     * 文件类型(1:操作说明，2:产品参数)
+     */
+    private Long fileType;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java

@@ -1,15 +0,0 @@
-package com.fuyuanshen.app.mapper;
-
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
-
-/**
- * 设备分享Mapper接口
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, AppDeviceShareVo> {
-
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppUserMapper.java

@@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface AppUserMapper extends BaseMapperPlus<AppUser, AppUserVo> {
 
+    AppUser appFindByUsername(String phoneNumber);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppDeviceShareService.java

@@ -1,68 +0,0 @@
-package com.fuyuanshen.app.service;
-
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * 设备分享Service接口
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-public interface IAppDeviceShareService {
-
-    /**
-     * 查询设备分享
-     *
-     * @param id 主键
-     * @return 设备分享
-     */
-    AppDeviceShareVo queryById(Long id);
-
-    /**
-     * 分页查询设备分享列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return 设备分享分页列表
-     */
-    TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询符合条件的设备分享列表
-     *
-     * @param bo 查询条件
-     * @return 设备分享列表
-     */
-    List<AppDeviceShareVo> queryList(AppDeviceShareBo bo);
-
-    /**
-     * 新增设备分享
-     *
-     * @param bo 设备分享
-     * @return 是否新增成功
-     */
-    Boolean insertByBo(AppDeviceShareBo bo);
-
-    /**
-     * 修改设备分享
-     *
-     * @param bo 设备分享
-     * @return 是否修改成功
-     */
-    Boolean updateByBo(AppDeviceShareBo bo);
-
-    /**
-     * 校验并批量删除设备分享信息
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppPersonnelInfoService.java

@@ -4,7 +4,6 @@ import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 
 import java.util.Collection;
 import java.util.List;
@@ -66,6 +65,4 @@ public interface IAppPersonnelInfoService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
-
-    boolean registerPersonInfo(AppPersonnelInfoBo bo);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppUserService.java

@@ -1,9 +1,13 @@
 package com.fuyuanshen.app.service;
 
-import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.app.domain.bo.AppUserBo;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.app.domain.dto.APPForgotPasswordDTO;
+import com.fuyuanshen.app.domain.dto.APPForgotPasswordSmsDTO;
+import com.fuyuanshen.app.domain.dto.APPUpdateUserDTO;
+import com.fuyuanshen.app.domain.vo.APPUserInfoVo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 
 import java.util.Collection;
 import java.util.List;
@@ -65,4 +69,12 @@ public interface IAppUserService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    APPUserInfoVo getUserInfo();
+
+    int updateUser(APPUpdateUserDTO bo);
+
+    int forgotPassword(APPForgotPasswordDTO bo);
+
+    int sendForgotPasswordSms(APPForgotPasswordSmsDTO dto);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/equipment/APPDeviceService.java

@@ -8,9 +8,7 @@ import com.fuyuanshen.app.domain.dto.APPReNameDTO;
 import com.fuyuanshen.app.domain.dto.APPUnbindDTO;
 import com.fuyuanshen.app.domain.query.APPDeviceQueryCriteria;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 
 import java.util.List;
@@ -75,5 +73,4 @@ public interface APPDeviceService extends IService<APPDevice> {
     TableDataInfo<APPDevice> queryAppDeviceList(DeviceQueryCriteria criteria);
 
 
-    int sendMessage(AppDeviceBo bo);
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppDeviceShareServiceImpl.java

@@ -1,149 +0,0 @@
-package com.fuyuanshen.app.service.impl;
-
-import com.fuyuanshen.common.core.utils.MapstructUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
-import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
-import com.fuyuanshen.app.domain.AppDeviceShare;
-import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
-import com.fuyuanshen.app.service.IAppDeviceShareService;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * 设备分享Service业务层处理
- *
- * @author Lion Li
- * @date 2025-07-16
- */
-@Slf4j
-@RequiredArgsConstructor
-@Service
-public class AppDeviceShareServiceImpl implements IAppDeviceShareService {
-
-    private final AppDeviceShareMapper baseMapper;
-
-    private final DeviceMapper deviceMapper;
-
-    /**
-     * 查询设备分享
-     *
-     * @param id 主键
-     * @return 设备分享
-     */
-    @Override
-    public AppDeviceShareVo queryById(Long id){
-        return baseMapper.selectVoById(id);
-    }
-
-    /**
-     * 分页查询设备分享列表
-     *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
-     * @return 设备分享分页列表
-     */
-    @Override
-    public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
-        Long userId = AppLoginHelper.getUserId();
-        bo.setCreateBy(userId);
-        LambdaQueryWrapper<AppDeviceShare> lqw = buildQueryWrapper(bo);
-        Page<AppDeviceShareVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        List<AppDeviceShareVo> records = result.getRecords();
-        records.forEach(r -> {
-            Device device = deviceMapper.selectById(r.getDeviceId());
-            if(device != null){
-                r.setDevicePic(device.getDevicePic());
-                r.setDeviceName(device.getDeviceName());
-            }
-        });
-        return TableDataInfo.build(result);
-    }
-
-    /**
-     * 查询符合条件的设备分享列表
-     *
-     * @param bo 查询条件
-     * @return 设备分享列表
-     */
-    @Override
-    public List<AppDeviceShareVo> queryList(AppDeviceShareBo bo) {
-        LambdaQueryWrapper<AppDeviceShare> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<AppDeviceShare> buildQueryWrapper(AppDeviceShareBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<AppDeviceShare> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDeviceId() != null, AppDeviceShare::getDeviceId, bo.getDeviceId());
-        lqw.eq(StringUtils.isNotBlank(bo.getPhonenumber()), AppDeviceShare::getPhonenumber, bo.getPhonenumber());
-        lqw.eq(StringUtils.isNotBlank(bo.getPermission()), AppDeviceShare::getPermission, bo.getPermission());
-        lqw.eq(bo.getCreateBy()!=null, AppDeviceShare::getCreateBy, bo.getCreateBy());
-        return lqw;
-    }
-
-    /**
-     * 新增设备分享
-     *
-     * @param bo 设备分享
-     * @return 是否新增成功
-     */
-    @Override
-    public Boolean insertByBo(AppDeviceShareBo bo) {
-        AppDeviceShare add = MapstructUtils.convert(bo, AppDeviceShare.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setId(add.getId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改设备分享
-     *
-     * @param bo 设备分享
-     * @return 是否修改成功
-     */
-    @Override
-    public Boolean updateByBo(AppDeviceShareBo bo) {
-        AppDeviceShare update = MapstructUtils.convert(bo, AppDeviceShare.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     */
-    private void validEntityBeforeSave(AppDeviceShare entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 校验并批量删除设备分享信息
-     *
-     * @param ids     待删除的主键集合
-     * @param isValid 是否进行有效性校验
-     * @return 是否删除成功
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteByIds(ids) > 0;
-    }
-}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java

@@ -7,6 +7,7 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -66,6 +67,8 @@ public class AppOperationVideoServiceImpl implements IAppOperationVideoService {
      */
     @Override
     public List<AppOperationVideoVo> queryList(AppOperationVideoBo bo) {
+        Long userId = AppLoginHelper.getUserId();
+        bo.setCreateBy(userId);
         LambdaQueryWrapper<AppOperationVideo> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);
     }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppPersonnelInfoServiceImpl.java

@@ -1,6 +1,5 @@
 package com.fuyuanshen.app.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@@ -8,8 +7,6 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -78,6 +75,7 @@ public class AppPersonnelInfoServiceImpl implements IAppPersonnelInfoService {
         LambdaQueryWrapper<AppPersonnelInfo> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getDeviceId() != null, AppPersonnelInfo::getDeviceId, bo.getDeviceId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), AppPersonnelInfo::getName, bo.getName());
+        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), AppPersonnelInfo::getDeptName, bo.getDeptName());
         lqw.like(StringUtils.isNotBlank(bo.getUnitName()), AppPersonnelInfo::getUnitName, bo.getUnitName());
         lqw.eq(StringUtils.isNotBlank(bo.getSendMsg()), AppPersonnelInfo::getSendMsg, bo.getSendMsg());
         return lqw;
@@ -134,13 +132,4 @@ public class AppPersonnelInfoServiceImpl implements IAppPersonnelInfoService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
-
-
-    @Override
-    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
-
-        AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
-
-        return baseMapper.insertOrUpdate(appPersonnelInfo);
-    }
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppUserServiceImpl.java

@@ -1,24 +1,37 @@
 package com.fuyuanshen.app.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.app.domain.AppUser;
+import com.fuyuanshen.app.domain.bo.AppUserBo;
+import com.fuyuanshen.app.domain.dto.APPForgotPasswordDTO;
+import com.fuyuanshen.app.domain.dto.APPForgotPasswordSmsDTO;
+import com.fuyuanshen.app.domain.dto.APPUpdateUserDTO;
+import com.fuyuanshen.app.domain.vo.APPUserInfoVo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.app.service.IAppUserService;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.core.exception.BadRequestException;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import com.fuyuanshen.app.domain.bo.AppUserBo;
-import com.fuyuanshen.app.domain.vo.AppUserVo;
-import com.fuyuanshen.app.domain.AppUser;
-import com.fuyuanshen.app.mapper.AppUserMapper;
-import com.fuyuanshen.app.service.IAppUserService;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * Service业务层处理
@@ -33,6 +46,8 @@ public class AppUserServiceImpl implements IAppUserService {
 
     private final AppUserMapper baseMapper;
 
+    private final ISysOssService sysOssService;
+
     /**
      * 查询APP用户信息
      *
@@ -139,4 +154,75 @@ public class AppUserServiceImpl implements IAppUserService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public APPUserInfoVo getUserInfo() {
+        String username = AppLoginHelper.getUsername();
+        QueryWrapper<AppUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_name", username);
+        List<AppUser> appUsers = baseMapper.selectList(queryWrapper);
+        if(appUsers.isEmpty()){
+            throw new BadRequestException("用户不存在");
+        }
+        AppUser user = appUsers.get(0);
+//        AppUserVo user = baseMapper.selectVoById(userId);
+
+        APPUserInfoVo appUserVo = new APPUserInfoVo();
+        appUserVo.setId(user.getUserId());
+        appUserVo.setNickName(user.getNickName());
+        appUserVo.setGender(user.getSex());
+        appUserVo.setPhone(user.getPhonenumber());
+        appUserVo.setRegion(user.getRegion());
+        if(user.getAvatar() != null){
+            SysOssVo oss = sysOssService.getById(user.getAvatar());
+            if(oss != null){
+                appUserVo.setAvatarPath(oss.getUrl());
+            }
+        }
+
+        return appUserVo;
+    }
+
+    @Override
+    public int updateUser(APPUpdateUserDTO bo) {
+        AppLoginUser appUser = AppLoginHelper.getLoginUser();
+        AppUserVo appUserVo = baseMapper.selectVoById(appUser.getUserId());
+        if(appUserVo == null){
+            throw new BadRequestException("用户不存在");
+        }
+        AppUser updUser= new AppUser();
+        updUser.setUserId(appUser.getUserId());
+        updUser.setNickName(bo.getNickName());
+        if(bo.getFile() != null){
+            SysOssVo oss = sysOssService.upload(bo.getFile());
+            updUser.setAvatar(oss.getOssId());
+        }
+
+        updUser.setRegion(bo.getRegion());
+        updUser.setSex(bo.getGender());
+        return baseMapper.update(updUser, new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserId, appUser.getUserId()));
+    }
+
+    @Override
+    public int forgotPassword(APPForgotPasswordDTO bo) {
+        AppUser appUser = baseMapper.appFindByUsername(bo.getPhoneNumber());
+        if (appUser == null) {
+            throw new BadRequestException("手机号不存在");
+        }
+        String verificationCode = RedisUtils.getCacheObject(GlobalConstants.APP_FORGOT_PASSWORD_SMS_KEY + bo.getPhoneNumber());
+        if (verificationCode == null) {
+            throw new BadRequestException("验证码已过期");
+        }
+        if(!bo.getVerificationCode().equals(verificationCode)){
+            throw new BadRequestException("验证码错误");
+        }
+        appUser.setPassword(bo.getPassword());
+        baseMapper.updateById(appUser);
+        return 1;
+    }
+
+    @Override
+    public int sendForgotPasswordSms(APPForgotPasswordSmsDTO dto) {
+        return 1;
+    }
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/equipment/APPDeviceServiceImpl.java

@@ -23,8 +23,8 @@ import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
 import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
@@ -227,14 +227,5 @@ public class APPDeviceServiceImpl extends ServiceImpl<APPDeviceMapper, APPDevice
         return null;
     }
 
-    @Override
-    public int sendMessage(AppDeviceBo bo) {
-        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", bo.getDeviceId())
-                .eq("binding_user_id", AppLoginHelper.getUserId())
-                .set("send_msg", bo.getSendMsg());
-        return deviceMapper.update(updateWrapper);
-    }
-
 
 }

fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

@@ -7,6 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
         select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
         where 1=1
+        <if test="createBy != null">
+            a.create_by = #{createBy}
+        </if>
         <if test="businessId != null">
             and a.business_id = #{businessId}
         </if>

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fuyuanshen.app.mapper.AppDeviceShareMapper">
-
-</mapper>

fys-modules/fys-app/src/main/resources/mapper/app/AppUserMapper.xml

@@ -4,4 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.app.mapper.AppUserMapper">
 
+    <select id="appFindByUsername" resultType="com.fuyuanshen.app.domain.AppUser">
+        select * from app_user where user_name = #{phoneNumber}
+    </select>
 </mapper>

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/Device.java

@@ -21,9 +21,6 @@ import java.util.Date;
 @JsonInclude(JsonInclude.Include.ALWAYS)  // 关键注解
 public class Device extends TenantEntity {
 
-    /**
-     * id
-     */
     @TableId(value = "id", type = IdType.AUTO)
     @Schema(name = "ID")
     private Long id;
@@ -32,9 +29,6 @@ public class Device extends TenantEntity {
     @TableField(exist = false)
     private Long assignId;
 
-    /**
-     * device_type
-     */
     @Schema(name = "设备类型")
     private Long deviceType;
 
@@ -106,6 +100,8 @@ public class Device extends TenantEntity {
     private Integer deviceStatus;
 
 
+
+
     /**
      * 绑定状态
      * 0 未绑定
@@ -122,6 +118,4 @@ public class Device extends TenantEntity {
     private Long bindingUserId;
 
     private Date bindingTime;
-
-    private String sendMsg;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceAssignments.java

@@ -25,7 +25,6 @@ public class DeviceAssignments extends TenantEntity {
 
     /**
      * 设备id
-     * device_id
      */
     private Long deviceId;
 

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/AppDeviceBo.java

@@ -28,7 +28,4 @@ public class AppDeviceBo {
     @NotNull(message = "通讯方式不能为空", groups = { EditGroup.class })
     private Integer communicationMode;
 
-    private String sendMsg;
-
-    private String deviceId;
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/DeviceExcelImportDTO.java

@@ -58,9 +58,7 @@ public class DeviceExcelImportDTO {
     private String remark;
 
     @ExcelProperty("设备类型名称")
+    @ColumnWidth(20)
     private String typeName;
 
-    @ExcelProperty("蓝牙名称")
-    private String bluetoothName;
-
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -44,6 +44,7 @@ import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -100,12 +101,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     public TableDataInfo<Device> queryAll(DeviceQueryCriteria criteria, Page<Device> page) throws IOException {
 
         criteria.setCurrentOwnerId(LoginHelper.getUserId());
-        if (criteria.getDeviceType() != null) {
-            DeviceTypeGrants deviceTypeGrant = deviceTypeGrantsMapper.selectById(criteria.getDeviceType());
-            if (deviceTypeGrant != null) {
-                criteria.setDeviceType(deviceTypeGrant.getDeviceTypeId());
-            }
-        }
         IPage<Device> devices = deviceMapper.findAll(criteria, page);
 
         List<Device> records = devices.getRecords();
@@ -147,16 +142,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addDevice(DeviceForm deviceForm) throws Exception {
-
-        Device device1 = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_mac", deviceForm.getDeviceMac()));
-        if (device1 != null) {
-            throw new BadRequestException("设备MAC已存在！！！");
-        }
-        Device device2 = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_imei", deviceForm.getDeviceImei()));
-        if (device2 != null) {
-            throw new BadRequestException("设备IMEI已存在！！！");
-        }
-
         DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
         queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
         queryCriteria.setCustomerId(LoginHelper.getUserId());

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java

@@ -1,8 +1,6 @@
 package com.fuyuanshen.equipment.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -12,13 +10,11 @@ import com.fuyuanshen.common.core.utils.PageUtil;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceAssignments;
 import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.DeviceTypeGrants;
 import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
-import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
@@ -45,7 +41,6 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     private final DeviceMapper deviceMapper;
 
     private final DeviceTypeGrantsMapper deviceTypeGrantsMapper;
-    private final DeviceAssignmentsMapper deviceAssignmentsMapper;
 
 
     /**
@@ -160,33 +155,30 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     @Transactional(rollbackFor = Exception.class)
     public void deleteAll(List<Long> ids) {
 
-        List<Long> deviceTypeId = new ArrayList<>();
-
-        for (Long id : ids) {
-            DeviceTypeGrants deviceTypeGrant = deviceTypeGrantsMapper.selectById(id);
-
-            //     List<DeviceTypeGrants> deviceTypeGrants = deviceTypeGrantsMapper.selectList(new QueryWrapper<DeviceTypeGrants>()
-            //                     .eq("device_type_id", deviceTypeGrant.getDeviceTypeId()));
-
-            // List<DeviceTypeGrants> deviceAssignments = deviceTypeGrantsMapper.selectList(new QueryWrapper<DeviceTypeGrants>()
-            //         .eq("device_id", deviceTypeGrant.getDeviceTypeId()));
-
-            // if (CollectionUtil.isNotEmpty(deviceAssignments)) {
-            //     throw new RuntimeException("该设备类型已绑定设备，无法删除");
-            // }
-            // Device device = deviceMapper.selectById(deviceTypeGrant.getDeviceTypeId());
-
-            List<Device> devices = deviceMapper.selectList(new QueryWrapper<Device>()
-                    .eq("device_type", deviceTypeGrant.getDeviceTypeId()));
-            if (CollectionUtil.isNotEmpty(devices)) {
-                throw new RuntimeException("该设备类型已绑定设备，无法删除");
-            }
-            deviceTypeId.add(deviceTypeGrant.getDeviceTypeId());
-        }
-
         deviceTypeGrantsMapper.deleteByIds(ids);
-        deviceTypeMapper.deleteByIds(deviceTypeId);
+        //
-
+        // List<Long> invalidIds = new ArrayList<>();
+        // List<Long> invalidId2 = new ArrayList<>();
+        // for (Long id : ids) {
+        //     DeviceType deviceType = deviceTypeMapper.selectById(id);
+        //     if (deviceType == null || !Objects.equals(deviceType.getOwnerCustomerId(), LoginHelper.getUserId())) {
+        //         invalidIds.add(id);
+        //     }
+        //     DeviceQueryCriteria deviceQueryCriteria = new DeviceQueryCriteria();
+        //     deviceQueryCriteria.setDeviceType(id);
+        //     List<Device> devices = deviceMapper.findAll(deviceQueryCriteria);
+        //     if (!devices.isEmpty()) {
+        //         invalidId2.add(id);
+        //     }
+        // }
+        // if (!invalidIds.isEmpty()) {
+        //     throw new RuntimeException("以下设备类型无法删除（ID 不存在或无权限）: " + invalidIds);
+        // }
+        // if (!invalidId2.isEmpty()) {
+        //     throw new RuntimeException("以下设备类型无法删除（已绑定设备）: " + invalidId2);
+        // }
+        //
+        // deviceTypeMapper.deleteByIds(ids);
     }