Merge branch 'main' into fys-main

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceBizService.java
#	fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppDeviceBindRecord.java

fys-admin/pom.xml

@@ -94,10 +94,10 @@
         </dependency>
 
         <!--  demo模块  -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.fuyuanshen</groupId>
             <artifactId>fys-demo</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!--  工作流模块  -->
         <dependency>

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.SmsLoginBody;
+import com.fuyuanshen.common.core.domain.model.AppLoginBody;
+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);
-        SmsLoginBody loginBody = new SmsLoginBody();
-        loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber());
-        loginBody.setSmsCode(appSmsLoginBody.getSmsCode());
-        loginBody.setTenantId(appSmsLoginBody.getTenantId());
-        loginBody.setClientId("ca839698e245d60aa2f0e59bd52b34f8");
-        loginBody.setGrantType("appSms");
+        ValidatorUtils.validate(appLoginBody);
+        PasswordLoginBody loginBody = new PasswordLoginBody();
+        loginBody.setUsername(appLoginBody.getUserName());
+        loginBody.setPassword(appLoginBody.getPassword());
+        loginBody.setTenantId(appLoginBody.getTenantId());
+        loginBody.setClientId("835b15335d389c9fcfdf99421fa8019b");
+        loginBody.setGrantType("appPassword");
         // 授权类型和客户端id
         String clientId = loginBody.getClientId();
         String grantType = loginBody.getGrantType();
@@ -93,26 +92,29 @@ public class AppAuthController {
     }
 
 
-
+    /**
+     * 用户注销
+     */
+    @DeleteMapping("/cancelAccount")
+    public R<Void> cancelAccount() {
+        loginService.cancelAccount();
+        return R.ok("用户注销成功");
+    }
 
     /**
      * 退出登录
      */
     @PostMapping("/logout")
     public R<Void> logout() {
-//        loginService.logout();
+        loginService.logout();
         return R.ok("退出成功");
     }
 
     /**
      * 用户注册
      */
-    @ApiEncrypt
     @PostMapping("/register")
-    public R<Void> register(@Validated @RequestBody RegisterBody user) {
-        if (!configService.selectRegisterEnabled(user.getTenantId())) {
-            return R.fail("当前系统没有开启注册功能！");
-        }
+    public R<Void> register(@Validated @RequestBody AppSmsRegisterBody user) {
         registerService.register(user);
         return R.ok();
     }

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

@@ -1,24 +1,34 @@
 package com.fuyuanshen.app.controller;
 
+import cn.hutool.json.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.service.equipment.APPDeviceService;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+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.dto.AppDeviceSendMsgBo;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
-import com.fuyuanshen.equipment.service.DeviceService;
+import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- * APP 设备信息管理
+ * APP设备信息管理
  */
 @Validated
 @RequiredArgsConstructor
@@ -26,18 +36,15 @@ import java.util.List;
 @RequestMapping("/app/device")
 public class AppDeviceController extends BaseController {
 
-    private final DeviceService deviceService;
+    private final AppDeviceBizService appDeviceService;
 
 
-    private final APPDeviceService appDeviceService;
-
     /**
      * 查询设备列表
      */
     @GetMapping("/list")
     public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
-
-        return deviceService.queryAppDeviceList(bo,pageQuery);
+        return appDeviceService.queryAppDeviceList(bo,pageQuery);
     }
 
     /**
@@ -45,7 +52,7 @@ public class AppDeviceController extends BaseController {
      */
     @PostMapping("/bind")
     public R<Void> bind(@RequestBody AppDeviceBo bo) {
-        return toAjax(deviceService.bindDevice(bo));
+        return toAjax(appDeviceService.bindDevice(bo));
     }
 
 
@@ -54,7 +61,7 @@ public class AppDeviceController extends BaseController {
      */
     @DeleteMapping("/unBind")
     public R<Void> unBind(Long id) {
-        return toAjax(deviceService.unBindDevice(id));
+        return toAjax(appDeviceService.unBindDevice(id));
     }
 
     /**
@@ -76,4 +83,87 @@ 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 AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 地图逆解析
+     *
+     */
+    @PostMapping("/mapReverseGeocoding")
+    public R<Void> mapReverseGeocoding(@RequestBody DeviceInstructDto params) {
+        String mapJson = appDeviceService.mapReverseGeocoding(params);
+        return R.ok(mapJson);
+    }
 }

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

@@ -0,0 +1,118 @@
+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);
+    }
+
+    /**
+     * 他人分享管理列表
+     */
+    @GetMapping("/otherDeviceShareList")
+    public TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return deviceShareService.otherDeviceShareList(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/AppOperationVideoController.java

@@ -64,8 +64,8 @@ public class AppOperationVideoController extends BaseController {
     /**
      * 操作视频删除
      */
-    @DeleteMapping("/deleteOperationVideo")
-    public R<Void> deleteOperationVideo(Long[] ids) {
-        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(ids), true));
+    @DeleteMapping("/deleteOperationVideo/{id}")
+    public R<Void> deleteOperationVideo(@PathVariable Long id) {
+        return toAjax(appOperationVideoService.deleteWithValidByIds(List.of(id), true));
     }
 }

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

@@ -0,0 +1,88 @@
+package com.fuyuanshen.app.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.RandomUtil;
+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.constant.Constants;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.R;
+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 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;
+
+/**
+ * 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));
+    }
+
+
+    /**
+     * 发送忘记密码短信
+     *
+     * @param phonenumber 用户手机号
+     */
+    @SaIgnore
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/sendForgotPasswordSms")
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.APP_FORGOT_PASSWORD_SMS_KEY + phonenumber;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        // 验证码模板id 自行处理 (查数据库或写死均可)
+        String templateId = "";
+        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/domain/dto/AppDeviceLogoUploadDto.java

@@ -0,0 +1,16 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class AppDeviceLogoUploadDto {
+
+    private Long deviceId;
+
+    /**
+     *  文件
+     */
+    private MultipartFile file;
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppLightModeDto.java

@@ -0,0 +1,13 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class AppLightModeDto {
+
+    private Long deviceId;
+
+    //0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+    private Integer mode;
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/DeviceInstructDto.java

@@ -0,0 +1,16 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class DeviceInstructDto {
+
+    private Long deviceId;
+
+    private String deviceImei;
+    /**
+     *  下发指令
+     */
+    private String instructValue;
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/model/AppSmsLoginBody.java

@@ -22,4 +22,5 @@ public class AppSmsLoginBody {
      */
     @NotBlank(message = "租户ID不能为空")
     private String tenantId;
+
 }

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

@@ -0,0 +1,428 @@
+package com.fuyuanshen.app.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSON;
+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.AppDeviceBindRecord;
+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.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+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.AppDeviceBindRecordMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.ObjectUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+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.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+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 com.fuyuanshen.equipment.utils.c.ReliableTextToBitmap;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.Duration;
+import java.util.*;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AppDeviceBizService {
+
+    private final APPDeviceMapper appDeviceMapper;
+    private final DeviceMapper deviceMapper;
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final MqttGateway mqttGateway;
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+
+    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(AppDeviceSendMsgBo bo) {
+        List<Long> deviceIds = bo.getDeviceIds();
+        if(deviceIds == null || deviceIds.isEmpty()){
+            throw new ServiceException("请选择设备");
+        }
+        for (Long deviceId : deviceIds){
+            Device deviceObj = deviceMapper.selectById(deviceId);
+            if(deviceObj==null) {
+                throw new ServiceException("设备不存在"+deviceId);
+            }
+
+            byte[] msg = ReliableTextToBitmap.textToBitmapBytes(bo.getSendMsg());
+            Map<String,Object> linkHashMap = new HashMap<>();
+            linkHashMap.put("message",msg);
+            String sendMsg = JSON.toJSONString(linkHashMap);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(), 1 ,sendMsg);
+            log.info("发送设备消息：{}", bo.getSendMsg());
+
+            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("id", deviceId)
+                    .eq("binding_user_id", AppLoginHelper.getUserId())
+                    .set("send_msg", bo.getSendMsg());
+            deviceMapper.update(updateWrapper);
+        }
+        return 1;
+    }
+
+
+    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);
+
+            QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
+            bindRecordQueryWrapper.eq("device_id", device.getId());
+            bindRecordQueryWrapper.eq("binding_user_id", userId);
+            AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
+            if (appDeviceBindRecord != null) {
+                UpdateWrapper<AppDeviceBindRecord> deviceUpdateWrapper = new UpdateWrapper<>();
+                deviceUpdateWrapper.eq("device_id", device.getId())
+                        .eq("binding_user_id", userId)
+                        .set("binding_user_id", userId)
+                        .set("binding_time", new Date());
+                return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
+            }else{
+                AppDeviceBindRecord bindRecord = new AppDeviceBindRecord();
+                bindRecord.setDeviceId(device.getId());
+                bindRecord.setBindingUserId(userId);
+                bindRecord.setBindingTime(new Date());
+                bindRecord.setCreateBy(userId);
+                appDeviceBindRecordMapper.insert(bindRecord);
+            }
+
+            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) {
+        return unBindDevice(id, null, 1);
+    }
+
+    public int unBindDevice(Long id, Long userId, int type) {
+        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);
+        deviceMapper.update(null, deviceUpdateWrapper);
+
+        if (userId == null) {
+            userId = AppLoginHelper.getUserId();
+        }
+        QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
+        bindRecordQueryWrapper.eq("device_id", device.getId());
+        // 设备端解绑 0:设备端解绑 1:web端解绑
+        if (type == 1) {
+            bindRecordQueryWrapper.eq("binding_user_id", userId);
+        }
+
+        // AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
+        // if (appDeviceBindRecord != null) {
+        //     return appDeviceBindRecordMapper.deleteById(appDeviceBindRecord.getId());
+        // }
+
+        List<AppDeviceBindRecord> appDeviceBindRecordList = appDeviceBindRecordMapper.selectList(bindRecordQueryWrapper);
+        if (CollectionUtil.isNotEmpty(appDeviceBindRecordList)) {
+            appDeviceBindRecordList.forEach(appDeviceBindRecord ->
+                    appDeviceBindRecordMapper.deleteById(appDeviceBindRecord.getId()));
+        }
+
+        return 1;
+    }
+
+
+    public AppDeviceDetailVo getInfo(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        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());
+
+        vo.setSendMsg(device.getSendMsg());
+
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", device.getId());
+        AppPersonnelInfo appPersonnelInfo = appPersonnelInfoMapper.selectOne(qw);
+        if (appPersonnelInfo != null) {
+            AppPersonnelInfoVo personnelInfoVo = MapstructUtils.convert(appPersonnelInfo, AppPersonnelInfoVo.class);
+            vo.setPersonnelInfo(personnelInfoVo);
+        }
+        return vo;
+    }
+
+    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
+        Long deviceId = bo.getDeviceId();
+        Device deviceObj = deviceMapper.selectById(deviceId);
+        if(deviceObj == null){
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", deviceId);
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+//        unitName,position,name,id
+        byte[] unitName = ReliableTextToBitmap.textToBitmapBytes(bo.getUnitName());
+        byte[] position = ReliableTextToBitmap.textToBitmapBytes(bo.getPosition());
+        byte[] name = ReliableTextToBitmap.textToBitmapBytes(bo.getName());
+        byte[] id = ReliableTextToBitmap.textToBitmapBytes(bo.getCode());
+        Map<String,Object> linkHashMap = new HashMap<>();
+        linkHashMap.put("unitName",unitName);
+        linkHashMap.put("position",position);
+        linkHashMap.put("name",name);
+        linkHashMap.put("id",id);
+        String personnelInfo = JSON.toJSONString(linkHashMap);
+        mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+deviceObj.getDeviceImei(), 1 ,personnelInfo);
+        log.info("发送点阵数据到设备消息：{}", bo);
+
+        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+        } else {
+            UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
+            uw.eq("device_id", deviceId)
+                    .set("name", bo.getName())
+                    .set("position", bo.getPosition())
+                    .set("unit_name", bo.getUnitName())
+                    .set("code", bo.getCode());
+            return appPersonnelInfoMapper.update(null, uw) > 0;
+        }
+
+
+    }
+
+    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+            System.out.println("长度：" + largeData.length);
+
+            System.out.println("原始数据大小: " + largeData.length + " 字节");
+
+            int[] ints = convertHexToDecimal(largeData);
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+"app_logo_data:" + device.getDeviceImei(), Arrays.toString(ints), Duration.ofSeconds(30 * 60L));
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+"app_logo_data:" + device.getDeviceImei());
+
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
+            System.out.println("第0块数据大小: " + specificChunk.length + " 字节");
+            System.out.println("第0块数据: " + Arrays.toString(specificChunk));
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(3);
+            intData.add(1);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk),intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+    public void lightModeSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId = params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            Integer instructValue =  Integer.parseInt(params.getInstructValue());
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(1);
+            intData.add(instructValue);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    //灯光亮度设置
+    public void lightBrightnessSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId = params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            String instructValue = params.getInstructValue();
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(5);
+            String[] values = instructValue.split("\\.");
+            String value1 = values[0];
+            String value2 = values[1];
+            if(StringUtils.isNoneBlank(value1)){
+                intData.add(Integer.parseInt(value1));
+            }
+            if(StringUtils.isNoneBlank(value2)){
+                intData.add(Integer.parseInt(value2));
+            }
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    //激光模式设置
+    public void laserModeSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId =  params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            Integer instructValue = Integer.parseInt(params.getInstructValue());
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(4);
+            intData.add(instructValue);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , JSON.toJSONString(map));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),JSON.toJSONString(map));
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+    public String mapReverseGeocoding(DeviceInstructDto params) {
+//        Long deviceId = params.getDeviceId();
+//        Device device = deviceMapper.selectById(deviceId);
+        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("device_imei", params.getDeviceImei());
+        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        if(ObjectUtils.length( devices) ==0){
+            throw new ServiceException("设备不存在");
+        }
+        return RedisUtils.getCacheObject("device:location:" + devices.get(0).getDeviceImei());
+    }
+
+}

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

@@ -0,0 +1,135 @@
+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;
@@ -51,7 +48,7 @@ public class AppLoginService {
     private Integer lockTime;
 
     private final ISysTenantService tenantService;
-    private final IAppRoleService roleService;
+    private final IAppUserService appUserService;
 
 
     /**
@@ -184,5 +181,24 @@ public class AppLoginService {
             throw new TenantException("tenant.expired");
         }
     }
-
+    public void cancelAccount() {
+        try {
+            AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+            if (ObjectUtil.isNull(loginUser)) {
+                return;
+            }
+            appUserService.deleteWithValidByIds(Collections.singletonList(loginUser.getUserId()),true);
+            if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
+                // 超级管理员 登出清除动态租户
+                TenantHelper.clearDynamic();
+            }
+            recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, "用户注销成功");
+        } catch (NotLoginException ignored) {
+        } finally {
+            try {
+                StpUtil.logout();
+            } catch (NotLoginException ignored) {
+            }
+        }
+    }
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttMessageRule.java

@@ -0,0 +1,26 @@
+package com.fuyuanshen.global.mqtt.base;
+
+/**
+ * MQTT消息处理接口
+ */
+public interface MqttMessageRule {
+
+    /**
+     * 获取命令类型
+     * @return 命令类型
+     */
+    String getCommandType();
+    /**
+     * 执行处理
+     * @param context 处理上下文
+     */
+    void execute(MqttRuleContext context);
+    
+    /**
+     * 获取优先级，数值越小优先级越高
+     * @return 优先级
+     */
+    default int getPriority() {
+        return 0;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttRuleContext.java

@@ -0,0 +1,32 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * MQTT消息处理上下文
+ */
+@Data
+public class MqttRuleContext {
+    /**
+     * 命令类型
+     */
+    private byte commandType;
+    /**
+     * 转换后的参数数组
+     */
+    private Object[] convertArr;
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+    /**
+     * 数据来源Redis
+     */
+    private String dataFromRedis;
+    /**
+     * MQTT消息负载字典
+     */
+    private Map<String, Object> payloadDict;
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttRuleEngine.java

@@ -0,0 +1,39 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * MQTT消息引擎
+ */
+@Component
+public class MqttRuleEngine {
+    
+
+    private final LinkedHashMap<String, MqttMessageRule> rulesMap = new LinkedHashMap<>();
+    public MqttRuleEngine(List<MqttMessageRule> rules) {
+        // 按优先级排序
+        rules.sort(Comparator.comparing(MqttMessageRule::getPriority));
+        rules.forEach(rule -> rulesMap.put(rule.getCommandType(), rule)
+        );
+    }
+    
+    /**
+     * 执行匹配
+     * @param context 处理上下文
+     * @return
+     */
+    public boolean executeRule(MqttRuleContext context) {
+        int commandType = context.getCommandType();
+        MqttMessageRule mqttMessageRule = rulesMap.get("Light_"+commandType);
+        if (mqttMessageRule != null) {
+            mqttMessageRule.execute(context);
+            return true;
+        }
+        
+        return false;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttConfiguration.java

@@ -1,4 +1,4 @@
-package com.fuyuanshen.system.mqtt.config;
+package com.fuyuanshen.global.mqtt.config;
 
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,12 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
 import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  14:40
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
+
 @Configuration
 public class MqttConfiguration {
     @Autowired

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttGateway.java

@@ -1,4 +1,4 @@
-package com.fuyuanshen.system.mqtt.config;
+package com.fuyuanshen.global.mqtt.config;
 
 import org.springframework.integration.annotation.MessagingGateway;
 import org.springframework.integration.mqtt.support.MqttHeaders;

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttInboundConfiguration.java

@@ -1,8 +1,8 @@
-package com.fuyuanshen.system.mqtt.config;
+package com.fuyuanshen.global.mqtt.config;
 
 
 import cn.hutool.core.lang.UUID;
-import com.fuyuanshen.system.mqtt.receiver.ReceiverMessageHandler;
+import com.fuyuanshen.global.mqtt.receiver.ReceiverMessageHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,12 +15,7 @@ import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  14:54
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
+
 @Configuration
 public class MqttInboundConfiguration {
     @Autowired

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttOutboundConfiguration.java

@@ -1,4 +1,4 @@
-package com.fuyuanshen.system.mqtt.config;
+package com.fuyuanshen.global.mqtt.config;
 
 import cn.hutool.core.lang.UUID;
 import lombok.extern.slf4j.Slf4j;
@@ -12,12 +12,6 @@ import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  15:46
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
 @Configuration
 @Slf4j
 public class MqttOutboundConfiguration {
@@ -44,7 +38,7 @@ public class MqttOutboundConfiguration {
                 mqttPahoClientFactory
         );
         mqttPahoMessageHandler.setDefaultQos(1);
-        mqttPahoMessageHandler.setDefaultTopic("worker/location");
+        mqttPahoMessageHandler.setDefaultTopic("B/#");
         mqttPahoMessageHandler.setAsync(true);
         return mqttPahoMessageHandler;
     }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttPropertiesConfig.java

@@ -1,15 +1,10 @@
-package com.fuyuanshen.system.mqtt.config;
+package com.fuyuanshen.global.mqtt.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  14:32
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
+
 @Data
 @ConfigurationProperties(prefix = "mqtt")
 @Component

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java

@@ -0,0 +1,76 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+/**
+ * 设备命令类型常量
+ * Device Command Type Constants
+ */
+public class LightingCommandTypeConstants {
+    
+    /**
+     * 灯光模式 (Light Mode)
+     */
+    public static final String LIGHT_MODE = "Light_1";
+    
+    /**
+     * 人员信息 (Personnel Information)
+     */
+    public static final String PERSONNEL_INFO = "Light_2";
+    
+    /**
+     * 开机LOGO (Boot Logo)
+     */
+    public static final String BOOT_LOGO = "Light_3";
+    
+    /**
+     * 激光灯 (Laser Light)
+     */
+    public static final String LASER_LIGHT = "Light_4";
+    
+    /**
+     * 主灯亮度 (Main Light Brightness)
+     */
+    public static final String MAIN_LIGHT_BRIGHTNESS = "Light_5";
+    
+    /**
+     * 定位数据 (Location Data)
+     */
+    public static final String LOCATION_DATA = "Light_11";
+
+    /**
+     * 主动上报设备数据 (Active Reporting Device Data)
+     */
+    public static final String ACTIVE_REPORTING_DEVICE_DATA = "Light_12";
+    
+    /**
+     * 获取命令类型描述
+     * 
+     * @param commandType 命令类型
+     * @return 命令类型描述
+     */
+    public static String getCommandTypeDescription(String commandType) {
+        return switch (commandType) {
+            case LIGHT_MODE -> "灯光模式 (Light Mode)";
+            case PERSONNEL_INFO -> "人员信息 (Personnel Information)";
+            case BOOT_LOGO -> "开机LOGO (Boot Logo)";
+            case LASER_LIGHT -> "激光灯 (Laser Light)";
+            case MAIN_LIGHT_BRIGHTNESS -> "主灯亮度 (Main Light Brightness)";
+            case LOCATION_DATA -> "定位数据 (Location Data)";
+            default -> "未知命令类型 (Unknown Command Type)";
+        };
+    }
+    
+    /**
+     * 检查是否为有效命令类型
+     * 
+     * @param commandType 命令类型
+     * @return 是否有效
+     */
+    public static boolean isValidCommandType(String commandType) {
+        return commandType.equals(LIGHT_MODE)  ||
+               commandType.equals(PERSONNEL_INFO) ||
+               commandType.equals(BOOT_LOGO) ||
+               commandType.equals(LASER_LIGHT) ||
+               commandType.equals(MAIN_LIGHT_BRIGHTNESS) ||
+               commandType.equals(LOCATION_DATA);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/MqttConstants.java

@@ -0,0 +1,16 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+
+public interface MqttConstants {
+
+
+    /**
+     * 全局发布消息的key
+     */
+    String GLOBAL_PUB_KEY = "B/";
+
+    /**
+     * 全局订阅消息的key
+     */
+    String GLOBAL_SUB_KEY = "A/";
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/DeviceDataController.java

@@ -1,4 +1,4 @@
-package com.fuyuanshen.system.mqtt.publish;
+package com.fuyuanshen.global.mqtt.publish;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttClientTest.java

@@ -1,7 +1,7 @@
-package com.fuyuanshen.system.mqtt.publish;
+package com.fuyuanshen.global.mqtt.publish;
 
 
-import com.fuyuanshen.system.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/publish/MqttMessageSender.java

@@ -1,6 +1,6 @@
-package com.fuyuanshen.system.mqtt.publish;
+package com.fuyuanshen.global.mqtt.publish;
 
-import com.fuyuanshen.system.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.integration.mqtt.support.MqttHeaders;
 import org.springframework.messaging.handler.annotation.Header;

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/ReceiverMessageHandler.java

@@ -0,0 +1,63 @@
+package com.fuyuanshen.global.mqtt.receiver;
+
+import cn.hutool.core.lang.Dict;
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.base.MqttRuleEngine;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.MessagingException;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Service
+@Slf4j
+public class ReceiverMessageHandler implements MessageHandler {
+
+    @Autowired
+    private MqttRuleEngine ruleEngine;
+
+    @Override
+    public void handleMessage(Message<?> message) throws MessagingException {
+        Object payload = message.getPayload();
+        MessageHeaders headers = message.getHeaders();
+        String receivedTopic = Objects.requireNonNull(headers.get("mqtt_receivedTopic")).toString();
+        String receivedQos = Objects.requireNonNull(headers.get("mqtt_receivedQos")).toString();
+        String timestamp = Objects.requireNonNull(headers.get("timestamp")).toString();
+        
+        log.info("MQTT payload= {} \n receivedTopic = {} \n receivedQos = {} \n timestamp = {}",
+                payload, receivedTopic, receivedQos, timestamp);
+                
+        Dict payloadDict = JsonUtils.parseMap(payload.toString());
+        if (receivedTopic == null || payloadDict == null) {
+            return;
+        }
+        
+        String state = payloadDict.getStr("state");
+        Object[] convertArr = ImageToCArrayConverter.convertByteStringToMixedObjectArray(state);
+        
+        if (convertArr.length > 0) {
+            Byte val1 = (Byte) convertArr[0];
+            String[] subStr = receivedTopic.split("/");
+            System.out.println("收到设备id: " + subStr[1]);
+            String deviceImei = subStr[1];
+
+            MqttRuleContext context = new MqttRuleContext();
+            context.setCommandType(val1);
+            context.setConvertArr(convertArr);
+            context.setDeviceImei(deviceImei);
+            context.setPayloadDict(payloadDict);
+
+            boolean ruleExecuted = ruleEngine.executeRule(context);
+            
+            if (!ruleExecuted) {
+                log.warn("未找到匹配的规则来处理命令类型: {}", val1);
+            }
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/ActiveReportingDeviceDataRule.java

@@ -0,0 +1,95 @@
+package com.fuyuanshen.global.mqtt.rule;
+
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * 主动上报设备数据命令处理
+ * "第1位为12表示设备主动上报设备硬件状态，第2为表示当时设备主灯档位，第3位表示当时激光灯档位，第4位电量百分比，第5位为充电状态（0没有充电，1正在充电，2为已充满）
+ * 第6位200代表电池剩余续航时间200分钟"
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class ActiveReportingDeviceDataRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.ACTIVE_REPORTING_DEVICE_DATA;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        try {
+            Object[] convertArr = context.getConvertArr();
+            // Latitude, longitude
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            String mainLightMode = convertArr[1].toString();
+            String laserLightMode = convertArr[2].toString();
+            String batteryPercentage = convertArr[3].toString();
+            String chargeState = convertArr[4].toString();
+            String batteryRemainingTime = convertArr[5].toString();
+
+            // 异步发送设备状态和位置信息到Redis
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
+                    batteryPercentage, chargeState, batteryRemainingTime);
+        } catch (Exception e) {
+            log.error("处理定位数据命令时出错", e);
+        }
+    }
+
+    /**
+     * 异步发送设备状态信息和位置信息到Redis（使用CompletableFuture）
+     *
+     * @param deviceImei 设备IMEI
+     * @param mainLightMode 主灯档位
+     * @param laserLightMode 激光灯档位
+     * @param batteryPercentage 电量百分比
+     * @param chargeState 充电状态
+     * @param batteryRemainingTime 电池剩余续航时间
+     */
+    public void asyncSendDeviceDataToRedisWithFuture(String deviceImei, String mainLightMode, String laserLightMode,
+                                                     String batteryPercentage, String chargeState, String batteryRemainingTime) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                // 构造设备状态信息对象
+                Map<String, Object> deviceInfo = new LinkedHashMap<>();
+                deviceInfo.put("deviceImei", deviceImei);
+                deviceInfo.put("mainLightMode", mainLightMode);
+                deviceInfo.put("laserLightMode", laserLightMode);
+                deviceInfo.put("batteryPercentage", batteryPercentage);
+                deviceInfo.put("chargeState", chargeState);
+                deviceInfo.put("batteryRemainingTime", batteryRemainingTime);
+                deviceInfo.put("timestamp", System.currentTimeMillis());
+
+                // 将设备状态信息存储到Redis中
+                String deviceRedisKey = "device:status:" + deviceImei;
+                String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
+
+                // 存储到Redis，设置过期时间（例如24小时）
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson, Duration.ofSeconds(24 * 60 * 60));
+
+                log.info("设备状态信息已异步发送到Redis: device={}, mainLightMode={}, laserLightMode={}, batteryPercentage={}",
+                        deviceImei, mainLightMode, laserLightMode, batteryPercentage);
+            } catch (Exception e) {
+                log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/LocationDataRule.java

@@ -0,0 +1,149 @@
+package com.fuyuanshen.global.mqtt.rule;
+
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
+import com.fuyuanshen.equipment.utils.map.LngLonUtil;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * 定位数据命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class LocationDataRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LOCATION_DATA;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        try {
+            Object[] convertArr = context.getConvertArr();
+            // Latitude, longitude
+            String latitude = convertArr[1].toString();
+            String longitude = convertArr[2].toString();
+
+            // 异步发送经纬度到Redis
+            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
+
+            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            log.info("发送定位数据到设备=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+        } catch (Exception e) {
+            log.error("处理定位数据命令时出错", e);
+        }
+    }
+
+    /**
+     * 异步发送位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     * @param latitude 纬度
+     * @param longitude 经度
+     * @param timestamp 时间戳
+     */
+//    @Async
+//    public void asyncSendLocationToRedis(String deviceImei, String latitude, String longitude, long timestamp) {
+//        try {
+//            // 构造位置信息对象
+//            Map<String, Object> locationInfo = new HashMap<>();
+//            locationInfo.put("deviceImei", deviceImei);
+//            locationInfo.put("latitude", latitude);
+//            locationInfo.put("longitude", longitude);
+//            locationInfo.put("timestamp", timestamp);
+//
+//            // 将位置信息存储到Redis中，使用设备IMEI作为key的一部分
+//            String redisKey = "device:location:" + deviceImei;
+//            String locationJson = JsonUtils.toJsonString(locationInfo);
+//
+//            // 存储到Redis，设置过期时间（例如24小时）
+//            RedisUtils.setCacheObject(redisKey, locationJson, Duration.ofSeconds(24 * 60 * 60));
+//
+//            // 也可以存储到一个列表中，保留历史位置信息
+//            String locationHistoryKey = "device:location:history:" + deviceImei;
+//            RedisUtils.lPush(locationHistoryKey, locationJson, 24 * 60 * 60);
+//
+//            log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+//        } catch (Exception e) {
+//            log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+//        }
+//    }
+
+    /**
+     * 异步发送位置信息到Redis（使用CompletableFuture）
+     *
+     * @param deviceImei 设备IMEI
+     * @param latitude   纬度
+     * @param longitude  经度
+     */
+    public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                if(StringUtils.isNotBlank(latitude) || StringUtils.isNotBlank(longitude)){
+                    return;
+                }
+                // 构造位置信息对象
+                Map<String, Object> locationInfo = new LinkedHashMap<>();
+                double[] doubles = LngLonUtil.gps84_To_Gcj02(Double.parseDouble(latitude), Double.parseDouble(longitude));
+                locationInfo.put("deviceImei", deviceImei);
+                locationInfo.put("latitude", doubles[0]);
+                locationInfo.put("longitude", doubles[1]);
+                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+                locationInfo.put("address", address);
+                locationInfo.put("timestamp", System.currentTimeMillis());
+
+
+                // 将位置信息存储到Redis中
+                String redisKey = "device:location:" + deviceImei;
+                String locationJson = JsonUtils.toJsonString(locationInfo);
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(redisKey, locationJson, Duration.ofSeconds(24 * 60 * 60));
+
+                log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            } catch (Exception e) {
+                log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+    
+    private Map<String, Object> buildLocationDataMap(String latitude, String longitude) {
+        String[] latArr = latitude.split("\\.");
+        String[] lonArr = longitude.split("\\.");
+        
+        ArrayList<Integer> intData = new ArrayList<>();
+        intData.add(11);
+        intData.add(Integer.parseInt(latArr[0]));
+        intData.add(Integer.parseInt(latArr[1]));
+        intData.add(Integer.parseInt(lonArr[0]));
+        intData.add(Integer.parseInt(lonArr[1]));
+        
+        Map<String, Object> map = new HashMap<>();
+        map.put("instruct", intData);
+        return map;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/PersonnelInfoRule.java

@@ -0,0 +1,76 @@
+package com.fuyuanshen.global.mqtt.rule;
+
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+
+/**
+ * 人员信息命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class PersonnelInfoRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.PERSONNEL_INFO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        try {
+            Byte val2 = (Byte) context.getConvertArr()[1];
+            if (val2 == 100) {
+                return;
+            }
+
+            String data = RedisUtils.getCacheObject("894078:app_logo_data:" + context.getDeviceImei());
+            if (StringUtils.isEmpty(data)) {
+                return;
+            }
+            
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            System.out.println("第" + val2 + "块数据大小: " + specificChunk.length + " 字节");
+            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(3);
+            intData.add((int) val2);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            log.info("发送人员信息点阵数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+        } catch (Exception e) {
+            log.error("处理人员信息命令时出错", e);
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/mp/controller/MPAuthController.java

@@ -0,0 +1,102 @@
+package com.fuyuanshen.mp.controller;
+
+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.AppLoginUser;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
+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;
+import com.fuyuanshen.equipment.domain.UserApp;
+import com.fuyuanshen.equipment.enums.AppUserTypeEnum;
+import com.fuyuanshen.mp.domian.dto.AuthUserDto;
+import com.fuyuanshen.mp.service.MPAuthService;
+import com.fuyuanshen.mp.service.MPService;
+import com.fuyuanshen.system.domain.bo.SysTenantBo;
+import com.fuyuanshen.system.domain.vo.SysClientVo;
+import com.fuyuanshen.system.domain.vo.SysTenantVo;
+import com.fuyuanshen.system.domain.vo.SysUserVo;
+import com.fuyuanshen.system.service.ISysClientService;
+import com.fuyuanshen.system.service.ISysConfigService;
+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.IAuthStrategy;
+import com.fuyuanshen.web.service.SysRegisterService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * APP认证
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mp")
+public class MPAuthController {
+
+    private final AppLoginService loginService;
+    private final SysRegisterService registerService;
+    private final ISysConfigService configService;
+    private final ISysTenantService tenantService;
+    private final ISysClientService clientService;
+    private final MPAuthService mpAuthService;
+    private final MPService mpService;
+
+
+    @Operation(summary = "小程序登录授权")
+    @PostMapping(value = "/login")
+    public ResponseEntity<Object> login(@RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
+
+        Long phoneNumber = authUser.getPhoneNumber();
+        // 判断小程序用户是否存在，不存在创建
+        UserApp mpUser = mpService.getMpUser(phoneNumber);
+        if (mpUser == null) {
+            RegisterBody registerBody = new RegisterBody();
+            registerBody.setUsername(phoneNumber.toString());
+            registerBody.setUserType(AppUserTypeEnum.XCX_USER.getCode());
+            registerBody.setTenantId("894078");
+            registerBody.setPassword("123456");
+            mpAuthService.register(registerBody);
+        }
+
+        // 去登录
+        SysClientVo client = clientService.queryByClientId("ca839698e245d60aa2f0e59bd52b34f8");
+        UserApp user = mpService.loadUserByUsername(phoneNumber.toString());
+        LoginUser loginUser = mpAuthService.buildLoginUser(user);
+        LoginVo login = mpAuthService.login(loginUser, client);
+
+        // 返回登录信息
+        return ResponseEntity.ok(login);
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/controller/MPController.java

@@ -0,0 +1,37 @@
+package com.fuyuanshen.mp.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.fuyuanshen.common.core.domain.ResponseVO;
+import com.fuyuanshen.equipment.service.DeviceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-1208:36
+ */
+@Slf4j
+@RestController
+@RequestMapping("/mp")
+@RequiredArgsConstructor
+@Tag(name = "小程序：相关接口")
+@SaIgnore
+public class MPController {
+
+    private final DeviceService deviceService;
+
+
+    @GetMapping("/queryDevice")
+    @Operation(summary = "检查是否存在设备MAC号")
+    public ResponseVO<Boolean> queryDevice(@Parameter(name = "设备mac值") String mac) {
+        return ResponseVO.success(deviceService.queryDevice(mac));
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/domian/dto/AuthUserDto.java

@@ -0,0 +1,46 @@
+/*
+ *  Copyright 2019-2025 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package com.fuyuanshen.mp.domian.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+
+/**
+ * @author Zheng Jie
+ * @date 2018-11-30
+ */
+@Getter
+@Setter
+public class AuthUserDto {
+
+    @Schema(name = "用户名")
+    private String username;
+
+    @Schema(name = "手机号（APP/小程序 登录）")
+    private Long phoneNumber;
+
+    @Schema(name = "密码")
+    private String password;
+
+    @Schema(name = "验证码")
+    private String code;
+
+    @Schema(name = "验证码的key")
+    private String uuid = "";
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/mapper/MPMapper.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.mp.mapper;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-07-1210:16
+ */
+public interface MPMapper {
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/MPAuthService.java

@@ -0,0 +1,164 @@
+package com.fuyuanshen.mp.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Opt;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.service.IAppRoleService;
+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.PostDTO;
+import com.fuyuanshen.common.core.domain.dto.RoleDTO;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
+import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.enums.UserType;
+import com.fuyuanshen.common.core.exception.user.UserException;
+import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.log.event.LogininforEvent;
+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.exception.TenantException;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.UserApp;
+import com.fuyuanshen.equipment.service.AppUserService;
+import com.fuyuanshen.system.domain.SysUser;
+import com.fuyuanshen.system.domain.bo.SysUserBo;
+import com.fuyuanshen.system.domain.vo.*;
+import com.fuyuanshen.system.service.ISysTenantService;
+import com.fuyuanshen.system.service.ISysUserService;
+import com.fuyuanshen.web.domain.vo.LoginVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.function.Supplier;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class MPAuthService {
+
+    private final ISysUserService userService;
+    private final AppUserService appUserService;
+
+    /**
+     * 小程序注册
+     */
+    public void register(RegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getUsername();
+        String password = registerBody.getPassword();
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+
+        UserApp sysUser = new UserApp();
+        sysUser.setUserName(username);
+        sysUser.setNickName(username);
+        sysUser.setPhonenumber(username);
+        sysUser.setTenantId(tenantId);
+        sysUser.setUserType(registerBody.getUserType());
+        sysUser.setPassword(BCrypt.hashpw(password));
+        sysUser.setUserType(userType);
+
+        appUserService.saveMpUser(sysUser);
+
+    }
+
+
+    /**
+     * 记录登录信息
+     *
+     * @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());
+        // com.fuyuanshen.web.listener.UserActionListener
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+
+    public LoginVo login(LoginUser loginUser, SysClientVo client) {
+        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
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 构建登录用户
+     */
+    public LoginUser buildLoginUser(UserApp user) {
+        LoginUser loginUser = new LoginUser();
+        Long userId = user.getUserId();
+        loginUser.setTenantId(user.getTenantId());
+        loginUser.setUserId(userId);
+        loginUser.setDeptId(user.getDeptId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType(user.getUserType());
+        // 用户级别
+        // loginUser.setUserLevel(user.getUserLevel());
+        // pid
+        // loginUser.setPid(user.getPid());
+
+        // loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
+        // loginUser.setRolePermission(permissionService.getRolePermission(userId));
+        // if (ObjectUtil.isNotNull(user.getDeptId())) {
+        //     Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
+        //     loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
+        //     loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
+        // }
+        // List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
+        // // List<SysPostVo> posts = postService.selectPostsByUserId(userId);
+        // loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
+        // loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
+        return loginUser;
+    }
+
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/MPService.java

@@ -0,0 +1,26 @@
+package com.fuyuanshen.mp.service;
+
+import com.fuyuanshen.equipment.domain.UserApp;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+
+public interface MPService {
+
+
+    /**
+     * 获取小程序用户信息
+     *
+     * @param phoneNumber 手机号
+     */
+    UserApp getMpUser(Long phoneNumber);
+
+    UserApp loadUserByUsername(String username);
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/impl/MPAuthServiceImpl.java

@@ -0,0 +1,12 @@
+package com.fuyuanshen.mp.service.impl;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+public class MPAuthServiceImpl {
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/mp/service/impl/MPServiceImpl.java

@@ -0,0 +1,43 @@
+package com.fuyuanshen.mp.service.impl;
+
+import com.fuyuanshen.equipment.domain.UserApp;
+import com.fuyuanshen.equipment.mapper.UserAppMapper;
+import com.fuyuanshen.equipment.service.AppUserService;
+import com.fuyuanshen.mp.service.MPService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * 登录校验方法
+ *
+ * @author Lion Li
+ */
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MPServiceImpl implements MPService {
+
+
+    private final AppUserService appUserService;
+
+
+
+    /**
+     * 获取小程序用户信息
+     *
+     * @param phoneNumber 手机号
+     */
+    @Override
+    public UserApp getMpUser(Long phoneNumber) {
+        return appUserService.getMpUser(phoneNumber);
+    }
+
+    @Override
+    public UserApp loadUserByUsername(String username) {
+       return appUserService.loadUserByUsername(username);
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/config/CustomMqttInboundConfiguration.java

@@ -0,0 +1,61 @@
+package com.fuyuanshen.web.config;
+
+import cn.hutool.core.lang.UUID;
+import com.fuyuanshen.global.mqtt.config.MqttPropertiesConfig;
+import com.fuyuanshen.web.handler.mqtt.DeviceReceiverMessageHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.core.MessageProducer;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
+import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-08-0110:46
+ */
+@Configuration
+public class CustomMqttInboundConfiguration {
+
+    @Autowired
+    private MqttPropertiesConfig mqttPropertiesConfig;
+    @Autowired
+    private MqttPahoClientFactory mqttPahoClientFactory;
+    @Autowired
+    private DeviceReceiverMessageHandler deviceReceiverMessageHandler;
+
+
+    @Bean
+    public MessageChannel customMqttChannel(){
+        return new DirectChannel();
+    }
+
+
+    @Bean
+    public MessageProducer customMessageProducer(){
+        String clientId = "custom_client_" + UUID.fastUUID();
+        MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(
+                mqttPropertiesConfig.getUrl(),
+                clientId,
+                mqttPahoClientFactory,
+                "A/#", "B/#"  // 直接指定这两个主题
+        );
+        adapter.setQos(1);
+        adapter.setConverter(new DefaultPahoMessageConverter());
+        adapter.setOutputChannel(customMqttChannel());
+        return adapter;
+    }
+
+
+    @Bean
+    @ServiceActivator(inputChannel = "customMqttChannel")
+    public MessageHandler customMessageHandler(){
+        return deviceReceiverMessageHandler;
+    }
+
+}

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

@@ -111,6 +111,7 @@ public class AuthController {
         return R.ok(loginVo);
     }
 
+
     /**
      * 获取跳转URL
      *
@@ -133,6 +134,7 @@ public class AuthController {
         return R.ok("操作成功", authorizeUrl);
     }
 
+
     /**
      * 前端回调绑定授权(需要token)
      *

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

@@ -67,7 +67,7 @@ public class CaptchaController {
         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, map);
         if (!smsResponse.isSuccess()) {
             log.error("验证码短信发送异常 => {}", smsResponse);
             return R.fail(smsResponse.getData().toString());

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

@@ -0,0 +1,46 @@
+package com.fuyuanshen.web.controller.device;
+
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.service.WEBDeviceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Slf4j
+@Tag(name = "web:设备管理", description = "web:设备管理")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/device")
+public class WEBDeviceController extends BaseController {
+
+    private final WEBDeviceService deviceService;
+
+
+    /**
+     * @param id
+     * @return
+     * @ModelAttribute 主要用于将请求参数绑定到 Java 对象上，它会从 HTTP 请求的查询参数（Query Parameters）
+     * 或表单数据（Form Data）中提取值，并自动填充到指定的对象属性中。
+     */
+    // @Log("解绑设备")
+    @Operation(summary = "WEB端解绑设备")
+    @DeleteMapping(value = "/unbind")
+    public R<Void> unbindDevice(Long id, Long userId) {
+        return toAjax(deviceService.webUnBindDevice(id, userId));
+    }
+
+
+}
+
+

fys-admin/src/main/java/com/fuyuanshen/web/enums/InstructType6170.java

@@ -0,0 +1,50 @@
+package com.fuyuanshen.web.enums;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-08-0114:14
+ */
+public enum InstructType6170 {
+
+    EQUIPMENT_REPORTING(0, "设备启动"),
+    LIGHT_MODE(1, "灯光模式"),
+    /**
+     * 设备信息
+     * 单位/姓名/职位
+     */
+    UNIT_INFO(2, "设备信息"),
+    BOOT_IMAGE(3, "开机图片"),
+    LASER_LIGHT(4, "激光灯"),
+    BRIGHTNESS(5, "亮度调节"),
+    LOCATION_DATA(11, "定位数据"),
+
+
+    UNKNOWN(-1, "未知操作");
+
+    private final int code;
+    private final String description;
+
+    InstructType6170(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static InstructType6170 fromCode(int code) {
+        for (InstructType6170 type : values()) {
+            if (type.getCode() == code) {
+                return type;
+            }
+        }
+        // throw new IllegalArgumentException("未知的指令类型代码: " + code);
+        return UNKNOWN;
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/handler/mqtt/DeviceReceiverMessageHandler.java

@@ -0,0 +1,264 @@
+package com.fuyuanshen.web.handler.mqtt;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
+import com.fuyuanshen.equipment.utils.map.LngLonUtil;
+import com.fuyuanshen.web.enums.InstructType6170;
+import com.fuyuanshen.web.enums.LightModeEnum6170;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.MessagingException;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定义监听主题消息的处理器
+ *
+ * @author: 默苍璃
+ * @date: 2025-08-0110:19
+ */
+@Component
+@Data
+@AllArgsConstructor
+@Slf4j
+public class DeviceReceiverMessageHandler implements MessageHandler {
+
+    private final DeviceMapper deviceMapper;
+    private final DeviceLogMapper deviceLogMapper;
+
+    // 使用Jackson解析JSON
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+
+    /**
+     * 处理接收的消息
+     *
+     * @param message
+     * @throws MessagingException
+     */
+    @Override
+    public void handleMessage(Message<?> message) throws MessagingException {
+        // System.out.println("接收到的消息：" + message.getPayload());
+        MessageHeaders headers = message.getHeaders();
+        String receivedTopicName = (String) headers.get("mqtt_receivedTopic");
+        System.out.println("消息来自主题：" + receivedTopicName);
+
+        String payload = message.getPayload().toString();
+
+        if (receivedTopicName != null) {
+            // 1. 提取设备ID (从主题中获取)
+            String deviceImei = extractDeviceId(receivedTopicName);
+            Device device = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_imei", deviceImei));
+            if (device == null) {
+                log.info("不存在的设备IMEI: {}", deviceImei);
+            } else {
+
+                try {
+                    JsonNode root = objectMapper.readTree(payload);
+
+                    DeviceLog record = new DeviceLog();
+                    // 手动设置租户ID
+                    record.setTenantId(device.getTenantId()); // 从设备信息中获取租户ID
+                    // 设备ID
+                    record.setDeviceId(device.getId());
+                    // 设备名称
+                    record.setDeviceName(device.getDeviceName());
+
+                    // 2. 处理instruct消息
+                    if (root.has("instruct")) {
+                        JsonNode instructNode = root.get("instruct");
+                        if (instructNode.isArray()) {
+                            boolean b = receivedTopicName.startsWith("B/");
+                            record = parseInstruct(device, instructNode, b);
+                            // 根据不同主题进行不同处理
+                            if (receivedTopicName.startsWith("A/")) {
+                                // 处理A主题的消息（设备上传）
+                                record.setDataSource("设备上报");
+                            } else if (receivedTopicName.startsWith("B/")) {
+                                // 处理B主题的消息 （手动上传）
+                                record.setDataSource("客户端操作");
+                            }
+                        }
+                        deviceLogMapper.insert(record);
+                    }
+
+                    if (root.has("imei")) {
+                        // 设备行为
+                        record.setDeviceAction(InstructType6170.fromCode(0).getDescription());
+                        record.setDataSource("设备上报");
+                        record.setContent("设备启动");
+                        deviceLogMapper.insert(record);
+                    }
+
+
+                    // 3. 处理state消息
+                    // else if (root.has("state")) {
+                    //     JsonNode stateNode = root.get("state");
+                    //     if (stateNode.isArray()) {
+                    //         StateRecord record = parseState(device, stateNode);
+                    //         stateRepo.save(record);
+                    //     }
+                    // }
+                } catch (Exception e) {
+                    log.error("消息解析失败: {}", payload, e);
+                }
+
+            }
+
+        }
+    }
+
+
+    /**
+     * 从主题中提取设备ID(IMEI)
+     *
+     * @param topic
+     * @return
+     */
+    private String extractDeviceId(String topic) {
+        // 处理 A/# 或 B/# 格式的主题，例如 B/861556078765285 或 A/861556078765285
+        String[] segments = topic.split("/");
+        if (segments.length >= 2) {
+            // 返回第二个段，即 / 后面的部分
+            return segments[1];
+        }
+        // 如果格式不符合预期，返回原主题
+        return topic;
+    }
+
+
+    /**
+     * 解析instruct消息
+     *
+     * @param device
+     * @param array
+     * @param b
+     * @return
+     */
+    private DeviceLog parseInstruct(Device device, JsonNode array, boolean b) {
+        DeviceLog record = new DeviceLog();
+        record.setDeviceName(device.getDeviceName());
+        // 设备行为
+        record.setDeviceAction(InstructType6170.fromCode(array.get(0).asInt()).getDescription());
+
+        switch (array.get(0).asInt()) {
+            case 1: // 灯光模式
+                LightModeEnum6170 lightModeEnum6170 = LightModeEnum6170.fromCode(array.get(1).asInt());
+                record.setContent(lightModeEnum6170.getDescription());
+                break;
+
+            case 2: // 单位/姓名/职位
+                byte[] unitBytes = new byte[480];
+                for (int i = 1; i <= 480; i++) {
+                    unitBytes[i - 1] = (byte) array.get(i).asInt();
+                }
+                // record.setUnitData(unitBytes);
+                break;
+
+            case 3: // 开机图片
+                // record.setImagePage(array.get(1).asInt());
+                byte[] imageBytes = new byte[512];
+                for (int i = 2; i <= 513; i++) {
+                    imageBytes[i - 2] = (byte) array.get(i).asInt();
+                }
+                // record.setImageData(imageBytes);
+                break;
+
+            case 4: // 激光灯
+                int anInt = array.get(1).asInt();
+                if (anInt == 0) {
+                    record.setContent("关闭激光灯");
+                } else if (anInt == 1) {
+                    record.setContent("开启激光灯");
+                } else {
+                    record.setContent("未知操作");
+                }
+                break;
+
+            case 5: // 亮度调节
+                record.setContent(+array.get(1).asInt() + "%");
+                break;
+
+            case 11: // 定位数据
+                if (b) {
+                    break;
+                }
+                int i1 = array.get(1).asInt();
+                int i2 = array.get(2).asInt();
+                int i3 = array.get(3).asInt();
+                int i4 = array.get(4).asInt();
+
+                // 优雅的转换方式 Longitude and latitude
+                double latitude = i1 + i2 / 10.0;
+                double Longitude = i3 + i4 / 10.0;
+                // 84 ==》 高德
+                double[] doubles = LngLonUtil.gps84_To_Gcj02(latitude, Longitude);
+                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+                record.setContent(address);
+                break;
+        }
+        return record;
+    }
+
+
+    /**
+     * 解析state消息
+     *
+     * @param device
+     * @param array
+     * @return
+     */
+    // private StateRecord parseState(Device device, JsonNode array) {
+    //     StateRecord record = new StateRecord();
+    //     record.setDevice(device);
+    //     record.setStateType(array.get(0).asInt());
+    //
+    //     switch (record.getStateType()) {
+    //         case 1: // 灯光状态
+    //             record.setLightMode(array.get(1).asInt());
+    //             record.setBrightness(array.get(2).asInt());
+    //             break;
+    //
+    //         case 2: // 设置结果
+    //             record.setSetResult(array.get(1).asInt() == 1);
+    //             break;
+    //
+    //         case 3: // 图片更新状态
+    //             record.setImagePage(array.get(1).asInt());
+    //             break;
+    //
+    //         case 4: // 激光灯状态
+    //             record.setLaserStatus(array.get(1).asInt() == 1);
+    //             break;
+    //
+    //         case 5: // 亮度状态
+    //             record.setBrightness(array.get(1).asInt());
+    //             break;
+    //
+    //         case 11: // 定位上报
+    //             record.setLatitude(array.get(1).asDouble());
+    //             record.setLongitude(array.get(2).asDouble());
+    //             break;
+    //
+    //         case 12: // 设备状态
+    //             record.setMainLightGear(array.get(1).asInt());
+    //             record.setLaserLightGear(array.get(2).asInt());
+    //             record.setBattery(array.get(3).asInt());
+    //             record.setChargeStatus(array.get(4).asInt());
+    //             record.setDuration(array.get(5).asInt());
+    //             break;
+    //     }
+    //     return record;
+    // }
+
+
+}

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

@@ -0,0 +1,131 @@
+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.enums.UserType;
+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);
+        wrapper.eq(AppUser::getUserType, UserType.APP_USER.getUserType());
+        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(UserType.APP_USER.getUserType());
+        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/WEBDeviceService.java

@@ -0,0 +1,32 @@
+package com.fuyuanshen.web.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.CustomerVo;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+public interface WEBDeviceService extends IService<Device> {
+
+    /**
+     * WEB端解绑设备
+     *
+     * @param id
+     * @return
+     */
+    int webUnBindDevice(Long id, Long userId);
+
+}

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

@@ -0,0 +1,125 @@
+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.enums.UserType;
+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)
+                .eq(AppUser::getUserType, UserType.APP_USER.getUserType()));
+        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/java/com/fuyuanshen/web/service/impl/AppSmsAuthStrategy.java

@@ -14,12 +14,10 @@ import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
 import com.fuyuanshen.common.core.enums.LoginType;
+import com.fuyuanshen.common.core.enums.UserType;
 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.StringUtils;
-import com.fuyuanshen.common.core.utils.ValidatorUtils;
+import com.fuyuanshen.common.core.utils.*;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
@@ -60,9 +58,10 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
             AppUserVo user = loadUserByPhonenumber(phonenumber);
             if (ObjectUtil.isNull(user)) {
                 //新增Appuser
-                addAppUser(tenantId, phonenumber);
-
-                user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhonenumber, phonenumber));
+                AppUser appUser = addAppUser(tenantId, phonenumber);
+                user = new AppUserVo();
+                MapstructUtils.convert(appUser, user);
+//                user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhonenumber, phonenumber));
 //                loginService.recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists", phonenumber));
 //                throw new UserException("user.not.exists", phonenumber);
             }
@@ -72,6 +71,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         });
         loginUser.setClientKey(client.getClientKey());
         loginUser.setDeviceType(client.getDeviceType());
+        loginUser.setUserType(UserType.APP_USER.getUserType());
         SaLoginParameter model = new SaLoginParameter();
         model.setDeviceType(client.getDeviceType());
         // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
@@ -89,7 +89,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         return loginVo;
     }
 
-    private void addAppUser(String tenantId, String phonenumber) {
+    private AppUser addAppUser(String tenantId, String phonenumber) {
         AppUser appUser = new AppUser();
         appUser.setPhonenumber(phonenumber);
         appUser.setUserName(phonenumber);
@@ -98,6 +98,7 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         appUser.setLoginIp(ServletUtils.getClientIP());
         appUser.setTenantId(tenantId);
         appUserMapper.insert(appUser);
+        return appUser;
     }
 
 
@@ -114,7 +115,9 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
     }
 
     private AppUserVo loadUserByPhonenumber(String phonenumber) {
-        AppUserVo user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getPhonenumber, phonenumber));
+        AppUserVo user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getPhonenumber, phonenumber)
+                .eq(AppUser::getUserType, UserType.APP_USER.getUserType()));
         if (ObjectUtil.isNull(user)) {
             log.info("登录用户：{} 不存在.", phonenumber);
 //            throw new UserException("user.not.exists", phonenumber);
@@ -126,5 +129,4 @@ public class AppSmsAuthStrategy implements IAuthStrategy {
         }
         return user;
     }
-
 }

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

@@ -0,0 +1,51 @@
+package com.fuyuanshen.web.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuyuanshen.app.service.AppDeviceBizService;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceAssignments;
+import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.web.service.WEBDeviceService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements WEBDeviceService {
+
+    private final AppDeviceBizService appDeviceService;
+
+    private final DeviceAssignmentsMapper deviceAssignmentsMapper;
+
+
+    /**
+     * WEB端解绑设备
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public int webUnBindDevice(Long id, Long userId) {
+        // 设备端解绑 0:设备端解绑 1:web端解绑
+        int type = 1;
+        if (userId == null) {
+            DeviceAssignments deviceAssignments = deviceAssignmentsMapper.selectById(id);
+            if (deviceAssignments == null) {
+                throw new RuntimeException("请先将设备入库！！！");
+            }
+            id = deviceAssignments.getDeviceId();
+            type = 0;
+        }
+        return appDeviceService.unBindDevice(id, userId, type);
+    }
+
+
+}

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,9 +300,9 @@ file:
 # MQTT配置
 mqtt:
   username: admin
-  password: #YtvpSfCNG
-  url: tcp://47.120.79.150:2883
+  password: fys123456
+  url: tcp://47.107.152.87:1883
   subClientId: fys_subClient
-  subTopic: worker/alert/#,worker/location/#
-  pubTopic: worker/location
+  subTopic: A/#,worker/location/#
+  pubTopic: B/#
   pubClientId: fys_pubClient

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`表
@@ -177,11 +177,14 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: 您的accessKey
+      access-key-id: LTAI5tJdDNpZootsPQ5hdELx
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: 您的accessKeySecret
-      signature: 您的短信签名
-      sdk-app-id: 您的sdkAppId
+      access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt
+      #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
+      template-id: SMS_322180518
+      #模板变量 上述模板的变量
+      templateName: code
+      signature: 湖北星汉研创科技
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: tencent
@@ -277,11 +280,11 @@ justauth:
 # MQTT配置
 mqtt:
   username: admin
-  password: #YtvpSfCNG
-  url: tcp://47.120.79.150:2883
+  password: fys123456
+  url: tcp://47.107.152.87:1883
   subClientId: fys_subClient
-  subTopic: worker/alert/#,worker/location/#
-  pubTopic: worker/location
+  subTopic: A/#,worker/location/#
+  pubTopic: B/#
   pubClientId: fys_pubClient
 
 

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

@@ -17,6 +17,16 @@ public interface GlobalConstants {
      */
     String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:";
 
+    /**
+     * 设备分享验证码 redis key
+     */
+    String DEVICE_SHARE_CODES_KEY = GLOBAL_REDIS_KEY + "device_share_codes:";
+
+    /**
+     * 验证码 redis key
+     */
+    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-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/enums/UserType.java

@@ -21,7 +21,13 @@ public enum UserType {
     /**
      * 移动客户端用户
      */
-    APP_USER("app_user");
+    APP_USER("app_user"),
+
+    /**
+     * 小程序 用户
+     */
+    XCX_USER("xcx_user");
+
 
     /**
      * 用户类型标识（用于 token、权限识别等）

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/Bitmap80x12Generator.java

@@ -0,0 +1,362 @@
+package com.fuyuanshen.common.core.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 80*12像素点阵生成工具
+ */
+public class Bitmap80x12Generator {
+
+    public static void main(String[] args) throws IOException {
+        // 测试生成中文文本的点阵数据
+        String text = "张三";
+        byte[] bitmapData = generateFixedBitmapData(text, 120);
+//        System.out.println(Arrays.toString(bitmapData));
+        int[] ints = convertHexToDecimal(bitmapData);
+        System.out.println(Arrays.toString(ints));
+        // 生成预览图片
+        byte[] bytes = convertDecimalToByteArray(ints);
+        BufferedImage image = convertByteArrayToImage(bytes, 12, 80);
+        ImageIO.write(image, "PNG", new File("D:\\bitmap_preview.png"));
+        System.out.println("成功生成预览图片: D:\\bitmap_preview.png");
+        
+        // 打印十六进制数据
+//        System.out.println("生成的点阵数据2:");
+//        printHexData(bitmapData);
+//        int[] ints = convertHexToDecimal(bitmapData);
+        System.out.println("打印十进制无符号:"+Arrays.toString(ints));
+//        printDecimalData(bitmapData);
+        
+        // 生成C文件
+        generateCFile(bitmapData, "bitmap_data.c", "chinese_text");
+    }
+
+    /**
+     * 将十进制整数数组转换为字节数组
+     *
+     * @param decimalArray 十进制整数数组（假设每个值都在0-255范围内）
+     * @return 字节数组
+     */
+    public static byte[] convertDecimalToByteArray(int[] decimalArray) {
+        if (decimalArray == null) {
+            return new byte[0];
+        }
+
+        byte[] byteArray = new byte[decimalArray.length];
+        for (int i = 0; i < decimalArray.length; i++) {
+            // 确保值在0-255范围内，这是byte的无符号表示范围
+            int value = decimalArray[i] & 0xFF;
+            byteArray[i] = (byte) value;
+        }
+
+        return byteArray;
+    }
+
+    /**
+     * 打印字节数组（以十进制形式显示）
+     *
+     * @param data 字节数组
+     */
+    public static void printByteArrayAsDecimal(byte[] data) {
+        System.out.println("字节数组（十进制显示）:");
+        for (int i = 0; i < data.length; i++) {
+            // 将字节转换为无符号十进制数显示
+            int value = data[i] & 0xFF;
+            System.out.print(value);
+
+            if (i < data.length - 1) {
+                System.out.print(", ");
+                if ((i + 1) % 12 == 0) {
+                    System.out.println();
+                }
+            }
+        }
+        System.out.println();
+    }
+
+
+    /**
+     * 将十六进制字节数组转换为十进制整数数组
+     *
+     * @param data 字节数组
+     * @return 十进制整数数组
+     */
+    public static int[] convertHexToDecimal(byte[] data) {
+        if (data == null) {
+            return new int[0];
+        }
+
+        int[] decimalArray = new int[data.length];
+        for (int i = 0; i < data.length; i++) {
+            // 将字节转换为无符号整数（十进制）
+            decimalArray[i] = data[i] & 0xFF;
+        }
+
+        return decimalArray;
+    }
+
+    /**
+     * 打印十进制数据
+     *
+     * @param data 字节数组
+     */
+    public static void printDecimalData(byte[] data) {
+        int[] decimalArray = convertHexToDecimal(data);
+
+        System.out.println("生成的十进制数据:");
+        for (int i = 0; i < decimalArray.length; i++) {
+            System.out.print(decimalArray[i]);
+
+            if (i < decimalArray.length - 1) {
+                System.out.print(", ");
+                if ((i + 1) % 12 == 0) {
+                    System.out.println();
+                }
+            }
+        }
+        System.out.println();
+    }
+
+    public static void  buildArr(int[]  data,List<Integer> intData){
+        for (int datum : data) {
+            intData.add(datum);
+        }
+    }
+
+    /**
+     * 生成固定长度的点阵数据
+     * 
+     * @param text 要转换的文本
+     * @param fixedLength 固定长度(字节)
+     * @return 固定长度的点阵数据
+     */
+    public static byte[] generateFixedBitmapData(String text, int fixedLength) {
+        if (text == null || text.isEmpty()) {
+            return new byte[fixedLength];
+        }
+
+        // 创建80*12像素的图像
+        Font font = new Font("宋体", Font.PLAIN, 12);
+        BufferedImage image = createTextImage(text, font, 80, 12);
+
+        // 提取点阵数据
+        byte[] rawData = extractBitmapData(image);
+//        System.out.println("生成的点阵数据1:");
+//        System.out.println(Arrays.toString(rawData));
+
+        // 调整到固定长度
+        byte[] result = new byte[fixedLength];
+        int copyLength = Math.min(rawData.length, fixedLength);
+        System.arraycopy(rawData, 0, result, 0, copyLength);
+        // 剩余部分自动初始化为0
+        
+        return result;
+    }
+
+    /**
+     * 创建文本图像
+     */
+    private static BufferedImage createTextImage(String text, Font font, int width, int height) {
+        // 创建图像
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        Graphics2D g = image.createGraphics();
+
+        // 设置白色背景
+        g.setColor(Color.WHITE);
+        g.fillRect(0, 0, width, height);
+
+        // 设置黑色文本
+        g.setColor(Color.BLACK);
+        g.setFont(font);
+
+        // 关闭抗锯齿
+        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
+        g.setRenderingHint(RenderingHints.KEY_RENDERING,
+                RenderingHints.VALUE_RENDER_QUALITY);
+
+        // 获取字体度量
+        FontMetrics metrics = g.getFontMetrics();
+        
+        // 计算文本绘制位置(居中)
+        int textWidth = metrics.stringWidth(text);
+//        int x = Math.max(0, (width - textWidth) / 2); // 水平居中
+        // 左对齐
+        int x = 0;
+        int y = (height - metrics.getHeight()) / 2 + metrics.getAscent(); // 垂直居中
+        
+        // 绘制文本
+        g.drawString(text, x, y);
+
+        g.dispose();
+        return image;
+    }
+
+    /**
+     * 提取点阵数据 - 从左到右，从上到下扫描
+     */
+    private static byte[] extractBitmapData(BufferedImage image) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        List<Byte> byteList = new ArrayList<>();
+        int currentByte = 0;
+        int bitCount = 0;
+
+        // 从上到下，从左到右扫描
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                // 获取像素颜色
+                Color color = new Color(image.getRGB(x, y));
+
+                // 判断是否为黑色(阈值处理)
+                int gray = (color.getRed() + color.getGreen() + color.getBlue()) / 3;
+                boolean isBlack = gray < 128;
+
+                // 高位优先打包
+                currentByte = (currentByte << 1) | (isBlack ? 1 : 0);
+                bitCount++;
+
+                if (bitCount == 8) {
+                    byteList.add((byte) currentByte);
+                    currentByte = 0;
+                    bitCount = 0;
+                }
+            }
+        }
+
+        // 处理最后不满8位的部分
+        if (bitCount > 0) {
+            currentByte <<= (8 - bitCount);
+            byteList.add((byte) currentByte);
+        }
+
+        return byteListToArray(byteList);
+    }
+
+    private static byte[] byteListToArray(List<Byte> byteList) {
+        byte[] result = new byte[byteList.size()];
+        for (int i = 0; i < byteList.size(); i++) {
+            result[i] = byteList.get(i);
+        }
+        return result;
+    }
+
+    /**
+     * 字节数组转图像
+     */
+    public static BufferedImage convertByteArrayToImage(byte[] data, int height, int width) {
+        if (data == null || data.length == 0) {
+            return new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
+        }
+
+        // 创建RGB图像
+        BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+
+        // 设置白色背景
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                image.setRGB(x, y, Color.WHITE.getRGB());
+            }
+        }
+
+        // 从左到右，从上到下设置像素点
+        int bitIndex = 0;
+        for (int i = 0; i < data.length; i++) {
+            int value = data[i] & 0xFF;
+            for (int bit = 7; bit >= 0; bit--) { // 高位在前
+                boolean isBlack = ((value >> bit) & 1) == 1;
+                if (isBlack) {
+                    int x = bitIndex % width;
+                    int y = bitIndex / width;
+                    if (x < width && y < height) { // 确保不越界
+                        image.setRGB(x, y, Color.BLACK.getRGB());
+                    }
+                }
+                bitIndex++;
+                
+                // 如果已经处理完所有像素，则退出
+                if (bitIndex >= width * height) {
+                    return image;
+                }
+            }
+        }
+
+        return image;
+    }
+
+    public static String convertToCArrayString(byte[] data, String arrayName) {
+        StringBuilder sb = new StringBuilder();
+        sb.append(String.format("// %s: %d 字节\n", arrayName, data.length));
+        sb.append(String.format("const uint8_t %s[] = {\n    ", arrayName));
+
+        for (int i = 0; i < data.length; i++) {
+            sb.append(String.format("0x%02X", data[i] & 0xFF));
+
+            if (i < data.length - 1) {
+                sb.append(", ");
+                // 每12个元素换行
+                if ((i + 1) % 12 == 0) {
+                    sb.append("\n    ");
+                }
+            }
+        }
+
+        sb.append("\n};");
+        return sb.toString();
+    }
+    /**
+     * 打印十六进制数据
+     */
+    private static void printHexData(byte[] data) {
+        for (int i = 0; i < data.length; i++) {
+            int value = data[i] & 0xFF;
+            System.out.printf("0x%02X", value);
+            
+            if (i < data.length - 1) {
+                System.out.print(", ");
+                if ((i + 1) % 12 == 0) System.out.println();
+            }
+        }
+        System.out.println();
+    }
+
+    /**
+     * 生成C文件
+     */
+    public static void generateCFile(byte[] data, String filename, String arrayName) throws IOException {
+        try (FileWriter writer = new FileWriter(filename)) {
+            writer.write("/**\n");
+            writer.write(" * 80*12点阵显示数据\n");
+            writer.write(" * 数据大小: " + data.length + " 字节\n");
+            writer.write(" * 分辨率: 80*12 像素\n");
+            writer.write(" */\n\n");
+            writer.write("#include <stdint.h>\n\n");
+
+            writer.write(String.format("// %s: %d 字节, 80*12 像素\n", arrayName, data.length));
+            writer.write(String.format("const uint8_t %s[] = {\n    ", arrayName));
+            writeByteArray(writer, data);
+            writer.write("\n};\n");
+        }
+    }
+
+    private static void writeByteArray(FileWriter writer, byte[] data) throws IOException {
+        for (int i = 0; i < data.length; i++) {
+            int value = data[i] & 0xFF;
+            writer.write(String.format("0x%02X", value));
+
+            if (i < data.length - 1) {
+                writer.write(", ");
+                if ((i + 1) % 12 == 0) writer.write("\n    ");
+            }
+        }
+    }
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ImageToCArrayConverter.java

@@ -0,0 +1,373 @@
+package com.fuyuanshen.common.core.utils;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageToCArrayConverter {
+
+/*    public static void main(String[] args) {
+        try {
+            byte[] imageData = convertImageToCArray("E:\\workspace\\6170_强光_160_80_2.jpg", 160, 80,25600);
+            System.out.println("长度："+imageData.length);
+//            int[] ints =convertHexToDecimal(imageData);
+//            System.out.println("Image data: " + Arrays.toString(ints));
+//            writeFile("E:\\workspace\\output.c", imageData,160,80);
+//            System.out.println("转换成功！");
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(2);
+            buildArr(convertHexToDecimal(imageData),intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+            System.out.println(JSON.toJSONString( map));
+        } catch (IOException e) {
+            System.err.println("转换失败: " + e.getMessage());
+        }
+    }*/
+
+    public static void main(String[] args) throws IOException {
+
+        byte[] largeData = convertImageToCArray("E:\\workspace\\6170_强光_160_80_2.jpg", 160, 80,25600);
+        System.out.println("长度："+largeData.length);
+
+        System.out.println("原始数据大小: " + largeData.length + " 字节");
+
+        // 将25600字节的数据分割成512字节的块
+//        List<byte[]> chunks = splitByteArrayIntoChunks(largeData, 512);
+//        printChunkInfo(chunks);
+//
+//        // 打印前几块的数据示例
+//        System.out.println("\n前3块数据示例（十进制显示）:");
+//        for (int i = 0; i < Math.min(50, chunks.size()); i++) {
+//            System.out.println("块 " + i + ":");
+//            int[] ints = convertHexToDecimal(chunks.get(i));
+//            System.out.println(Arrays.toString(ints));
+//        }
+
+        // 示例：获取特定块的数据
+        byte[] specificChunk = getChunk(largeData, 5, 512); // 获取第6块（索引5）
+        System.out.println("第6块数据大小: " + specificChunk.length + " 字节");
+
+        // 生成预览图片
+//        BufferedImage image = convertByteArrayToImage(bitmapData, 12, 80);
+//        ImageIO.write(image, "PNG", new File("D:\\bitmap_preview.png"));
+//        System.out.println("成功生成预览图片: D:\\bitmap_preview.png");
+//
+//        // 生成C文件
+//        generateCFile(bitmapData, "bitmap_data.c", "chinese_text");
+    }
+    /**
+     * 获取指定块的数据
+     *
+     * @param data 原始字节数组
+     * @param chunkIndex 块索引（从0开始）
+     * @param chunkSize 每块大小
+     * @return 指定块的字节数组，如果索引无效则返回空数组
+     */
+    public static byte[] getChunk(byte[] data, int chunkIndex, int chunkSize) {
+        if (data == null || chunkSize <= 0 || chunkIndex < 0) {
+            return new byte[0];
+        }
+
+        int start = chunkIndex * chunkSize;
+        if (start >= data.length) {
+            return new byte[0]; // 索引超出范围
+        }
+
+        int end = Math.min(start + chunkSize, data.length);
+        int length = end - start;
+
+        byte[] chunk = new byte[length];
+        System.arraycopy(data, start, chunk, 0, length);
+        return chunk;
+    }
+
+    public static void  buildArr(int[]  data,List<Integer> intData){
+        for (int datum : data) {
+            intData.add(datum);
+        }
+    }
+
+    /**
+     * 打印分块信息
+     *
+     * @param chunks 分块后的字节数组列表
+     */
+    public static void printChunkInfo(List<byte[]> chunks) {
+        System.out.println("总共分割成 " + chunks.size() + " 块");
+        for (int i = 0; i < chunks.size(); i++) {
+            System.out.println("块 " + i + ": " + chunks.get(i).length + " 字节");
+        }
+    }
+    /**
+     * 将大字节数组分割成固定大小的块
+     *
+     * @param data 原始字节数组
+     * @param chunkSize 每块大小（字节数）
+     * @return 分割后的字节数组列表
+     */
+    public static List<byte[]> splitByteArrayIntoChunks(byte[] data, int chunkSize) {
+        if (data == null || data.length == 0 || chunkSize <= 0) {
+            return new ArrayList<>();
+        }
+
+        List<byte[]> chunks = new ArrayList<>();
+        int totalChunks = (int) Math.ceil((double) data.length / chunkSize);
+
+        for (int i = 0; i < totalChunks; i++) {
+            int start = i * chunkSize;
+            int end = Math.min(start + chunkSize, data.length);
+            int length = end - start;
+
+            byte[] chunk = new byte[length];
+            System.arraycopy(data, start, chunk, 0, length);
+            chunks.add(chunk);
+        }
+
+        return chunks;
+    }
+
+    public static int[] convertHexToDecimal(byte[] data) {
+        if (data == null) {
+            return new int[0];
+        }
+
+        int[] decimalArray = new int[data.length];
+        for (int i = 0; i < data.length; i++) {
+            // 将字节转换为无符号整数（十进制）
+            decimalArray[i] = data[i] & 0xFF;
+        }
+
+        return decimalArray;
+    }
+
+    public static byte[] convertImageToCArray(InputStream inputStream,
+                                              int width, int height, int fixedLength) throws IOException {
+        // 读取原始图片
+        BufferedImage originalImage = ImageIO.read(inputStream);
+
+        // 调整图片尺寸
+        BufferedImage resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        resizedImage.getGraphics().drawImage(
+                originalImage, 0, 0, width, height, null);
+
+        // 转换像素数据为RGB565格式（高位在前）
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = resizedImage.getRGB(x, y);
+
+                // 提取RGB分量
+                int r = (rgb >> 16) & 0xFF;
+                int g = (rgb >> 8) & 0xFF;
+                int b = rgb & 0xFF;
+
+                // 转换为RGB565（5位红，6位绿，5位蓝）
+                int r5 = (r >> 3) & 0x1F;
+                int g6 = (g >> 2) & 0x3F;
+                int b5 = (b >> 3) & 0x1F;
+
+                // 组合为16位值
+                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
+
+                // 高位在前（大端序）写入字节
+                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
+                byteStream.write(rgb565 & 0xFF);        // 低字节
+            }
+        }
+        // 调整到固定长度
+        byte[] rawData = byteStream.toByteArray();
+        byte[] result = new byte[fixedLength];
+        int copyLength = Math.min(rawData.length, fixedLength);
+        System.arraycopy(rawData, 0, result, 0, copyLength);
+        return result;
+    }
+
+    public static byte[] convertImageToCArray(String inputPath,
+                                            int width, int height, int fixedLength) throws IOException {
+        // 读取原始图片
+        BufferedImage originalImage = ImageIO.read(new File(inputPath));
+
+        // 调整图片尺寸
+        BufferedImage resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+        resizedImage.getGraphics().drawImage(
+                originalImage, 0, 0, width, height, null);
+
+        // 转换像素数据为RGB565格式（高位在前）
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int rgb = resizedImage.getRGB(x, y);
+
+                // 提取RGB分量
+                int r = (rgb >> 16) & 0xFF;
+                int g = (rgb >> 8) & 0xFF;
+                int b = rgb & 0xFF;
+
+                // 转换为RGB565（5位红，6位绿，5位蓝）
+                int r5 = (r >> 3) & 0x1F;
+                int g6 = (g >> 2) & 0x3F;
+                int b5 = (b >> 3) & 0x1F;
+
+                // 组合为16位值
+                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
+
+                // 高位在前（大端序）写入字节
+                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
+                byteStream.write(rgb565 & 0xFF);        // 低字节
+            }
+        }
+        // 调整到固定长度
+        byte[] rawData = byteStream.toByteArray();
+        byte[] result = new byte[fixedLength];
+        int copyLength = Math.min(rawData.length, fixedLength);
+        System.arraycopy(rawData, 0, result, 0, copyLength);
+        return result;
+    }
+
+    private static void writeFile(String outputPath, byte[] imageData,int width, int height) throws IOException {
+        // 生成C语言数组文件
+        try (FileOutputStream fos = new FileOutputStream(outputPath)) {
+            // 写入注释行（包含尺寸信息）
+            String header = String.format("/* 0X10,0X10,0X00,0X%02X,0X00,0X%02X,0X01,0X1B, */\n",
+                    width, height);
+            fos.write(header.getBytes());
+
+            // 写入数组声明
+            fos.write("const unsigned char gImage_data[] = {\n".getBytes());
+
+            // 写入数据（每行16个字节）
+            for (int i = 0; i < imageData.length; i++) {
+                // 写入0X前缀
+                fos.write(("0X" + String.format("%02X", imageData[i] & 0xFF)).getBytes());
+
+                // 添加逗号（最后一个除外）
+                if (i < imageData.length - 1) {
+                    fos.write(',');
+                }
+
+                // 换行和缩进
+                if ((i + 1) % 16 == 0) {
+                    fos.write('\n');
+                } else {
+                    fos.write(' ');
+                }
+            }
+
+            // 写入数组结尾
+            fos.write("\n};\n".getBytes());
+        }
+    }
+
+    /**
+     * 将字节字符串转换为字节数组
+     *
+     * @param byteString 字节字符串，格式如 "[12, 45, 67, ...]"
+     * @return 字节数组
+     */
+    public static byte[] convertStringToByteArray(String byteString) {
+        if (byteString == null || byteString.isEmpty()) {
+            return new byte[0];
+        }
+
+        try {
+            // 移除方括号
+            String content = byteString.trim();
+            if (content.startsWith("[")) {
+                content = content.substring(1);
+            }
+            if (content.endsWith("]")) {
+                content = content.substring(0, content.length() - 1);
+            }
+
+            // 按逗号分割
+            String[] byteValues = content.split(",");
+            byte[] result = new byte[byteValues.length];
+
+            // 转换每个值
+            for (int i = 0; i < byteValues.length; i++) {
+                String value = byteValues[i].trim();
+                // 处理可能的进制前缀
+                if (value.startsWith("0x") || value.startsWith("0X")) {
+                    // 十六进制
+                    result[i] = (byte) Integer.parseInt(value.substring(2), 16);
+                } else {
+                    // 十进制
+                    int intValue = Integer.parseInt(value);
+                    result[i] = (byte) intValue;
+                }
+            }
+
+            return result;
+        } catch (NumberFormatException e) {
+            System.err.println("解析字节字符串时出错: " + e.getMessage());
+            return new byte[0];
+        }
+    }
+
+    /**
+     * 将字节字符串转换为混合类型的Object数组
+     *
+     * @param byteString 字节字符串
+     * @return Object数组，包含不同类型的对象
+     */
+    public static Object[] convertByteStringToMixedObjectArray(String byteString) {
+        if (byteString == null || byteString.isEmpty()) {
+            return new Object[0];
+        }
+
+        try {
+            // 移除方括号（如果存在）
+            String content = byteString.trim();
+            if (content.startsWith("[")) {
+                content = content.substring(1);
+            }
+            if (content.endsWith("]")) {
+                content = content.substring(0, content.length() - 1);
+            }
+
+            // 按逗号分割
+            String[] byteValues = content.split(",");
+            Object[] result = new Object[byteValues.length];
+
+            // 转换每个值为适当类型的对象
+            for (int i = 0; i < byteValues.length; i++) {
+                String value = byteValues[i].trim();
+
+                // 处理可能的进制前缀
+                if (value.startsWith("0x") || value.startsWith("0X")) {
+                    // 十六进制
+                    int intValue = Integer.parseInt(value.substring(2), 16);
+                    result[i] = intValue;
+                } else {
+                    // 尝试解析为整数
+                    try {
+                        int intValue = Integer.parseInt(value);
+                        // 根据值的范围选择合适的类型
+                        if (intValue >= Byte.MIN_VALUE && intValue <= Byte.MAX_VALUE) {
+                            result[i] = (byte) intValue;
+                        } else if (intValue >= Short.MIN_VALUE && intValue <= Short.MAX_VALUE) {
+                            result[i] = (short) intValue;
+                        } else {
+                            result[i] = intValue;
+                        }
+                    } catch (NumberFormatException e) {
+                        // 如果不是数字，保持为字符串
+                        result[i] = value;
+                    }
+                }
+            }
+
+            return result;
+        } catch (Exception e) {
+            System.err.println("解析字节字符串时出错: " + e.getMessage());
+            return new Object[0];
+        }
+    }
+}

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ImageToCArrayConverterUtils.java

@@ -1,90 +0,0 @@
-package com.fuyuanshen.common.core.utils;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-public class ImageToCArrayConverterUtils {
-
-    public static void main(String[] args) {
-        try {
-            convertImageToCArray("E:\\workspace\\6170_强光_160_80_2.jpg", "E:\\workspace\\output.c", 160, 80);
-            System.out.println("转换成功！");
-        } catch (IOException e) {
-            System.err.println("转换失败: " + e.getMessage());
-        }
-    }
-
-    public static void convertImageToCArray(String inputPath, String outputPath,
-                                            int width, int height) throws IOException {
-        // 读取原始图片
-        BufferedImage originalImage = ImageIO.read(new File(inputPath));
-
-        // 调整图片尺寸
-        BufferedImage resizedImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
-        resizedImage.getGraphics().drawImage(
-                originalImage, 0, 0, width, height, null);
-
-        // 转换像素数据为RGB565格式（高位在前）
-        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-        for (int y = 0; y < height; y++) {
-            for (int x = 0; x < width; x++) {
-                int rgb = resizedImage.getRGB(x, y);
-
-                // 提取RGB分量
-                int r = (rgb >> 16) & 0xFF;
-                int g = (rgb >> 8) & 0xFF;
-                int b = rgb & 0xFF;
-
-                // 转换为RGB565（5位红，6位绿，5位蓝）
-                int r5 = (r >> 3) & 0x1F;
-                int g6 = (g >> 2) & 0x3F;
-                int b5 = (b >> 3) & 0x1F;
-
-                // 组合为16位值
-                int rgb565 = (r5 << 11) | (g6 << 5) | b5;
-
-                // 高位在前（大端序）写入字节
-                byteStream.write((rgb565 >> 8) & 0xFF); // 高字节
-                byteStream.write(rgb565 & 0xFF);        // 低字节
-            }
-        }
-
-        byte[] imageData = byteStream.toByteArray();
-
-        // 生成C语言数组文件
-        try (FileOutputStream fos = new FileOutputStream(outputPath)) {
-            // 写入注释行（包含尺寸信息）
-            String header = String.format("/* 0X10,0X10,0X00,0X%02X,0X00,0X%02X,0X01,0X1B, */\n",
-                    width, height);
-            fos.write(header.getBytes());
-
-            // 写入数组声明
-            fos.write("const unsigned char gImage_data[] = {\n".getBytes());
-
-            // 写入数据（每行16个字节）
-            for (int i = 0; i < imageData.length; i++) {
-                // 写入0X前缀
-                fos.write(("0X" + String.format("%02X", imageData[i] & 0xFF)).getBytes());
-
-                // 添加逗号（最后一个除外）
-                if (i < imageData.length - 1) {
-                    fos.write(',');
-                }
-
-                // 换行和缩进
-                if ((i + 1) % 16 == 0) {
-                    fos.write('\n');
-                } else {
-                    fos.write(' ');
-                }
-            }
-
-            // 写入数组结尾
-            fos.write("\n};\n".getBytes());
-        }
-    }
-}

fys-common/fys-common-log/src/main/java/com/fuyuanshen/common/log/enums/BusinessType.java

@@ -37,7 +37,7 @@ public enum BusinessType {
     EXPORT,
 
     /**
-     * 导入
+     *
      */
     IMPORT,
 

fys-common/fys-common-sms/src/main/java/com/fuyuanshen/common/sms/controller/TestSMSController.java

@@ -17,8 +17,8 @@ public class TestSMSController {
     public void testSend() {
         // 在创建完SmsBlend实例后，再未手动调用注销的情况下框架会持有该实例，可以直接通过指定configId来获取想要的配置，如果你想使用
         // 负载均衡形式获取实例，只要使用getSmsBlend的无参重载方法即可，如果你仅有一个配置，也可以使用该方法
-        SmsBlend smsBlend = SmsFactory.getSmsBlend("alibaba");
-        SmsResponse smsResponse = smsBlend.sendMessage("18656573389", "123");
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        SmsResponse smsResponse = smsBlend.sendMessage("18656573389", "1234");
     }
 
 }

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

@@ -0,0 +1,105 @@
+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.AppDeviceBindRecordVo;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
+import com.fuyuanshen.app.service.IAppDeviceBindRecordService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备绑定关系
+ *
+ * @author Lion Li
+ * @date 2025-07-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/deviceBindRecord")
+public class AppDeviceBindRecordController extends BaseController {
+
+    private final IAppDeviceBindRecordService appDeviceBindRecordService;
+
+    /**
+     * 查询设备绑定关系列表
+     */
+    @SaCheckPermission("app:deviceBindRecord:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppDeviceBindRecordVo> list(AppDeviceBindRecordBo bo, PageQuery pageQuery) {
+        return appDeviceBindRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备绑定关系列表
+     */
+    @SaCheckPermission("app:deviceBindRecord:export")
+    @Log(title = "设备绑定关系", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AppDeviceBindRecordBo bo, HttpServletResponse response) {
+        List<AppDeviceBindRecordVo> list = appDeviceBindRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备绑定关系", AppDeviceBindRecordVo.class, response);
+    }
+
+    /**
+     * 获取设备绑定关系详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("app:deviceBindRecord:query")
+    @GetMapping("/{id}")
+    public R<AppDeviceBindRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(appDeviceBindRecordService.queryById(id));
+    }
+
+    /**
+     * 新增设备绑定关系
+     */
+    @SaCheckPermission("app:deviceBindRecord:add")
+    @Log(title = "设备绑定关系", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppDeviceBindRecordBo bo) {
+        return toAjax(appDeviceBindRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备绑定关系
+     */
+    @SaCheckPermission("app:deviceBindRecord:edit")
+    @Log(title = "设备绑定关系", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppDeviceBindRecordBo bo) {
+        return toAjax(appDeviceBindRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备绑定关系
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("app:deviceBindRecord:remove")
+    @Log(title = "设备绑定关系", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(appDeviceBindRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,105 @@
+//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/AppUserController.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.app.controller;
 
 import java.util.List;
 
+import com.fuyuanshen.common.core.enums.UserType;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -36,12 +37,14 @@ public class AppUserController extends BaseController {
 
     private final IAppUserService appUserService;
 
+
     /**
      * 查询APP用户信息列表
      */
 //    @SaCheckPermission("app:user:list")
     @GetMapping("/list")
     public TableDataInfo<AppUserVo> list(AppUserBo bo, PageQuery pageQuery) {
+        bo.setUserType(UserType.APP_USER.getUserType());
         return appUserService.queryPageList(bo, pageQuery);
     }
 

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

@@ -3,7 +3,6 @@ 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/controller/mp/MPController.java

@@ -0,0 +1,75 @@
+// package com.fuyuanshen.app.controller.mp;
+//
+// import io.swagger.v3.oas.annotations.tags.Tag;
+// import lombok.RequiredArgsConstructor;
+// import lombok.extern.slf4j.Slf4j;
+// import org.springframework.http.ResponseEntity;
+// import org.springframework.web.bind.annotation.GetMapping;
+// import org.springframework.web.bind.annotation.RequestBody;
+// import org.springframework.web.bind.annotation.RequestMapping;
+// import org.springframework.web.bind.annotation.RestController;
+//
+// import java.util.ArrayList;
+// import java.util.HashMap;
+// import java.util.List;
+// import java.util.Map;
+//
+// /**
+//  * @author: 默苍璃
+//  * @date: 2025-06-2313:56
+//  */
+// @Slf4j
+// @RestController
+// @RequestMapping("/mp")
+// @RequiredArgsConstructor
+// @Tag(name = "小程序：相关接口")
+// public class MPController {
+//     //
+//     // private final TokenProvider tokenProvider;
+//     // private final SecurityProperties properties;
+//     // private final OnlineUserService onlineUserService;
+//     // private final DeviceService deviceService;
+//     // private final MPService mpService;
+//     //
+//     // @Log("小程序用户登录")
+//     // @ApiOperation("小程序登录授权")
+//     // @AnonymousPostMapping(value = "/login")
+//     // public ResponseEntity<Object> login(@RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
+//     //
+//     //     // 获取用户信息
+//     //     User user = new User();
+//     //     user.setUsername("MP");
+//     //     user.setPassword("MP");
+//     //     AuthorityDto authorityDto = new AuthorityDto();
+//     //     authorityDto.setAuthority("MP");
+//     //     List<AuthorityDto> authorityDtos = new ArrayList<>();
+//     //     authorityDtos.add(authorityDto);
+//     //     user.setPhone(authUser.getPhoneNumber());
+//     //     JwtUserDto jwtUser = new JwtUserDto(null, user, null, authorityDtos);
+//     //
+//     //     Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, authorityDtos);
+//     //     SecurityContextHolder.getContext().setAuthentication(authentication);
+//     //     // 生成令牌
+//     //     String token = tokenProvider.createToken(jwtUser);
+//     //     // 返回 token 与 用户信息
+//     //     Map<String, Object> authInfo = new HashMap<String, Object>(2) {{
+//     //         put("token", properties.getTokenStartWith() + token);
+//     //         put("user", jwtUser);
+//     //     }};
+//     //
+//     //     // 保存在线信息
+//     //     onlineUserService.save(jwtUser, token, request);
+//     //
+//     //     // 返回登录信息
+//     //     return ResponseEntity.ok(authInfo);
+//     // }
+//     //
+//     //
+//     // @GetMapping("/queryDevice")
+//     // @ApiOperation("是否存在设备MAC号")
+//     // public ResponseVO<Boolean> queryDevice(@ApiParam("设备mac值") String mac) {
+//     //     return ResponseVO.success(mpService.queryDevice(mac));
+//     // }
+//
+//
+// }

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

@@ -0,0 +1,53 @@
+package com.fuyuanshen.app.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 设备绑定关系对象 app_device_bind_record
+ *
+ * @author Lion Li
+ * @date 2025-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_device_bind_record")
+public class AppDeviceBindRecord extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 绑定用户id
+     */
+    private Long bindingUserId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 绑定时间
+     */
+    private Date bindingTime;
+
+
+}

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

@@ -0,0 +1,51 @@
+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

@@ -37,9 +37,9 @@ public class AppPersonnelInfo extends TenantEntity {
     private String name;
 
     /**
-     * 部门名称
+     * 职位
      */
-    private String deptName;
+    private String position;
 
     /**
      * 单位名称
@@ -51,5 +51,6 @@ public class AppPersonnelInfo extends TenantEntity {
      */
     private String sendMsg;
 
+    private String code;
 
 }

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/AppDeviceBindRecordBo.java

@@ -0,0 +1,51 @@
+package com.fuyuanshen.app.domain.bo;
+
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 设备绑定关系业务对象 app_device_bind_record
+ *
+ * @author Lion Li
+ * @date 2025-07-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppDeviceBindRecord.class, reverseConvertGenerate = false)
+public class AppDeviceBindRecordBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 绑定用户id
+     */
+    private Long bindingUserId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 绑定时间
+     */
+    private Date bindingTime;
+
+
+}

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

@@ -0,0 +1,49 @@
+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/bo/AppPersonnelInfoBo.java

@@ -23,13 +23,11 @@ public class AppPersonnelInfoBo extends BaseEntity {
     /**
      * 主键
      */
-    @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long id;
 
     /**
      * 设备id
      */
-    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long deviceId;
 
     /**
@@ -37,6 +35,11 @@ public class AppPersonnelInfoBo extends BaseEntity {
      */
     private String name;
 
+    /**
+     * 职位
+     */
+    private String position;
+
     /**
      * 部门名称
      */
@@ -52,5 +55,8 @@ public class AppPersonnelInfoBo extends BaseEntity {
      */
     private String sendMsg;
 
-
+    /**
+     * ID号
+     */
+    private String code;
 }

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/AppDeviceBindRecordVo.java

@@ -0,0 +1,64 @@
+package com.fuyuanshen.app.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+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 lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 设备绑定关系视图对象 app_device_bind_record
+ *
+ * @author Lion Li
+ * @date 2025-07-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppDeviceBindRecord.class)
+public class AppDeviceBindRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ExcelProperty(value = "设备id")
+    private Long deviceId;
+
+    /**
+     * 绑定用户id
+     */
+    @ExcelProperty(value = "绑定用户id")
+    private Long bindingUserId;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 绑定时间
+     */
+    @ExcelProperty(value = "绑定时间")
+    private Date bindingTime;
+
+
+}

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

@@ -0,0 +1,77 @@
+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;
+
+    /**
+     * 发送信息
+     */
+    private String sendMsg;
+}

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

@@ -0,0 +1,107 @@
+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

@@ -0,0 +1,76 @@
+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;
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+    /**
+     * 设备名称
+     */
+    @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/domain/vo/AppPersonnelInfoVo.java

@@ -47,10 +47,10 @@ public class AppPersonnelInfoVo implements Serializable {
     private String name;
 
     /**
-     * 部门名称
+     * 岗位
      */
-    @ExcelProperty(value = "部门名称")
-    private String deptName;
+    @ExcelProperty(value = "岗位")
+    private String position;
 
     /**
      * 单位名称
@@ -59,10 +59,10 @@ public class AppPersonnelInfoVo implements Serializable {
     private String unitName;
 
     /**
-     * 发送信息
+     * ID号
      */
-    @ExcelProperty(value = "发送信息")
-    private String sendMsg;
+    @ExcelProperty(value = "ID号")
+    private String code;
 
 
 }

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

@@ -1,6 +1,9 @@
 package com.fuyuanshen.app.domain.vo;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fuyuanshen.app.domain.AppUser;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
@@ -120,4 +123,10 @@ public class AppUserVo implements Serializable {
      * 部门ID
      */
     private Long deptId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
 }

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

@@ -0,0 +1,15 @@
+package com.fuyuanshen.app.mapper;
+
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备绑定关系Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-28
+ */
+public interface AppDeviceBindRecordMapper extends BaseMapperPlus<AppDeviceBindRecord, AppDeviceBindRecordVo> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.fuyuanshen.app.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.app.domain.AppDeviceShare;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 设备分享Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-07-16
+ */
+public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, AppDeviceShareVo> {
+    IPage<AppDeviceShareVo> otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
+}

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/IAppDeviceBindRecordService.java

@@ -0,0 +1,68 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
+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-28
+ */
+public interface IAppDeviceBindRecordService {
+
+    /**
+     * 查询设备绑定关系
+     *
+     * @param id 主键
+     * @return 设备绑定关系
+     */
+    AppDeviceBindRecordVo queryById(Long id);
+
+    /**
+     * 分页查询设备绑定关系列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备绑定关系分页列表
+     */
+    TableDataInfo<AppDeviceBindRecordVo> queryPageList(AppDeviceBindRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备绑定关系列表
+     *
+     * @param bo 查询条件
+     * @return 设备绑定关系列表
+     */
+    List<AppDeviceBindRecordVo> queryList(AppDeviceBindRecordBo bo);
+
+    /**
+     * 新增设备绑定关系
+     *
+     * @param bo 设备绑定关系
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppDeviceBindRecordBo bo);
+
+    /**
+     * 修改设备绑定关系
+     *
+     * @param bo 设备绑定关系
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppDeviceBindRecordBo bo);
+
+    /**
+     * 校验并批量删除设备绑定关系信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,70 @@
+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);
+
+    TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery);
+}

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

@@ -4,6 +4,7 @@ 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;
@@ -65,4 +66,6 @@ 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,7 +8,9 @@ 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;
@@ -73,4 +75,5 @@ 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/AppDeviceBindRecordServiceImpl.java

@@ -0,0 +1,133 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
+import com.fuyuanshen.app.service.IAppDeviceBindRecordService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 设备绑定关系Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-07-28
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppDeviceBindRecordServiceImpl implements IAppDeviceBindRecordService {
+
+    private final AppDeviceBindRecordMapper baseMapper;
+
+    /**
+     * 查询设备绑定关系
+     *
+     * @param id 主键
+     * @return 设备绑定关系
+     */
+    @Override
+    public AppDeviceBindRecordVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备绑定关系列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备绑定关系分页列表
+     */
+    @Override
+    public TableDataInfo<AppDeviceBindRecordVo> queryPageList(AppDeviceBindRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppDeviceBindRecord> lqw = buildQueryWrapper(bo);
+        Page<AppDeviceBindRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备绑定关系列表
+     *
+     * @param bo 查询条件
+     * @return 设备绑定关系列表
+     */
+    @Override
+    public List<AppDeviceBindRecordVo> queryList(AppDeviceBindRecordBo bo) {
+        LambdaQueryWrapper<AppDeviceBindRecord> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppDeviceBindRecord> buildQueryWrapper(AppDeviceBindRecordBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppDeviceBindRecord> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AppDeviceBindRecord::getId);
+        lqw.eq(bo.getDeviceId() != null, AppDeviceBindRecord::getDeviceId, bo.getDeviceId());
+        lqw.eq(bo.getBindingUserId() != null, AppDeviceBindRecord::getBindingUserId, bo.getBindingUserId());
+        lqw.eq(bo.getBindingTime() != null, AppDeviceBindRecord::getBindingTime, bo.getBindingTime());
+        return lqw;
+    }
+
+    /**
+     * 新增设备绑定关系
+     *
+     * @param bo 设备绑定关系
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppDeviceBindRecordBo bo) {
+        AppDeviceBindRecord add = MapstructUtils.convert(bo, AppDeviceBindRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备绑定关系
+     *
+     * @param bo 设备绑定关系
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppDeviceBindRecordBo bo) {
+        AppDeviceBindRecord update = MapstructUtils.convert(bo, AppDeviceBindRecord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppDeviceBindRecord 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/AppDeviceShareServiceImpl.java

@@ -0,0 +1,169 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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());
+                r.setDeviceImei(device.getDeviceImei());
+            }
+        });
+        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;
+    }
+
+    @Override
+    public TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        String username = AppLoginHelper.getUsername();
+        bo.setPhonenumber(username);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        IPage<AppDeviceShareVo> result = baseMapper.otherDeviceShareList(bo, page);
+        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());
+                r.setDeviceImei(device.getDeviceImei());
+            }
+        });
+        return TableDataInfo.build(result);
+    }
+}

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,5 +1,6 @@
 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;
@@ -7,6 +8,8 @@ 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;
@@ -75,7 +78,6 @@ 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;
@@ -132,4 +134,13 @@ 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+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,5 +227,14 @@ 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);
+    }
+
 
 }