Merge remote-tracking branch 'upstream/dyf-device' into main-dyf

# Conflicts:
#	fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/LocationHistoryDetailVo.java

aa.conf

@@ -0,0 +1,119 @@
+
+#user  nobody;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+#pid        logs/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+    #                  '$status $body_bytes_sent "$http_referer" '
+    #                  '"$http_user_agent" "$http_x_forwarded_for"';
+
+    #access_log  logs/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    #keepalive_timeout  0;
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    server {
+        listen       80;
+        server_name  cnxhyc.com;
+
+        #charset koi8-r;
+
+        #access_log  logs/host.access.log  main;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+
+        #error_page  404              /404.html;
+
+        # redirect server error pages to the static page /50x.html
+        #
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+
+        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+        #
+        #location ~ \.php$ {
+        #    proxy_pass   http://127.0.0.1;
+        #}
+
+        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+        #
+        #location ~ \.php$ {
+        #    root           html;
+        #    fastcgi_pass   127.0.0.1:9000;
+        #    fastcgi_index  index.php;
+        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+        #    include        fastcgi_params;
+        #}
+
+        # deny access to .htaccess files, if Apache's document root
+        # concurs with nginx's one
+        #
+        #location ~ /\.ht {
+        #    deny  all;
+        #}
+    }
+
+
+    # another virtual host using mix of IP-, name-, and port-based configuration
+    #
+    #server {
+    #    listen       8000;
+    #    listen       somename:8080;
+    #    server_name  somename  alias  another.alias;
+
+    #    location / {
+    #        root   html;
+    #        index  index.html index.htm;
+    #    }
+    #}
+
+
+    # HTTPS server
+
+    server {
+        listen       443 ssl http2;
+        server_name  cnxhyc.com;
+
+        ssl_certificate      /cert/cnxhyc.com.pem;
+        ssl_certificate_key  /cert/cnxhyc.com.key;
+
+        # 使用更现代的 SSL 配置
+        ssl_protocols TLSv1.2 TLSv1.3;
+        ssl_ciphers TLS_AES_256_GCM_SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+        ssl_prefer_server_ciphers off;
+
+        ssl_session_cache shared:SSL:10m;
+        ssl_session_timeout 10m;
+
+        location / {
+            root   html;
+            index  index.html index.htm;
+        }
+    }
+
+}

fys-admin/pom.xml

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

fys-admin/src/main/java/com/fuyuanshen/CorrectVCardGenerator.java

@@ -0,0 +1,96 @@
+package com.fuyuanshen;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CorrectVCardGenerator {
+    public static void main(String[] args) {
+        // // 定义江西上饶的134号段（共22个）
+        // String[] prefixes = {
+        //         "1340703", "1340793", "1342650", "1342651", "1342663",
+        //         "1342664", "1342665", "1343703", "1343793", "1347901",
+        //         "1347902", "1347903", "1347930", "1347931", "1347932",
+        //         "1347933", "1347934", "1347935", "1347936", "1347937",
+        //         "1347938", "1347939"
+        // }; 1340700 号段（移动）
+        // 1340708 号段（移动）
+        // 1340709 号段（移动）
+        // 1340791 号段（移动）
+        // 1342668 号段（移动）
+        // 1343700 号段（移动）
+        // 1343708 号段（移动）
+        // 1343709 号段（移动）
+        // 1343790 号段（移动）
+        // 1343791 号段（移动）
+        // 1347910 号段（移动）
+        // 1347911 号段（移动）
+        // 1347912 号段（移动）
+        // 1347913 号段（移动）
+        // 1347914 号段（移动）
+        // 1347915 号段（移动）
+        // 1347916 号段（移动）
+        // 1347917 号段（移动）
+        // 1347918 号段（移动）
+        // 1347919 号段（移动）
+
+        // 定义江西南昌的134号段（共22个）
+        String[] prefixes = {
+                "1340700", "1340708", "1340709", "1340791", "1342668",
+                "1343700", "1343708", "1343709", "1343790", "1343791",
+                "1347910", "1347911", "1347912", "1347913", "1347914",
+                "1347915", "1347916", "1347917", "1347918", "1347919"
+        };
+
+        // 创建.vcf文件
+        String filename = "南昌联系人.vcf";
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {
+            // 生成所有联系人
+            int count = 0;
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    String phoneNumber = prefix + middle + "51";
+
+                    // 每个联系人以BEGIN:VCARD开始
+                    writer.write("BEGIN:VCARD");
+                    writer.newLine();
+                    writer.write("VERSION:3.0");
+                    writer.newLine();
+
+                    // 中文姓名（用户+序号）
+                    writer.write("FN:用户" + (count + 1));
+                    writer.newLine();
+
+                    // 手机号码
+                    writer.write("TEL;TYPE=CELL;TYPE=VOICE:" + phoneNumber);
+                    writer.newLine();
+
+                    // 添加唯一标识符
+                    writer.write("UID:" + phoneNumber + "@shangrao");
+                    writer.newLine();
+
+                    // 添加备注信息
+                    writer.write("NOTE:生成于" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                    writer.newLine();
+
+                    // 每个联系人以END:VCARD结束
+                    writer.write("END:VCARD");
+                    writer.newLine();
+                    writer.newLine(); // 联系人之间空一行
+
+                    count++;
+                }
+            }
+
+            System.out.println("成功生成 " + count + " 个联系人");
+            System.out.println("文件已保存为: " + filename);
+
+        } catch (IOException e) {
+            System.err.println("文件写入错误: " + e.getMessage());
+        }
+    }
+}

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

@@ -92,14 +92,21 @@ 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("退出成功");
     }
 

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

@@ -1,24 +1,26 @@
 package com.fuyuanshen.app.controller;
 
 import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
 import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
-import com.fuyuanshen.app.service.equipment.APPDeviceService;
 import com.fuyuanshen.common.core.domain.R;
 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.Device;
 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.service.DeviceService;
+import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- * APP 设备信息管理
+ * APP设备信息管理
  */
 @Validated
 @RequiredArgsConstructor
@@ -26,18 +28,15 @@ import java.util.List;
 @RequestMapping("/app/device")
 public class AppDeviceController extends BaseController {
 
-    private final DeviceService deviceService;
+    private final DeviceBizService 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 +44,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 +53,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 +75,19 @@ public class AppDeviceController extends BaseController {
         appDeviceService.reName(reNameDTO);
         return R.ok("重命名成功！！！");
     }
+
+
+    @GetMapping("/realTimeStatus")
+    public R<Map<String, Object>> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        Map<String, Object> status = appDeviceService.getRealTimeStatus(statusDto);
+        return R.ok(status);
+    }
+
+    /**
+     * 根据mac查询设备信息
+     */
+    @GetMapping("/getDeviceInfoByDeviceMac")
+    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
+        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
+    }
 }

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.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 com.fuyuanshen.web.service.DeviceShareService;
+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 DeviceShareService appDeviceShareService;
+
+    /**
+     * 分享管理列表
+     */
+    @GetMapping("/deviceShareList")
+    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return appDeviceShareService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 他人分享管理列表
+     */
+    @GetMapping("/otherDeviceShareList")
+    public TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return appDeviceShareService.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/AppUserController.java

@@ -1,17 +1,29 @@
 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
@@ -50,13 +62,27 @@ public class AppUserController extends BaseController {
     }
 
 
-
     /**
      * 发送忘记密码短信
+     *
+     * @param phonenumber 用户手机号
      */
     @SaIgnore
-    @PostMapping("/sendForgotPasswordSms")
-    public R<Void> sendForgotPasswordSms(@Validated @RequestBody APPForgotPasswordSmsDTO dto) throws Exception {
-        return toAjax(appUserService.sendForgotPasswordSms(dto));
+    @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/controller/device/AppDeviceBJQController.java

@@ -0,0 +1,119 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+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;
+
+/**
+ * BJQ6170设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/bjq/device")
+public class AppDeviceBJQController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(appDeviceService.getInfo(id));
+    }
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送信息
+     */
+    @PostMapping(value = "/sendMessage")
+    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
+    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendMessage(bo));
+    }
+
+    /**
+     * 发送报警信息
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("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（泛光模式）
+     */
+//    @FunctionAccessAnnotation("lightModeSettings")
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+//    @FunctionAccessAnnotation("lightBrightnessSettings")
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+//    @FunctionAccessAnnotation("laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+}

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

@@ -0,0 +1,96 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * HBY670设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/xinghan/device")
+public class AppDeviceXinghanController extends BaseController {
+
+    private final DeviceXinghanBizService appDeviceService;
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("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();
+    }
+
+    /**
+     * 静电预警档位
+     * 3,2,1,0,分别表示高档/中档/低挡/关闭
+     */
+    @PostMapping("/DetectGradeSettings")
+    public R<Void> DetectGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upDetectGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @PostMapping("/LightGradeSettings")
+    public R<Void> LightGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upLightGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @PostMapping("/SOSGradeSettings")
+    public R<Void> SOSGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upSOSGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 静止报警状态
+     * 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upShakeBitSettings(params);
+        return R.ok();
+    }
+
+}

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

@@ -0,0 +1,47 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+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;
+
+/**
+ * BJQ6170设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/test")
+public class TestController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo2(bo);
+
+        return R.ok();
+    }
+
+}

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

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

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

@@ -0,0 +1,30 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+/**
+ * 设备实时状态
+ */
+@Data
+public class AppRealTimeStatusDto {
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 获取实时状态类型：FunctionAccessBatchStatusRule 批量 ，FunctionAccessStatusRule 单个
+     */
+    private String typeName;
+
+    /**
+     * 功能类型
+     */
+    private String functionMode;
+
+    /**
+     * 批次号
+     */
+    private String batchId;
+}

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

@@ -2,11 +2,14 @@ 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;
@@ -28,10 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Supplier;
 
 /**
@@ -51,7 +51,7 @@ public class AppLoginService {
     private Integer lockTime;
 
     private final ISysTenantService tenantService;
-    private final IAppRoleService roleService;
+    private final IAppUserService appUserService;
 
 
     /**
@@ -185,4 +185,24 @@ public class AppLoginService {
         }
     }
 
+    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,46 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * MQTT消息引擎
+ */
+@Component
+public class MqttRuleEngine {
+
+    @Autowired
+    @Qualifier("threadPoolTaskExecutor")
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+    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) {
+            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
+            return true;
+        }
+        
+        return false;
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import cn.hutool.core.lang.Dict;
+
+import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.Collections;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public final class MqttXinghanCommandType {
+    private MqttXinghanCommandType() {}
+
+    public enum XinghanCommandTypeEnum {
+        /**
+         * 星汉设备主动上报数据
+         */
+        GRADE_INFO(101),
+        /**
+         * 星汉开机LOGO
+         */
+        PIC_TRANS(102),
+        /**
+         * 星汉设备发送消息 (XingHan send msg)
+         */
+        TEX_TRANS(103),
+        BREAK_NEWS(104),
+        UNKNOWN(0);
+
+        private final int value;
+        XinghanCommandTypeEnum(int value) { this.value = value; }
+        public int getValue() { return value; }
+    }
+
+    private static final Map<String, XinghanCommandTypeEnum> KEY_TO_TYPE;
+    static {
+        LinkedHashMap<String, XinghanCommandTypeEnum> map = new LinkedHashMap<>();
+        map.put("sta_DetectGrade", XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_PowerTime",   XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_longitude",   XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_latitude",    XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_PicTrans",    XinghanCommandTypeEnum.PIC_TRANS);
+        map.put("sta_TexTrans",    XinghanCommandTypeEnum.TEX_TRANS);
+        map.put("sta_BreakNews",    XinghanCommandTypeEnum.BREAK_NEWS);
+        KEY_TO_TYPE = Collections.unmodifiableMap(map);
+    }
+
+    public static int computeVirtualCommandType(Dict payloadDict) {
+        if (payloadDict == null) {
+            return XinghanCommandTypeEnum.UNKNOWN.getValue();
+        }
+        try {
+            for (String key : KEY_TO_TYPE.keySet()) {
+                if (payloadDict.containsKey(key)) {
+                    return KEY_TO_TYPE.get(key).getValue();
+                }
+            }
+        } catch (Exception ex) {
+            return XinghanCommandTypeEnum.UNKNOWN.getValue();
+        }
+
+        return XinghanCommandTypeEnum.UNKNOWN.getValue();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class MqttXinghanJson {
+
+    /**
+     * 第一键值对，静电预警档位：3,2,1,0,分别表示高档/中档/低挡/关闭.
+     */
+    @JsonProperty("sta_DetectGrade")
+    private Integer staDetectGrade;
+    /**
+     * 第二键值对，照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @JsonProperty("sta_LightGrade")
+    private Integer staLightGrade;
+    /**
+     * 第三键值对，SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @JsonProperty("sta_SOSGrade")
+    public Integer staSOSGrade;
+    /**
+     * 第四键值对，剩余照明时间，0-5999，单位分钟。
+     */
+    @JsonProperty("sta_PowerTime")
+    public Integer staPowerTime;
+    /**
+     * 第五键值对，剩余电量百分比，0-100
+     */
+    @JsonProperty("sta_PowerPercent")
+    public Integer staPowerPercent;
+    /**
+     * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
+     */
+    @JsonProperty("sta_DetectResult")
+    public Integer staDetectResult;
+    /**
+     * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @JsonProperty("staShakeBit")
+    public Integer sta_ShakeBit;
+    /**
+     * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
+     */
+    @JsonProperty("sta_4gSinal")
+    public Integer sta4gSinal;
+    /**
+     * 第九键值对，IMIE卡号
+     */
+    @JsonProperty("sta_imei")
+    public String staimei;
+    /**
+     * 第十键值对，经度
+     */
+    @JsonProperty("sta_longitude")
+    public String stalongitude;
+    /**
+     * 第十一键值对，纬度
+     */
+    @JsonProperty("sta_latitude")
+    public String stalatitude;
+
+}

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,15 +1,9 @@
-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;
 import org.springframework.messaging.handler.annotation.Header;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  17:06
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
 @MessagingGateway(defaultRequestChannel = "mqttOutboundChannel")
 public interface MqttGateway {
     public abstract void sendMsgToMqtt(@Header(value = MqttHeaders.TOPIC) String topic, String payload);

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

@@ -0,0 +1,50 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+public class DeviceRedisKeyConstants {
+    public static final String DEVICE_KEY_PREFIX = "device:";
+    // 设备上报状态
+    public static final String DEVICE_STATUS_KEY_PREFIX = ":status";
+    // 在线状态
+    public static final String DEVICE_ONLINE_STATUS_KEY_PREFIX = ":onlineStatus";
+    // 设备状态信息存储到Redis中
+    public static final String DEVICE_LOCATION_KEY_PREFIX = ":location";
+    // 存储到一个列表中，保留历史位置信息
+    public static final String DEVICE_LOCATION_HISTORY_KEY_PREFIX = ":location:history";
+
+    // 存储设备活跃上报信息
+    public static final String DEVICE_ACTIVE_REPORTING_KEY_PREFIX = ":activeReporting";
+
+    // 存储设备人员信息
+    public static final String DEVICE_PERSONNEL_INFO_KEY_PREFIX = ":personnelInfo";
+
+    // 存储设备发送消息
+    public static final String DEVICE_SEND_MESSAGE_KEY_PREFIX = ":sendMessage";
+
+    // 存储设备启动logo
+    public static final String DEVICE_BOOT_LOGO_KEY_PREFIX = ":bootLogo";
+
+    /**
+     * 灯模式
+     */
+    public static final String DEVICE_LIGHT_MODE_KEY_PREFIX = ":lightMode";
+
+    /**
+     * 亮度模式
+     */
+    public static final String DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX = ":lightBrightness";
+
+    /**
+     * 激光模式
+     */
+    public static final String DEVICE_LASER_MODE_KEY_PREFIX = ":laserMode";
+
+    /**
+     * 地图逆地理编码
+     */
+    public static final String DEVICE_MAP_REVERSE_GEOCODING_KEY_PREFIX = ":mapReverseGeocoding";
+
+    /**
+     * 告警
+     */
+    public static final String DEVICE_ALARM_KEY_PREFIX = ":alarm";
+}

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

@@ -0,0 +1,55 @@
+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";
+
+    /**
+     * 设备发送消息
+     */
+    public static final String SEND_MESSAGE = "Light_6";
+
+
+    /**
+     * 报警模式
+     */
+    public static final String ALARM_MESSAGE = "Light_7";
+    
+    /**
+     * 定位数据 (Location Data)
+     */
+    public static final String LOCATION_DATA = "Light_11";
+
+    /**
+     * 主动上报设备数据 (Active Reporting Device Data)
+     */
+    public static final String ACTIVE_REPORTING_DEVICE_DATA = "Light_12";
+
+}

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/constants/TenantsConstant.java

@@ -0,0 +1,27 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+/**
+ * 租户常量定义类
+ * 包含系统中使用的各种租户标识
+ *
+ * @author: 默苍璃
+ * @date: 2025-08-05 10:46
+ */
+public class TenantsConstant {
+
+    /**
+     * 晶全租户
+     */
+    public static final String JING_QUAN = "014443";
+
+    /**
+     * 富源晟租户
+     */
+    public static final String FU_YUAN_SHENG = "894078";
+
+    /**
+     * 管理员租户
+     */
+    public static final String ADMIN = "000000";
+
+}

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

@@ -0,0 +1,20 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+public class XingHanCommandTypeConstants {
+    /**
+     * 星汉设备主动上报数据 (XingHan Device Data)
+     */
+    public static final String XingHan_DEVICE_DATA = "Light_101";
+    /**
+     * 星汉开机LOGO (XingHan Boot Logo)
+     */
+    public static final String XingHan_BOOT_LOGO = "Light_102";
+    /**
+     * 星汉设备发送消息 (XingHan send msg)
+     */
+    public static final String XingHan_ESEND_MSG = "Light_103";
+    /**
+     * 星汉设备发送紧急通知 (XingHan break news)
+     */
+    public static final String XingHan_BREAK_NEWS = "Light_104";
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/RedisKeyExpirationListener.java

@@ -0,0 +1,38 @@
+package com.fuyuanshen.global.mqtt.listener;
+
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+
+@Component
+@Slf4j
+public class RedisKeyExpirationListener implements MessageListener {
+
+    @Override
+    public void onMessage(Message message, byte[] pattern) {
+        String expiredKey = new String(message.getBody());
+
+        if (expiredKey.startsWith(FUNCTION_ACCESS_KEY)) {
+            String element = expiredKey.substring(FUNCTION_ACCESS_KEY.length());
+            handleFunctionAccessExpired(element);
+        }
+    }
+
+    /**
+     * 访问key过期事件
+     * @param element 批次ID
+     */
+    private void handleFunctionAccessExpired(String element) {
+        RedisUtils.setCacheObject(FUNCTION_ACCESS_TIMEOUT_KEY + element, FunctionAccessStatus.TIMEOUT.getCode(), Duration.ofSeconds(30L));
+    }
+}

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

@@ -0,0 +1,25 @@
+package com.fuyuanshen.global.mqtt.listener.config;
+
+import com.fuyuanshen.global.mqtt.listener.RedisKeyExpirationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+
+@Configuration
+public class RedisListenerConfig {
+
+    @Bean
+    RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory connectionFactory,
+                                                               RedisKeyExpirationListener redisKeyExpirationListener) {
+        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+        container.setConnectionFactory(connectionFactory);
+        
+        // 监听过期事件
+        container.addMessageListener(redisKeyExpirationListener, new PatternTopic("__keyevent@*__:expired"));
+        return container;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/domain/FunctionAccessResult.java

@@ -0,0 +1,96 @@
+package com.fuyuanshen.global.mqtt.listener.domain;
+
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+
+/**
+ * 功能访问状态对象
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FunctionAccessResult {
+    
+    /**
+     * 状态码
+     */
+    private String status;
+    
+    /**
+     * 消息描述
+     */
+    private String message;
+    
+    /**
+     * 时间戳
+     */
+    private Long timestamp;
+    
+    /**
+     * 设备IMEI（可选）
+     */
+    private String deviceImei;
+    
+    /**
+     * 批次ID（可选）
+     */
+    private String batchId;
+    
+    public FunctionAccessResult(String status, String message) {
+        this.status = status;
+        this.message = message;
+        this.timestamp = System.currentTimeMillis();
+    }
+    
+    /**
+     * 创建失败状态对象
+     * @param message 消息
+     * @return FunctionAccessResult
+     */
+    public static FunctionAccessResult failed(String message) {
+        return new FunctionAccessResult("FAILED", message);
+    }
+    
+    /**
+     * 创建成功状态对象
+     * @param message 消息
+     * @return FunctionAccessResult
+     */
+    public static FunctionAccessResult ok(String message) {
+        return new FunctionAccessResult("OK", message);
+    }
+    
+    /**
+     * 创建超时状态对象
+     * @param message 消息
+     * @return FunctionAccessResult
+     */
+    public static FunctionAccessResult timeout(String message) {
+        return new FunctionAccessResult("TIMEOUT", message);
+    }
+    
+    /**
+     * 判断是否为失败状态
+     * @return boolean
+     */
+    public boolean isFailed() {
+        return "FAILED".equals(this.status);
+    }
+    
+    /**
+     * 判断是否为成功状态
+     * @return boolean
+     */
+    public boolean isOk() {
+        return "OK".equals(this.status);
+    }
+    
+    /**
+     * 判断是否为超时状态
+     * @return boolean
+     */
+    public boolean isTimeout() {
+        return "TIMEOUT".equals(this.status);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/domain/FunctionAccessStatus.java

@@ -0,0 +1,62 @@
+package com.fuyuanshen.global.mqtt.listener.domain;
+
+/**
+ * 功能访问状态枚举
+ */
+public enum FunctionAccessStatus {
+    
+    /**
+     * 失败状态
+     */
+    FAILED("FAILED", "失败"),
+    
+    /**
+     * 成功状态
+     */
+    OK("OK", "成功"),
+
+    /**
+     * 激活中状态
+     */
+    ACTIVE("ACTIVE", "处理中"),
+
+    /**
+     * 超时状态
+     */
+    TIMEOUT("TIMEOUT", "超时");
+
+    private final String code;
+    private final String description;
+
+    FunctionAccessStatus(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 根据代码获取状态枚举
+     * @param code 状态代码
+     * @return 对应的状态枚举
+     */
+    public static FunctionAccessStatus fromCode(String code) {
+        for (FunctionAccessStatus status : FunctionAccessStatus.values()) {
+            if (status.getCode().equals(code)) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("未知的状态代码: " + code);
+    }
+
+    @Override
+    public String toString() {
+        return code;
+    }
+}

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,17 +1,12 @@
-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;
 import org.springframework.stereotype.Service;
 
-/**
- * @Author: HarryLin
- * @Date: 2025/3/20  16:16
- * @Company: 北京红山信息科技研究院有限公司
- * @Email: linyun@***.com.cn
- **/
+
 @Service
 public class MqttMessageSender {
     @Autowired

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

@@ -0,0 +1,92 @@
+package com.fuyuanshen.global.mqtt.receiver;
+
+import cn.hutool.core.lang.Dict;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+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.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.base.MqttRuleEngine;
+import com.fuyuanshen.global.mqtt.base.MqttXinghanCommandType;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
+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.time.Duration;
+import java.util.Objects;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+@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[] subStr = receivedTopic.split("/");
+        String deviceImei = subStr[1];
+        if(StringUtils.isNotBlank(deviceImei)){
+            //在线状态
+            String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(62));
+//            String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+//            String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
+//            RedisUtils.offerDeduplicated(queueKey,dedupKey,deviceImei, Duration.ofHours(24));
+        }
+
+        String state = payloadDict.getStr("state");
+        Object[] convertArr = ImageToCArrayConverter.convertByteStringToMixedObjectArray(state);
+        
+        if (convertArr.length > 0) {
+            Byte val1 = (Byte) convertArr[0];
+            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);
+            }
+        }
+
+        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
+        int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
+        if (intType > 0) {
+            MqttRuleContext newCtx = new MqttRuleContext();
+            newCtx.setCommandType((byte) intType);
+            newCtx.setDeviceImei(deviceImei);
+            newCtx.setPayloadDict(payloadDict);
+
+            boolean ok = ruleEngine.executeRule(newCtx);
+            if (!ok) {
+                log.warn("新规则引擎未命中, imei={}", deviceImei);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+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.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+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;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX;
+
+/**
+ * 主动上报设备数据命令处理
+ * "第1位为12表示设备主动上报设备硬件状态，第2为表示当时设备主灯档位，第3位表示当时激光灯档位，第4位电量百分比，第5位为充电状态（0没有充电，1正在充电，2为已充满）
+ * 第6位200代表电池剩余续航时间200分钟"
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
+
+    @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
+     *
+     * @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 = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_STATUS_KEY_PREFIX;
+                String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
+
+                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/bjq/BjqAlarmRule.java

@@ -0,0 +1,56 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+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.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqAlarmRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.ALARM_MESSAGE;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String convertValue = convertArr[1].toString();
+            if(StringUtils.isNotBlank(convertValue)){
+                // 将设备状态信息存储到Redis中
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            }
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理告警命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+
+}

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

@@ -0,0 +1,84 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+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 com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+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.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_BOOT_LOGO_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 上传开机图片命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqBootLogoRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.BOOT_LOGO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Byte val2 = (Byte) context.getConvertArr()[1];
+            if (val2 == 100) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                return;
+            }
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX  + context.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX);
+            if (StringUtils.isEmpty(data)) {
+                return;
+            }
+            
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+
+            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("发送开机LOGO点阵数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+
+        } catch (Exception e) {
+            log.error("处理开机LOGO时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+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.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqLaserModeSettingsRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LASER_LIGHT;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String mode = convertArr[1].toString();
+            if(StringUtils.isNotBlank(mode)){
+                // 发送设备状态和位置信息到Redis
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
+            }
+
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+        } catch (Exception e) {
+            log.error("处理激光模式命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
+        }
+    }
+
+    /**
+     * 发送设备状态信息和位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     */
+    public void syncSendDeviceDataToRedisWithFuture(String deviceImei,Object convertValue) {
+//        CompletableFuture.runAsync(() -> {
+//
+//        });
+        try {
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LASER_MODE_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());
+
+        } catch (Exception e) {
+            log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,51 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+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.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqLightBrightnessRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.MAIN_LIGHT_BRIGHTNESS;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String convertValue = convertArr[1].toString();
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理灯光亮度命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+}

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

@@ -0,0 +1,215 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+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.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+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;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+
+/**
+ * 定位数据命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqLocationDataRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LOCATION_DATA;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        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));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理定位数据命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    /**
+     * 异步发送位置信息到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.isBlank(latitude) || StringUtils.isBlank(longitude)){
+                    return;
+                }
+                String[] latArr = latitude.split("\\.");
+                String[] lonArr = longitude.split("\\.");
+                // 将位置信息存储到Redis中
+                String redisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+  deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+                String redisObj = RedisUtils.getCacheObject(redisKey);
+                JSONObject jsonOBj = JSONObject.parseObject(redisObj);
+                if(jsonOBj != null){
+                    String str1 = latArr[0] +"."+ latArr[1].substring(0,4);
+                    String str2 = lonArr[0] +"."+ lonArr[1].substring(0,4);
+
+                    String cacheLatitude = jsonOBj.getString("wgs84_latitude");
+                    String cacheLongitude = jsonOBj.getString("wgs84_longitude");
+                    String[] latArr1 = cacheLatitude.split("\\.");
+                    String[] lonArr1 = cacheLongitude.split("\\.");
+
+                    String cacheStr1 = latArr1[0] +"."+ latArr1[1].substring(0,4);
+                    String cacheStr2 = lonArr1[0] +"."+ lonArr1[1].substring(0,4);
+                    if(str1.equals(cacheStr1) && str2.equals(cacheStr2)){
+                        log.info("位置信息未发生变化: device={}, lat={}, lon={}", deviceImei, latitude, 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]);
+                locationInfo.put("wgs84_latitude", latitude);
+                locationInfo.put("wgs84_longitude", longitude);
+                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+                locationInfo.put("address", address);
+                locationInfo.put("timestamp", System.currentTimeMillis());
+
+
+                
+                String locationJson = JsonUtils.toJsonString(locationInfo);
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(redisKey, locationJson);
+
+                // 存储到一个列表中，保留历史位置信息
+//                String locationHistoryKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX + deviceImei;
+//                RedisUtils.addCacheList(locationHistoryKey, locationJson);
+//                RedisUtils.expire(locationHistoryKey, Duration.ofDays(90));
+                storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+                log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            } catch (Exception e) {
+                log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+
+    /**
+     * 存储设备30天历史轨迹到Redis (使用Sorted Set)
+     */
+    public void storeDeviceTrajectoryWithSortedSet(String deviceImei, String locationJson) {
+        try {
+            String trajectoryKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceImei + DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX;
+//            String trajectoryKey = "device:trajectory:zset:" + deviceImei;
+//            String locationJson = JsonUtils.toJsonString(locationInfo);
+            long timestamp = System.currentTimeMillis();
+
+            // 添加到Sorted Set，使用时间戳作为score
+            RedisUtils.zAdd(trajectoryKey, locationJson, timestamp);
+
+//            // 设置30天过期时间
+//            RedisUtils.expire(trajectoryKey, Duration.ofDays(30));
+
+            // 清理30天前的数据（冗余保护）
+            long thirtyDaysAgo = System.currentTimeMillis() - (7L * 24 * 60 * 60 * 1000);
+            RedisUtils.zRemoveRangeByScore(trajectoryKey, 0, thirtyDaysAgo);
+        } catch (Exception e) {
+            log.error("存储设备轨迹到Redis(ZSet)失败: 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]));
+        String str1 = latArr[1];
+        intData.add(Integer.parseInt(str1.substring(0,4)));
+        String str2 = lonArr[1];
+        intData.add(Integer.parseInt(lonArr[0]));
+        intData.add(Integer.parseInt(str2.substring(0,4)));
+        
+        Map<String, Object> map = new HashMap<>();
+        map.put("instruct", intData);
+        return map;
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+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.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.concurrent.CompletableFuture;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqModeRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LIGHT_MODE;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+
+            String mainLightMode = convertArr[1].toString();
+            String batteryRemainingTime = convertArr[2].toString();
+            if(StringUtils.isNotBlank(mainLightMode)){
+                if("0".equals(mainLightMode)){
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0", Duration.ofSeconds(60*15));
+                }
+                // 发送设备状态和位置信息到Redis
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mainLightMode);
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, batteryRemainingTime);
+            }
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+        } catch (Exception e) {
+            log.error("处理灯光模式命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    /**
+     * 发送设备状态信息和位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     */
+    public void syncSendDeviceDataToRedisWithFuture(String deviceImei,Object convertValue) {
+//        CompletableFuture.runAsync(() -> {
+//
+//        });
+        try {
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LIGHT_MODE_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());
+
+        } catch (Exception e) {
+            log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
+    }
+
+
+
+}

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

@@ -0,0 +1,58 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+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.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+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;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+/**
+ * 定位数据命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqPersonnelInfoDataRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.PERSONNEL_INFO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Object[] convertArr = context.getConvertArr();
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+        } catch (Exception e) {
+            log.error("处理定位数据命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
+        }
+    }
+}

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

@@ -0,0 +1,84 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+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 com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+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.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 人员信息命令处理
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqSendMessageRule implements MqttMessageRule {
+    
+    private final MqttGateway mqttGateway;
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.SEND_MESSAGE;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            Byte val2 = (Byte) context.getConvertArr()[1];
+            if (val2 == 100) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                return;
+            }
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":app_send_message_data");
+            if (StringUtils.isEmpty(data)) {
+                return;
+            }
+            
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+//            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(6);
+            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);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+}

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

@@ -0,0 +1,143 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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 com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.CRC32;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_BOOT_LOGO_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 星汉设备开机 LOGO 下发规则：
+ * <p>
+ * 1. 设备上行 sta_PicTarns=great!  => 仅标记成功<br>
+ * 2. 设备上行 sta_PicTarns=数字   => 下发第 N 块数据（256B/块，带 CRC32）
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class XinghanBootLogoRule implements MqttMessageRule {
+
+    private final MqttGateway mqttGateway;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_BOOT_LOGO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        final String functionAccessKey = FUNCTION_ACCESS_KEY + ctx.getDeviceImei();
+        try {
+            MqttXinghanLogoJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), MqttXinghanLogoJson.class);
+
+            String respText = payload.getStaPicTrans();
+            log.warn("设备上报LOGO：{}", respText);
+
+            // 1. great! —— 成功标记
+            if ("great!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccessKey,
+                        FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                log.info("设备 {} 开机 LOGO 写入成功", ctx.getDeviceImei());
+                return;
+            }
+
+            // 2. 数字 —— 下发数据块
+            int blockIndex;
+            try {
+                blockIndex = Integer.parseInt(respText);
+            } catch (NumberFormatException ex) {
+                log.warn("设备 {} LOGO 上报非法块号：{}", ctx.getDeviceImei(), respText);
+                return;
+            }
+            String hexImage = RedisUtils.getCacheObject(
+                    GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + ctx.getDeviceImei() + DEVICE_BOOT_LOGO_KEY_PREFIX);
+            if (StringUtils.isEmpty(hexImage)) {
+                return;
+            }
+
+            byte[] fullBin = ImageToCArrayConverter.convertStringToByteArray(hexImage);
+            byte[] chunk = ImageToCArrayConverter.getChunk(fullBin, blockIndex - 1, CHUNK_SIZE);
+            log.info("设备 {} 第 {} 块数据长度: {} bytes", ctx.getDeviceImei(), blockIndex, chunk.length);
+
+            // 组装下发数据
+            ArrayList<Integer> dataFrame = new ArrayList<>();
+            dataFrame.add(blockIndex);                                // 块号
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(chunk), dataFrame);
+            dataFrame.addAll(crc32AsList(chunk));                     // CRC32
+
+            Map<String, Object> pub = new HashMap<>();
+            pub.put("ins_PicTrans", dataFrame);
+
+            String topic = MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei();
+            String json = JsonUtils.toJsonString(pub);
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+
+            log.info("下发开机 LOGO 数据 => topic:{}, payload:{}", topic, json);
+
+        } catch (Exception e) {
+            log.error("处理设备 {} 开机 LOGO 失败", ctx.getDeviceImei(), e);
+            RedisUtils.setCacheObject(functionAccessKey,
+                    FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    /* ---------- 内部工具 ---------- */
+
+    private static final int CHUNK_SIZE = 256;
+
+    private static ArrayList<Integer> crc32AsList(byte[] data) {
+        CRC32 crc = new CRC32();
+        crc.update(data);
+        byte[] crcBytes = ByteBuffer.allocate(4)
+                .order(ByteOrder.BIG_ENDIAN)
+                .putInt((int) crc.getValue())
+                .array();
+        ArrayList<Integer> list = new ArrayList<>(4);
+        for (byte b : crcBytes) {
+            list.add(Byte.toUnsignedInt(b));
+        }
+        return list;
+    }
+
+    /* ---------- DTO ---------- */
+
+    @Data
+    private static class MqttXinghanLogoJson {
+        /**
+         * 设备上行：
+         * 数字  -> 请求对应块号
+         * great! -> 写入成功
+         */
+        @JsonProperty("sta_PicTrans")
+        private String staPicTrans;
+    }
+}

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

@@ -0,0 +1,212 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+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.base.MqttXinghanJson;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 主动上报设备数据命令处理
+ * 第一键值对，静电预警档位：3,2,1,0,分别表示高档/中档/低挡/关闭.
+ * 第二键值对，照明档位，2,1,0,分别表示弱光/强光/关闭
+ * 第三键值对，SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+ * 第四键值对，剩余照明时间，0-5999，单位分钟。
+ * 第五键值对, 剩余电量百分比，0-100。
+ * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
+ * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
+ * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
+ * 第九键值对，IMIE卡号
+ * 第十键值对，经度
+ * 第十一键值对，纬度
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class XinghanDeviceDataRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_DEVICE_DATA;
+    }
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        try {
+            // Latitude, longitude
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            MqttXinghanJson deviceStatus = objectMapper.convertValue(context.getPayloadDict(), MqttXinghanJson.class);
+
+            // 发送设备状态和位置信息到Redis
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),deviceStatus);
+        } catch (Exception e) {
+            log.error("处理上报数据命令时出错", e);
+        }
+    }
+
+    /**
+     * 发送设备状态信息和位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     * @param deviceStatus 机器主动上报的状态信息
+     */
+    public void asyncSendDeviceDataToRedisWithFuture(String deviceImei, MqttXinghanJson deviceStatus) {
+        CompletableFuture.runAsync(() -> {
+            try {
+
+                // 将设备状态信息存储到Redis中
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_STATUS_KEY_PREFIX;
+                String deviceInfoJson = JsonUtils.toJsonString(deviceStatus);
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
+
+                log.info("设备状态信息已异步发送到Redis: device={}, deviceInfoJson={}",
+                        deviceImei, deviceInfoJson);
+
+                //设备坐标缓存KEY
+                String functionAccess = FUNCTION_ACCESS_KEY + deviceImei;
+                // 异步发送经纬度到Redis
+                asyncSendLocationToRedisWithFuture(deviceImei, deviceStatus.getStalatitude(), deviceStatus.getStalongitude());
+
+            } 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.isBlank(latitude) || StringUtils.isBlank(longitude)){
+                    return;
+                }
+                String[] latArr = latitude.split("\\.");
+                String[] lonArr = longitude.split("\\.");
+                // 将位置信息存储到Redis中
+                String redisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+  deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+                String redisObj = RedisUtils.getCacheObject(redisKey);
+                JSONObject jsonOBj = JSONObject.parseObject(redisObj);
+                if(jsonOBj != null){
+                    String str1 = latArr[0] +"."+ latArr[1].substring(0,4);
+                    String str2 = lonArr[0] +"."+ lonArr[1].substring(0,4);
+
+                    String cacheLatitude = jsonOBj.getString("wgs84_latitude");
+                    String cacheLongitude = jsonOBj.getString("wgs84_longitude");
+                    String[] latArr1 = cacheLatitude.split("\\.");
+                    String[] lonArr1 = cacheLongitude.split("\\.");
+
+                    String cacheStr1 = latArr1[0] +"."+ latArr1[1].substring(0,4);
+                    String cacheStr2 = lonArr1[0] +"."+ lonArr1[1].substring(0,4);
+                    if(str1.equals(cacheStr1) && str2.equals(cacheStr2)){
+                        log.info("位置信息未发生变化: device={}, lat={}, lon={}", deviceImei, latitude, 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]);
+                locationInfo.put("wgs84_latitude", latitude);
+                locationInfo.put("wgs84_longitude", longitude);
+                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+                locationInfo.put("address", address);
+                locationInfo.put("timestamp", System.currentTimeMillis());
+
+
+
+                String locationJson = JsonUtils.toJsonString(locationInfo);
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(redisKey, locationJson);
+
+                // 存储到一个列表中，保留历史位置信息
+//                String locationHistoryKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX + deviceImei;
+//                RedisUtils.addCacheList(locationHistoryKey, locationJson);
+//                RedisUtils.expire(locationHistoryKey, Duration.ofDays(90));
+                storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+                log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            } catch (Exception e) {
+                log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+
+    /**
+     * 存储设备30天历史轨迹到Redis (使用Sorted Set)
+     */
+    public void storeDeviceTrajectoryWithSortedSet(String deviceImei, String locationJson) {
+        try {
+            String trajectoryKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceImei + DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX;
+//            String trajectoryKey = "device:trajectory:zset:" + deviceImei;
+//            String locationJson = JsonUtils.toJsonString(locationInfo);
+            long timestamp = System.currentTimeMillis();
+
+            // 添加到Sorted Set，使用时间戳作为score
+            RedisUtils.zAdd(trajectoryKey, locationJson, timestamp);
+
+//            // 设置30天过期时间
+//            RedisUtils.expire(trajectoryKey, Duration.ofDays(30));
+
+            // 清理30天前的数据（冗余保护）
+            long thirtyDaysAgo = System.currentTimeMillis() - (7L * 24 * 60 * 60 * 1000);
+            RedisUtils.zRemoveRangeByScore(trajectoryKey, 0, thirtyDaysAgo);
+        } catch (Exception e) {
+            log.error("存储设备轨迹到Redis(ZSet)失败: 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]));
+        String str1 = latArr[1];
+        intData.add(Integer.parseInt(str1.substring(0,4)));
+        String str2 = lonArr[1];
+        intData.add(Integer.parseInt(lonArr[0]));
+        intData.add(Integer.parseInt(str2.substring(0,4)));
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("instruct", intData);
+        return map;
+    }
+
+}

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

@@ -0,0 +1,117 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+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.MqttConstants;
+import com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 星汉设备发送消息 下发规则：
+ * <p>
+ * 1. 设备上行 sta_TexTarns=genius!  => 仅标记成功<br>
+ * 2. 设备上行 sta_TexTarns=数字   => GBK编码，每行文字为一包，一共4包，第一字节为包序号
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class XinghanSendMsgRule implements MqttMessageRule {
+
+    private final MqttGateway mqttGateway;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_ESEND_MSG;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        String functionAccess = FUNCTION_ACCESS_KEY + ctx.getDeviceImei();
+        try {
+            XinghanSendMsgRule.MqttXinghanMsgJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), XinghanSendMsgRule.MqttXinghanMsgJson.class);
+
+            String respText = payload.getStaTexTrans();
+            log.info("设备上报人员信息： {} ", respText);
+
+            // 1. genius! —— 成功标记
+            if ("genius!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+                log.info("设备 {} 发送消息完成", ctx.getDeviceImei());
+                return;
+            }
+            // 2. 数字 —— 下发数据块
+            int blockIndex;
+            try {
+                blockIndex = Integer.parseInt(respText);
+            } catch (NumberFormatException ex) {
+                log.warn("设备 {} 消息上报非法块号：{}", ctx.getDeviceImei(), respText);
+                return;
+            }
+            // 将发送的信息原文本以List<String>形式存储在Redis中
+            List<String> data = RedisUtils.getCacheList(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + ctx.getDeviceImei() + ":app_send_message_data");
+            if (data.isEmpty()) {
+                return;
+            }
+            //
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(blockIndex);
+            // 获取块原内容 转成GBK  再转成无符号十进制整数
+            String blockTxt = data.get(blockIndex-1);
+            // 再按 GBK 编码把字符串转成字节数组，并逐个转为无符号十进制整数
+            for (byte b : blockTxt.getBytes(GBK)) {
+                intData.add(b & 0xFF);   // b & 0xFF 得到 0~255 的整数
+            }
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("ins_TexTrans", intData);
+
+            String topic = MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei();
+            String json = JsonUtils.toJsonString(map);
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+            log.info("发送设备信息数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+
+        } catch (Exception e) {
+            log.error("处理发送设备信息时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    private static final Charset GBK = Charset.forName("GBK");
+
+    /* ---------- DTO ---------- */
+
+    @Data
+    private static class MqttXinghanMsgJson {
+        /**
+         * 设备上行：
+         * 数字  -> 请求对应块号
+         * genius! -> 写入成功
+         */
+        @JsonProperty("sta_TexTrans")
+        private String staTexTrans;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageConsumer.java

@@ -0,0 +1,110 @@
+package com.fuyuanshen.global.queue;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+public class MqttMessageConsumer {
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+    
+    // 创建两个线程池：一个用于消息获取，一个用于业务处理
+    private ExecutorService messageConsumerPool = Executors.newFixedThreadPool(3);
+    private ExecutorService messageProcessorPool = Executors.newFixedThreadPool(10);
+
+    // 初始化方法，启动消息监听
+//    @PostConstruct
+    public void start() {
+        log.info("启动MQTT消息消费者...");
+        // 启动消息获取线程
+        for (int i = 0; i < 3; i++) {
+            messageConsumerPool.submit(this::consumeMessages);
+        }
+    }
+
+    // 销毁方法，关闭线程池
+    @PreDestroy
+    public void stop() {
+        log.info("关闭MQTT消息消费者...");
+        shutdownExecutorService(messageConsumerPool);
+        shutdownExecutorService(messageProcessorPool);
+    }
+
+    private void shutdownExecutorService(ExecutorService executorService) {
+        if (executorService != null && !executorService.isShutdown()) {
+            executorService.shutdown();
+            try {
+                if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                    executorService.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                executorService.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    // 消费者方法 - 专门负责从队列获取消息
+    public void consumeMessages() {
+        String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+        String threadName = Thread.currentThread().getName();
+        log.info("消息消费者线程 {} 开始监听队列: {}", threadName, queueKey);
+        
+        try {
+            while (!Thread.currentThread().isInterrupted() && !messageConsumerPool.isShutdown()) {
+                // 阻塞式获取队列中的消息
+                String message = RedisUtils.pollDeduplicated(
+                    queueKey, 
+                    MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY, 
+                    1, 
+                    TimeUnit.SECONDS
+                );
+                
+                if (message != null) {
+                    log.info("线程 {} 从队列中获取到消息，提交到处理线程池: {}", threadName, message);
+                    // 将消息处理任务提交到处理线程池
+                    messageProcessorPool.submit(() -> processMessage(message));
+                }
+            }
+        } catch (Exception e) {
+            log.error("线程 {} 消费消息时发生错误", threadName, e);
+        }
+        
+        log.info("消息消费者线程 {} 停止监听队列", threadName);
+    }
+
+    // 处理具体业务逻辑的方法
+    private void processMessage(String message) {
+        String threadName = Thread.currentThread().getName();
+        try {
+            log.info("业务处理线程 {} 开始处理消息: {}", threadName, message);
+            
+            // 实现具体的业务逻辑
+            // 例如更新数据库、发送通知等
+            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("device_imei", message)
+                    .set("online_status", 1);
+            deviceMapper.update(updateWrapper);
+            // 模拟业务处理耗时
+            Thread.sleep(200);
+            
+            log.info("业务处理线程 {} 完成消息处理: {}", threadName, message);
+        } catch (Exception e) {
+            log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, message, e);
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageQueueConstants.java

@@ -0,0 +1,6 @@
+package com.fuyuanshen.global.queue;
+
+public class MqttMessageQueueConstants {
+    public static final String MQTT_MESSAGE_QUEUE_KEY = "mqtt:message:queue";
+    public static final String MQTT_MESSAGE_DEDUP_KEY = "mqtt:message:dedup";
+}

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

@@ -0,0 +1,64 @@
+package com.fuyuanshen.web;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class ChineseVCardGenerator {
+    public static void main(String[] args) {
+        // 定义江西上饶的134号段（共22个）
+        String[] prefixes = {
+                "1340703", "1340793", "1342650", "1342651", "1342663",
+                "1342664", "1342665", "1343703", "1343793", "1347901",
+                "1347902", "1347903", "1347930", "1347931", "1347932",
+                "1347933", "1347934", "1347935", "1347936", "1347937",
+                "1347938", "1347939"
+        };
+
+        // 创建.vcf文件
+        String filename = "上饶联系人.vcf";
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename, true))) {
+            // 添加文件头信息（包含中文）
+            writer.write("BEGIN:VCARD");
+            writer.newLine();
+            writer.write("VERSION:3.0");
+            writer.newLine();
+            writer.write("X-GENERATOR:Java VCard Generator");
+            writer.newLine();
+            writer.write("PRODID:-//Apple Inc.//iPhone OS 15.6//EN");
+            writer.newLine();
+            writer.newLine();
+
+            // 生成所有联系人
+            int count = 0;
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    String phoneNumber = prefix + middle + "51";
+
+                    // 写入单个联系人（使用中文）
+                    writer.write("FN;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:用户" + (count + 1));  // 中文姓名
+                    writer.newLine();
+                    writer.write("TEL;TYPE=CELL;CHARSET=UTF-8:" + phoneNumber);  // 手机号
+                    writer.newLine();
+                    writer.write("NOTE;CHARSET=UTF-8:生成时间 " + new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+                    writer.newLine();
+                    writer.write("END:VCARD");
+                    writer.newLine();
+                    writer.newLine();
+
+                    count++;
+                }
+            }
+
+            System.out.println("成功生成 " + count + " 个中文联系人");
+            System.out.println("文件已保存为: " + filename);
+
+        } catch (IOException e) {
+            System.err.println("文件写入错误: " + e.getMessage());
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/PhoneNumberGenerator.java

@@ -0,0 +1,41 @@
+package com.fuyuanshen.web;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class PhoneNumberGenerator {
+    public static void main(String[] args) {
+        // 定义江西上饶的134号段（共22个）
+        String[] prefixes = {
+                "1340703", "1340793", "1342650", "1342651", "1342663",
+                "1342664", "1342665", "1343703", "1343793", "1347901",
+                "1347902", "1347903", "1347930", "1347931", "1347932",
+                "1347933", "1347934", "1347935", "1347936", "1347937",
+                "1347938", "1347939"
+        };
+
+        // 输出到控制台
+        System.out.println("江西上饶134号段完整手机号码（共2200个）：");
+        for (String prefix : prefixes) {
+            for (int i = 0; i < 100; i++) {
+                String middle = String.format("%02d", i); // 生成00-99的中间数字
+                System.out.println(prefix + middle + "51");
+            }
+        }
+
+        // 同时输出到文件（可选）
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter("shangrao_phones.txt"))) {
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    writer.write(prefix + middle + "51");
+                    writer.newLine();
+                }
+            }
+            System.out.println("\n同时已保存到文件：shangrao_phones.txt");
+        } catch (IOException e) {
+            System.err.println("文件写入错误：" + e.getMessage());
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/VCardGenerator.java

@@ -0,0 +1,59 @@
+package com.fuyuanshen.web;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+public class VCardGenerator {
+    public static void main(String[] args) {
+        // 定义江西上饶的134号段（共22个）
+        String[] prefixes = {
+                "1340703", "1340793", "1342650", "1342651", "1342663",
+                "1342664", "1342665", "1343703", "1343793", "1347901",
+                "1347902", "1347903", "1347930", "1347931", "1347932",
+                "1347933", "1347934", "1347935", "1347936", "1347937",
+                "1347938", "1347939"
+        };
+
+        // 创建.vcf文件
+        String filename = "shangrao_contacts.vcf";
+
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {
+            // 写入文件头
+            writer.write("BEGIN:VCARD");
+            writer.newLine();
+            writer.write("VERSION:3.0");
+            writer.newLine();
+            writer.newLine();
+
+            // 生成所有联系人
+            int count = 0;
+            for (String prefix : prefixes) {
+                for (int i = 0; i < 100; i++) {
+                    String middle = String.format("%02d", i);
+                    String phoneNumber = prefix + middle + "51";
+
+                    // 写入单个联系人
+                    writer.write("FN:" + phoneNumber);  // 姓名字段使用手机号
+                    writer.newLine();
+                    writer.write("TEL;TYPE=CELL:" + phoneNumber);  // 电话字段使用手机号
+                    writer.newLine();
+                    writer.write("END:VCARD");
+                    writer.newLine();
+                    writer.newLine();
+
+                    count++;
+                }
+            }
+
+            // 写入文件尾
+            writer.write("END:VCARD");
+
+            System.out.println("成功生成 " + count + " 个联系人");
+            System.out.println("文件已保存为: " + filename);
+
+        } catch (IOException e) {
+            System.err.println("文件写入错误: " + e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,107 @@
+package com.fuyuanshen.web.controller.device;
+
+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.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+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.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 设备告警
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/equipment/alarm")
+public class DeviceAlarmController extends BaseController {
+
+    private final IDeviceAlarmService deviceAlarmService;
+
+
+    /**
+     * 查询设备告警列表
+     */
+    // @SaCheckPermission("equipment:alarm:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceAlarmVo> list(DeviceAlarmBo bo, PageQuery pageQuery) {
+        return deviceAlarmService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备告警列表
+     */
+    // @SaCheckPermission("equipment:alarm:export")
+    @Log(title = "导出设备告警列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceAlarmBo bo, HttpServletResponse response) {
+        List<DeviceAlarmVo> list = deviceAlarmService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备告警", DeviceAlarmVo.class, response);
+    }
+
+    /**
+     * 获取设备告警详细信息
+     *
+     * @param id 主键
+     */
+    // @SaCheckPermission("equipment:alarm:query")
+    @GetMapping("/{id}")
+    public R<DeviceAlarmVo> getInfo(@NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(deviceAlarmService.queryById(id));
+    }
+
+    /**
+     * 新增设备告警
+     */
+    // @SaCheckPermission("equipment:alarm:add")
+    @Log(title = "设备告警", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceAlarmBo bo) {
+        return toAjax(deviceAlarmService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备告警
+     */
+    // @SaCheckPermission("equipment:alarm:edit")
+    @Log(title = "设备告警", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceAlarmBo bo) {
+        return toAjax(deviceAlarmService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备告警
+     *
+     * @param ids 主键串
+     */
+    // @SaCheckPermission("equipment:alarm:remove")
+    @Log(title = "设备告警", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceAlarmService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+}

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

@@ -0,0 +1,119 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+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;
+
+/**
+ * web后台:设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/bjq/device")
+public class DeviceBJQController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(appDeviceService.getInfo(id));
+    }
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送信息
+     */
+    @PostMapping(value = "/sendMessage")
+    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
+    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendMessage(bo));
+    }
+
+    /**
+     * 发送报警信息
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("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（泛光模式）
+     */
+//    @FunctionAccessAnnotation("lightModeSettings")
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+//    @FunctionAccessAnnotation("lightBrightnessSettings")
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+//    @FunctionAccessAnnotation("laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+}

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

@@ -0,0 +1,105 @@
+package com.fuyuanshen.web.controller.device;
+
+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.equipment.domain.vo.DeviceChargeDischargeVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceChargeDischargeBo;
+import com.fuyuanshen.equipment.service.IDeviceChargeDischargeService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备充放电记录
+ *
+ * @author Lion Li
+ * @date 2025-08-30
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/equipment/chargeDischarge")
+public class DeviceChargeDischargeController extends BaseController {
+
+    private final IDeviceChargeDischargeService deviceChargeDischargeService;
+
+    /**
+     * 查询设备充放电记录列表
+     */
+    @SaCheckPermission("equipment:chargeDischarge:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceChargeDischargeVo> list(DeviceChargeDischargeBo bo, PageQuery pageQuery) {
+        return deviceChargeDischargeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 设备充放电记录列表
+     */
+    @SaCheckPermission("equipment:chargeDischarge:export")
+    @Log(title = "设备充放电记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceChargeDischargeBo bo, HttpServletResponse response) {
+        List<DeviceChargeDischargeVo> list = deviceChargeDischargeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备充放电记录", DeviceChargeDischargeVo.class, response);
+    }
+
+    /**
+     * 获取设备充放电记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("equipment:chargeDischarge:query")
+    @GetMapping("/{id}")
+    public R<DeviceChargeDischargeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(deviceChargeDischargeService.queryById(id));
+    }
+
+    /**
+     * 新增设备充放电记录
+     */
+    @SaCheckPermission("equipment:chargeDischarge:add")
+    @Log(title = "设备充放电记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceChargeDischargeBo bo) {
+        return toAjax(deviceChargeDischargeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备充放电记录
+     */
+    @SaCheckPermission("equipment:chargeDischarge:edit")
+    @Log(title = "设备充放电记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceChargeDischargeBo bo) {
+        return toAjax(deviceChargeDischargeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备充放电记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("equipment:chargeDischarge:remove")
+    @Log(title = "设备充放电记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceChargeDischargeService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -0,0 +1,150 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+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.InstructionRecordDto;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.*;
+import com.fuyuanshen.web.service.device.DeviceBizService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * web后台:设备控制中心
+ */
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/device")
+public class DeviceControlCenterController  extends BaseController {
+
+    private final DeviceBizService appDeviceService;
+
+
+    /**
+     * 查询设备列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<WebDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        return appDeviceService.queryWebDeviceList(bo, pageQuery);
+    }
+
+    /**
+     * 绑定设备
+     */
+    @PostMapping("/bind")
+    public R<Void> bind(@RequestBody AppDeviceBo bo) {
+        return toAjax(appDeviceService.bindDevice(bo));
+    }
+
+
+    /**
+     * 解绑设备
+     */
+    @DeleteMapping("/unBind")
+    public R<Void> unBind(Long id) {
+        return toAjax(appDeviceService.unBindDevice(id));
+    }
+
+    /**
+     * 查询设备类型列表
+     */
+    @GetMapping(value = "/typeList")
+    public R<List<APPDeviceTypeVo>> getTypeList() {
+        List<APPDeviceTypeVo> typeList = appDeviceService.getTypeList();
+        return R.ok(typeList);
+    }
+
+    /**
+     * 重命名设备
+     *
+     * @param reNameDTO
+     * @return
+     */
+    @PostMapping(value = "/reName")
+    public R<String> reName(@Validated @RequestBody APPReNameDTO reNameDTO) {
+        appDeviceService.reName(reNameDTO);
+        return R.ok("重命名成功！！！");
+    }
+
+
+    @GetMapping("/realTimeStatus")
+    public R<Map<String, Object>> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        Map<String, Object> status = appDeviceService.getRealTimeStatus(statusDto);
+        return R.ok(status);
+    }
+
+    /**
+     * 根据mac查询设备信息
+     */
+    @GetMapping("/getDeviceInfoByDeviceMac")
+    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
+        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
+    }
+
+    /**
+     * 指令下发记录
+     */
+    @GetMapping("/instructionRecord")
+    public TableDataInfo<InstructionRecordVo> getInstructionRecord(InstructionRecordDto dto, PageQuery pageQuery) {
+        return appDeviceService.getInstructionRecord(dto,pageQuery);
+    }
+
+    /**
+     * 导出
+     */
+    @GetMapping("/export")
+    public void export(InstructionRecordDto dto, PageQuery pageQuery, HttpServletResponse response) {
+        pageQuery.setPageNum(1);
+        pageQuery.setPageSize(2000);
+        TableDataInfo<InstructionRecordVo> instructionRecord = appDeviceService.getInstructionRecord(dto, pageQuery);
+        if(instructionRecord.getRows() == null){
+            return;
+        }
+        ExcelUtil.exportExcel(instructionRecord.getRows(), "设备操作日志", InstructionRecordVo.class, response);
+    }
+
+
+    /**
+     * 历史轨迹查询
+     */
+    @GetMapping("/locationHistory")
+    public TableDataInfo<LocationHistoryVo> getLocationHistory(InstructionRecordDto dto, PageQuery pageQuery) {
+        return appDeviceService.getLocationHistory(dto,pageQuery);
+    }
+
+    /**
+     * 历史轨迹导出
+     */
+    @GetMapping("/locationHistoryExport")
+    public void locationHistoryExport(InstructionRecordDto dto, PageQuery pageQuery, HttpServletResponse response) {
+        pageQuery.setPageNum(1);
+        pageQuery.setPageSize(2000);
+        TableDataInfo<LocationHistoryVo> result = appDeviceService.getLocationHistory(dto, pageQuery);
+        if(result.getRows() == null){
+            return;
+        }
+        ExcelUtil.exportExcel(result.getRows(), "历史轨迹记录", LocationHistoryVo.class, response);
+    }
+
+    /**
+     * 历史轨迹播放
+     */
+    @GetMapping("/getLocationHistoryDetail")
+    public R<List<LocationHistoryDetailVo>> getLocationHistoryDetail(Long id) {
+        return R.ok(appDeviceService.getLocationHistoryDetail(id));
+    }
+}

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

@@ -0,0 +1,166 @@
+package com.fuyuanshen.web.controller.device;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+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.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
+import com.fuyuanshen.equipment.service.IDeviceGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 设备分组
+ *
+ * @author Lion Li
+ * @date 2025-08-08
+ */
+@Tag(name = "web:设备分组", description = "web:设备分组")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/device/group")
+public class DeviceGroupController extends BaseController {
+
+    private final IDeviceGroupService deviceGroupService;
+
+
+    /**
+     * 查询设备分组列表
+     */
+    @Operation(summary = "查询设备分组列表")
+    @SaCheckPermission("fys-equipment:group:list")
+    @GetMapping("/list")
+    public R<List<DeviceGroupVo>> list(DeviceGroupBo bo) {
+        List<DeviceGroupVo> list = deviceGroupService.queryList(bo);
+        return R.ok(list);
+    }
+
+
+    /**
+     * 查询设备分组列表(分页)
+     */
+    @Operation(summary = "查询设备分组列表(分页)")
+    @SaCheckPermission("fys-equipment:group:list")
+    @GetMapping("/listPage")
+    public TableDataInfo<DeviceGroupVo> listPage(DeviceGroupBo bo) {
+        List<DeviceGroupVo> list = deviceGroupService.queryList(bo);
+        // return R.ok(list);
+        return null;
+    }
+
+    // @GetMapping("/list")
+    // public TableDataInfo<DeviceAlarmVo> list(DeviceAlarmBo bo, PageQuery pageQuery) {
+    //     return deviceAlarmService.queryPageList(bo, pageQuery);
+    // }
+
+
+    /**
+     * 导出设备分组列表
+     */
+    @SaCheckPermission("fys-equipment:group:export")
+    @Log(title = "设备分组", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceGroupBo bo, HttpServletResponse response) {
+        List<DeviceGroupVo> list = deviceGroupService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备分组", DeviceGroupVo.class, response);
+    }
+
+
+    /**
+     * 获取设备分组详细信息
+     *
+     * @param id 主键
+     */
+    @Operation(summary = "获取设备分组详细信息")
+    @SaCheckPermission("fys-equipment:group:query")
+    @GetMapping("/{id}")
+    public R<DeviceGroupVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        return R.ok(deviceGroupService.queryById(id));
+    }
+
+
+    /**
+     * 新增设备分组
+     */
+    @Operation(summary = "新增设备分组")
+    @SaCheckPermission("fys-equipment:group:add")
+    @Log(title = "设备分组", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceGroupBo bo) {
+        return toAjax(deviceGroupService.insertByBo(bo));
+    }
+
+
+    /**
+     * 修改设备分组
+     */
+    @Operation(summary = "修改设备分组")
+    @SaCheckPermission("fys-equipment:group:edit")
+    @Log(title = "设备分组", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceGroupBo bo) {
+        return toAjax(deviceGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备分组
+     *
+     * @param ids 主键串
+     */
+    @Operation(summary = "删除设备分组")
+    @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "设备分组", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long[] ids) {
+        return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+    /**
+     * 绑定设备分组
+     *
+     * @param groupId  分组id
+     * @param deviceId 设备id
+     */
+    @Operation(summary = "绑定设备分组")
+    // @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "绑定设备分组", businessType = BusinessType.DELETE)
+    @GetMapping("/groupId/{groupId}/{deviceId}")
+    public R<Void> bindingDevice(@NotNull(message = "分组id 不能为空") @PathVariable Long groupId,
+                                 @NotNull(message = "设备id 不能为空") @PathVariable Long[] deviceId) {
+        return toAjax(deviceGroupService.bindingDevice(groupId, deviceId));
+    }
+
+
+    /**
+     * 解绑设备分组
+     *
+     * @param deviceId 设备id
+     */
+    @Operation(summary = "解绑设备分组")
+    // @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "解绑设备分组", businessType = BusinessType.DELETE)
+    @GetMapping("/groupUnbind/{deviceId}")
+    public R<Void> groupUnbind(@NotNull(message = "设备id 不能为空") @PathVariable Long[] deviceId) {
+        return toAjax(deviceGroupService.groupUnbind(deviceId));
+    }
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+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.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.web.service.DeviceShareService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 设备分享管理
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/equipment/share")
+public class DeviceShareController extends BaseController {
+
+    private final DeviceShareService appDeviceShareService;
+
+
+    /**
+     *查询设备分享列表(web)
+     */
+    // @SaCheckPermission("equipment:alarm:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return appDeviceShareService.queryWebList(bo, pageQuery);
+    }
+
+
+
+}

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

@@ -0,0 +1,67 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.equipment.domain.vo.DataOverviewVo;
+import com.fuyuanshen.equipment.service.DeviceService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 首页数据
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0113:46
+ */
+@Tag(name = "首页数据", description = "首页数据")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/device/homepage")
+public class HomePageController {
+
+    private final DeviceService deviceService;
+
+
+    /**
+     * 获取 数据总览
+     * DataOverview
+     */
+    @GetMapping("/getDataOverview")
+    public R<DataOverviewVo> getDataOverview() {
+        return R.ok(deviceService.getDataOverview());
+    }
+
+
+
+
+    // 获取设备使用数据
+    @GetMapping("/{deviceId}")
+    public Map<String, Object> getUsageData(
+            @PathVariable String deviceId,
+            @RequestParam String range) {
+
+        Map<String, Object> response = new HashMap<>();
+
+        if ("halfYear".equals(range)) {
+            response.put("months", Arrays.asList("1月", "2月", "3月", "4月", "5月", "6月"));
+            response.put("data", Arrays.asList(45, 52, 38, 60, 56, 48));
+        } else if ("oneYear".equals(range)) {
+            response.put("months", Arrays.asList("7月", "8月", "9月", "10月", "11月", "12月",
+                    "1月", "2月", "3月", "4月", "5月", "6月"));
+            response.put("data", Arrays.asList(42, 38, 45, 48, 52, 55, 45, 52, 38, 60, 56, 48));
+        }
+
+        response.put("deviceId", deviceId);
+        response.put("range", range);
+        response.put("lastUpdate", new Date());
+
+        return response;
+    }
+}

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

@@ -0,0 +1,106 @@
+package com.fuyuanshen.web.controller.device;
+
+
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
+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.*;
+
+import java.util.List;
+
+/**
+ * @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));
+    }
+
+
+    /**
+     * 设备详情
+     *
+     * @param id
+     * @return
+     */
+    @Operation(summary = "设备详情")
+    @GetMapping(value = "/pc/detail/{id}")
+    public R<WebDeviceVo> getDeviceDetail(@PathVariable Long id) {
+        WebDeviceVo device = deviceService.getDevice(id);
+        return R.ok(device);
+    }
+
+
+    /**
+     * 设备用户详情
+     *
+     * @param deviceId
+     * @return
+     */
+    @Operation(summary = "设备详情")
+    @GetMapping(value = "/getDeviceUser/{deviceId}")
+    public R<List<AppPersonnelInfoRecords>> getDeviceUser(@PathVariable Long deviceId) {
+        List<AppPersonnelInfoRecords> device = deviceService.getDeviceUser(deviceId);
+        return R.ok(device);
+    }
+
+
+    /**
+     * 设备操作记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Operation(summary = "设备操作记录")
+    @GetMapping(value = "/getOperationRecord/{deviceId}")
+    public R<List<DeviceLog>> getOperationRecord(@PathVariable Long deviceId) {
+        List<DeviceLog> device = deviceService.getOperationRecord(deviceId);
+        return R.ok(device);
+    }
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Operation(summary = "设备告警记录")
+    @GetMapping(value = "/getAlarmRecord/{deviceId}")
+    public R<List<DeviceAlarmVo>> getAlarmRecord(@PathVariable Long deviceId) {
+        List<DeviceAlarmVo> device = deviceService.getAlarmRecord(deviceId);
+        return R.ok(device);
+    }
+
+
+}
+
+

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/enums/LightModeEnum6170.java

@@ -0,0 +1,45 @@
+package com.fuyuanshen.web.enums;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-08-0114:30
+ */
+public enum LightModeEnum6170 {
+
+    OFF(0, "关灯"),
+    HIGH_BEAM(1, "强光模式"),
+    LOW_BEAM(2, "弱光模式"),
+    STROBE(3, "爆闪模式"),
+    FLOOD(4, "泛光模式"),
+
+    UNKNOWN(-1, "未知的灯光模式");
+
+
+    private final int code;
+    private final String description;
+
+
+    LightModeEnum6170(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public static LightModeEnum6170 fromCode(int code) {
+        for (LightModeEnum6170 mode : values()) {
+            if (mode.getCode() == code) {
+                return mode;
+            }
+        }
+        // throw new IllegalArgumentException("未知的灯光模式代码: " + code);
+        return UNKNOWN;
+    }
+
+}

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

@@ -0,0 +1,318 @@
+//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.common.satoken.utils.LoginHelper;
+//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.global.mqtt.constants.TenantsConstant;
+//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 tenantId = LoginHelper.getTenantId();
+//        String tenantId = TenantsConstant.FU_YUAN_SHENG;
+//        String payload = message.getPayload().toString();
+//
+//        if (receivedTopicName != null) {
+//            // 1. 提取设备ID (从主题中获取)
+//            String deviceImei = extractDeviceId(receivedTopicName);
+//            Device device = deviceMapper.selectOne(new QueryWrapper<Device>()
+//                    .eq("tenant_id", tenantId)
+//                    .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("客户端操作");
+//                            }
+//                        }
+//                        // 确保在插入前设置tenantId和deviceId
+//                        record.setTenantId(device.getTenantId());
+//                        record.setDeviceId(device.getId());
+//                        deviceLogMapper.insert(record);
+//                    }
+//
+//                    // 2. 处理 state 消息
+//                    if (root.has("state")) {
+//                        JsonNode instructNode = root.get("state");
+//                        if (instructNode.isArray()) {
+//                            boolean b = receivedTopicName.startsWith("B/");
+//                            record = parseState(device, instructNode, b);
+//                            // 根据不同主题进行不同处理
+//                            if (receivedTopicName.startsWith("A/")) {
+//                                // 处理A主题的消息（设备上传）
+//                                record.setDataSource("设备上报");
+//                            } else if (receivedTopicName.startsWith("B/")) {
+//                                // 处理B主题的消息 （手动上传）
+//                                record.setDataSource("客户端操作");
+//                            }
+//                        }
+//                        // 确保在插入前设置tenantId和deviceId
+//                        record.setTenantId(device.getTenantId());
+//                        record.setDeviceId(device.getId());
+//                        deviceLogMapper.insert(record);
+//                    }
+//
+//                    if (root.has("imei")) {
+//                        // 设备行为
+//                        record.setDeviceAction(InstructType6170.fromCode(0).getDescription());
+//                        record.setDataSource("设备上报");
+//                        record.setContent("设备启动");
+//                        // 确保在插入前设置tenantId和deviceId
+//                        record.setTenantId(device.getTenantId());
+//                        record.setDeviceId(device.getId());
+//                        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 DeviceLog parseState(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;
+//    }
+//
+//}

fys-admin/src/main/java/com/fuyuanshen/web/listener/UserActionListener.java

@@ -1,163 +1,163 @@
-package com.fuyuanshen.web.listener;
-
-import cn.dev33.satoken.listener.SaTokenListener;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.stp.parameter.SaLoginParameter;
-import cn.hutool.core.convert.Convert;
-import cn.hutool.http.useragent.UserAgent;
-import cn.hutool.http.useragent.UserAgentUtil;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import com.fuyuanshen.common.core.constant.CacheConstants;
-import com.fuyuanshen.common.core.constant.Constants;
-import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO;
-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.ip.AddressUtils;
-import com.fuyuanshen.common.log.event.LogininforEvent;
-import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.common.satoken.utils.LoginHelper;
-import com.fuyuanshen.common.tenant.helper.TenantHelper;
-import com.fuyuanshen.web.service.SysLoginService;
-import org.springframework.stereotype.Component;
-
-import java.time.Duration;
-
-/**
- * 用户行为 侦听器的实现
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@Component
-@Slf4j
-public class UserActionListener implements SaTokenListener {
-
-    private final SysLoginService loginService;
-
-    /**
-     * 每次登录时触发
-     */
-    @Override
-    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
-        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
-        String ip = ServletUtils.getClientIP();
-        UserOnlineDTO dto = new UserOnlineDTO();
-        dto.setIpaddr(ip);
-        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
-        dto.setBrowser(userAgent.getBrowser().getName());
-        dto.setOs(userAgent.getOs().getName());
-        dto.setLoginTime(System.currentTimeMillis());
-        dto.setTokenId(tokenValue);
-        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
-        String tenantId = (String) loginParameter.getExtra(LoginHelper.TENANT_KEY);
-        dto.setUserName(username);
-        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
-        dto.setDeviceType(loginParameter.getDeviceType());
-        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            if(loginParameter.getTimeout() == -1) {
-                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
-            } else {
-                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
-            }
-        });
-        // 记录登录日志
-        LogininforEvent logininforEvent = new LogininforEvent();
-        logininforEvent.setTenantId(tenantId);
-        logininforEvent.setUsername(username);
-        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
-        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
-        logininforEvent.setRequest(ServletUtils.getRequest());
-        SpringUtils.context().publishEvent(logininforEvent);
-        // 更新登录信息
-        loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
-        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次注销时触发
-     */
-    @Override
-    public void doLogout(String loginType, Object loginId, String tokenValue) {
-        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
-        });
-        log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次被踢下线时触发
-     */
-    @Override
-    public void doKickout(String loginType, Object loginId, String tokenValue) {
-        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
-        });
-        log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次被顶下线时触发
-     */
-    @Override
-    public void doReplaced(String loginType, Object loginId, String tokenValue) {
-        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
-        TenantHelper.dynamic(tenantId, () -> {
-            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
-        });
-        log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
-    }
-
-    /**
-     * 每次被封禁时触发
-     */
-    @Override
-    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
-    }
-
-    /**
-     * 每次被解封时触发
-     */
-    @Override
-    public void doUntieDisable(String loginType, Object loginId, String service) {
-    }
-
-    /**
-     * 每次打开二级认证时触发
-     */
-    @Override
-    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
-    }
-
-    /**
-     * 每次创建Session时触发
-     */
-    @Override
-    public void doCloseSafe(String loginType, String tokenValue, String service) {
-    }
-
-    /**
-     * 每次创建Session时触发
-     */
-    @Override
-    public void doCreateSession(String id) {
-    }
-
-    /**
-     * 每次注销Session时触发
-     */
-    @Override
-    public void doLogoutSession(String id) {
-    }
-
-    /**
-     * 每次Token续期时触发
-     */
-    @Override
-    public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
-    }
-}
+//package com.fuyuanshen.web.listener;
+//
+//import cn.dev33.satoken.listener.SaTokenListener;
+//import cn.dev33.satoken.stp.StpUtil;
+//import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+//import cn.hutool.core.convert.Convert;
+//import cn.hutool.http.useragent.UserAgent;
+//import cn.hutool.http.useragent.UserAgentUtil;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import com.fuyuanshen.common.core.constant.CacheConstants;
+//import com.fuyuanshen.common.core.constant.Constants;
+//import com.fuyuanshen.common.core.domain.dto.UserOnlineDTO;
+//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.ip.AddressUtils;
+//import com.fuyuanshen.common.log.event.LogininforEvent;
+//import com.fuyuanshen.common.redis.utils.RedisUtils;
+//import com.fuyuanshen.common.satoken.utils.LoginHelper;
+//import com.fuyuanshen.common.tenant.helper.TenantHelper;
+//import com.fuyuanshen.web.service.SysLoginService;
+//import org.springframework.stereotype.Component;
+//
+//import java.time.Duration;
+//
+///**
+// * 用户行为 侦听器的实现
+// *
+// * @author Lion Li
+// */
+//@RequiredArgsConstructor
+//@Component
+//@Slf4j
+//public class UserActionListener implements SaTokenListener {
+//
+//    private final SysLoginService loginService;
+//
+//    /**
+//     * 每次登录时触发
+//     */
+//    @Override
+//    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
+//        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+//        String ip = ServletUtils.getClientIP();
+//        UserOnlineDTO dto = new UserOnlineDTO();
+//        dto.setIpaddr(ip);
+//        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+//        dto.setBrowser(userAgent.getBrowser().getName());
+//        dto.setOs(userAgent.getOs().getName());
+//        dto.setLoginTime(System.currentTimeMillis());
+//        dto.setTokenId(tokenValue);
+//        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
+//        String tenantId = (String) loginParameter.getExtra(LoginHelper.TENANT_KEY);
+//        dto.setUserName(username);
+//        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
+//        dto.setDeviceType(loginParameter.getDeviceType());
+//        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            if(loginParameter.getTimeout() == -1) {
+//                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+//            } else {
+//                RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
+//            }
+//        });
+//        // 记录登录日志
+//        LogininforEvent logininforEvent = new LogininforEvent();
+//        logininforEvent.setTenantId(tenantId);
+//        logininforEvent.setUsername(username);
+//        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
+//        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
+//        logininforEvent.setRequest(ServletUtils.getRequest());
+//        SpringUtils.context().publishEvent(logininforEvent);
+//        // 更新登录信息
+//        loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
+//        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次注销时触发
+//     */
+//    @Override
+//    public void doLogout(String loginType, Object loginId, String tokenValue) {
+//        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+//        });
+//        log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次被踢下线时触发
+//     */
+//    @Override
+//    public void doKickout(String loginType, Object loginId, String tokenValue) {
+//        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+//        });
+//        log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次被顶下线时触发
+//     */
+//    @Override
+//    public void doReplaced(String loginType, Object loginId, String tokenValue) {
+//        String tenantId = Convert.toStr(StpUtil.getExtra(tokenValue, LoginHelper.TENANT_KEY));
+//        TenantHelper.dynamic(tenantId, () -> {
+//            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+//        });
+//        log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
+//    }
+//
+//    /**
+//     * 每次被封禁时触发
+//     */
+//    @Override
+//    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
+//    }
+//
+//    /**
+//     * 每次被解封时触发
+//     */
+//    @Override
+//    public void doUntieDisable(String loginType, Object loginId, String service) {
+//    }
+//
+//    /**
+//     * 每次打开二级认证时触发
+//     */
+//    @Override
+//    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
+//    }
+//
+//    /**
+//     * 每次创建Session时触发
+//     */
+//    @Override
+//    public void doCloseSafe(String loginType, String tokenValue, String service) {
+//    }
+//
+//    /**
+//     * 每次创建Session时触发
+//     */
+//    @Override
+//    public void doCreateSession(String id) {
+//    }
+//
+//    /**
+//     * 每次注销Session时触发
+//     */
+//    @Override
+//    public void doLogoutSession(String id) {
+//    }
+//
+//    /**
+//     * 每次Token续期时触发
+//     */
+//    @Override
+//    public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
+//    }
+//}

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

@@ -7,6 +7,7 @@ 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;
@@ -47,6 +48,7 @@ public class AppRegisterService {
         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("该手机号已被注册");
@@ -67,7 +69,7 @@ public class AppRegisterService {
         appUser.setNickName(username);
         appUser.setPhonenumber(phoneNumber);
         appUser.setPassword(password);
-        appUser.setUserType("app_user");
+        appUser.setUserType(UserType.APP_USER.getUserType());
         appUser.setTenantId(tenantId);
         appUser.setLoginIp(ServletUtils.getClientIP());
         appUser.setStatus("0");

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

@@ -0,0 +1,252 @@
+package com.fuyuanshen.web.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.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.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+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.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+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;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class DeviceShareService {
+
+    private final AppDeviceShareMapper appDeviceShareMapper;
+
+    private final DeviceMapper deviceMapper;
+
+    private final DeviceTypeMapper deviceTypeMapper;
+
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+
+    public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Long userId = AppLoginHelper.getUserId();
+        bo.setCreateBy(userId);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectAppDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+    private static void buildDeviceStatus(AppDeviceShareVo item) {
+        // 设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(onlineStatus)) {
+
+            item.setOnlineStatus(1);
+        } else {
+            item.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if (StringUtils.isNotBlank(deviceStatus)) {
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            item.setBattery(jsonObject.getString("batteryPercentage"));
+        } else {
+            item.setBattery("0");
+        }
+
+        String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX);
+        if (StringUtils.isNotBlank(location)) {
+            JSONObject jsonObject = JSONObject.parseObject(location);
+            item.setLatitude(jsonObject.getString("latitude"));
+            item.setLongitude(jsonObject.getString("longitude"));
+        }
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX);
+        if (StringUtils.isNotBlank(alarmStatus)) {
+            item.setAlarmStatus(alarmStatus);
+        }
+    }
+
+    public AppDeviceShareDetailVo getInfo(Long id) {
+
+        LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppDeviceShare::getId, 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));
+        }
+        // 设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(onlineStatus)) {
+            shareDetailVo.setOnlineStatus(1);
+        } else {
+            shareDetailVo.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if (StringUtils.isNotBlank(deviceStatus)) {
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            shareDetailVo.setMainLightMode(jsonObject.getString("mainLightMode"));
+            shareDetailVo.setLaserLightMode(jsonObject.getString("laserLightMode"));
+            shareDetailVo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
+            shareDetailVo.setChargeState(jsonObject.getString("chargeState"));
+            shareDetailVo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
+        } else {
+            shareDetailVo.setBatteryPercentage("0");
+        }
+
+        // 获取经度纬度
+        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+        String locationInfo = RedisUtils.getCacheObject(locationKey);
+        if (StringUtils.isNotBlank(locationInfo)) {
+            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
+            shareDetailVo.setLongitude(jsonObject.get("longitude").toString());
+            shareDetailVo.setLatitude(jsonObject.get("latitude").toString());
+            shareDetailVo.setAddress((String) jsonObject.get("address"));
+        }
+
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX);
+        if (StringUtils.isNotBlank(alarmStatus)) {
+            shareDetailVo.setAlarmStatus(alarmStatus);
+        }
+
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(lightBrightness)) {
+            shareDetailVo.setLightBrightness(lightBrightness);
+        }
+
+        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));
+    }
+
+    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 = appDeviceShareMapper.otherDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+
+    /**
+     * 查询设备分享列表(web)
+     *
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    public TableDataInfo<AppDeviceShareVo> queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+}

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

@@ -0,0 +1,68 @@
+package com.fuyuanshen.web.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+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.DeviceLog;
+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 com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
+
+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);
+
+    /**
+     * WEB端设备详情
+     *
+     * @param id
+     * @return
+     */
+    WebDeviceVo getDevice(Long id);
+
+    /**
+     * 设备用户详情
+     *
+     * @param id
+     * @return
+     */
+    List<AppPersonnelInfoRecords> getDeviceUser(Long id);
+
+    /**
+     * 设备操作记录
+     *
+     * @param deviceId
+     * @return
+     */
+    List<DeviceLog> getOperationRecord(Long deviceId);
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @return
+     */
+    List<DeviceAlarmVo> getAlarmRecord(Long deviceId);
+}

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

@@ -0,0 +1,543 @@
+package com.fuyuanshen.web.service.device;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.*;
+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.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.LightModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+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.Bitmap80x12Generator.buildArr;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceBJQBizService {
+
+    private final DeviceMapper deviceMapper;
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final AppPersonnelInfoRecordsMapper appPersonnelInfoRecordsMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final MqttGateway mqttGateway;
+    private final DeviceLogMapper deviceLogMapper;
+
+    public int sendMessage(AppDeviceSendMsgBo bo) {
+        List<Long> deviceIds = bo.getDeviceIds();
+        if (deviceIds == null || deviceIds.isEmpty()) {
+            throw new ServiceException("请选择设备");
+        }
+        for (Long deviceId : deviceIds) {
+            Device device = deviceMapper.selectById(deviceId);
+            if (device == null) {
+                throw new ServiceException("设备不存在" + deviceId);
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            try {
+                ClassPathResource resource = new ClassPathResource("image/background.png");
+                InputStream inputStream = resource.getInputStream();
+
+                byte[] largeData = ImageWithTextGenerate.generate160x80ImageWithText2(bo.getSendMsg(), inputStream, 25600);
+                int[] ints = convertHexToDecimal(largeData);
+                RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + ":app_send_message_data" , Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+                String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + ":app_send_message_data");
+
+                byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+                byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
+                log.info("发送信息第0块数据大小: {} 字节",specificChunk.length);
+
+                ArrayList<Integer> intData = new ArrayList<>();
+                intData.add(6);
+                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));
+
+                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", deviceId)
+                        .eq("binding_user_id", AppLoginHelper.getUserId())
+                        .set("send_msg", bo.getSendMsg());
+                deviceMapper.update(updateWrapper);
+
+                recordDeviceLog(deviceId, device.getDeviceName(), "发送信息", bo.getSendMsg(), AppLoginHelper.getUserId());
+            } catch (Exception e) {
+                log.info("发送信息设备发送信息失败:{}" ,deviceId);
+                throw new ServiceException("发送指令失败");
+            }
+
+        }
+
+
+        return 1;
+    }
+
+    /**
+     * 记录设备操作日志
+     * @param deviceId 设备ID
+     * @param content 日志内容
+     * @param operator 操作人
+     */
+    private void recordDeviceLog(Long deviceId,String deviceName, String deviceAction, String content, Long operator) {
+        try {
+            // 创建设备日志实体
+            com.fuyuanshen.equipment.domain.DeviceLog deviceLog = new com.fuyuanshen.equipment.domain.DeviceLog();
+            deviceLog.setDeviceId(deviceId);
+            deviceLog.setDeviceAction(deviceAction);
+            deviceLog.setContent(content);
+            deviceLog.setCreateBy(operator);
+            deviceLog.setDeviceName(deviceName);
+            deviceLog.setCreateTime(new Date());
+
+            // 插入日志记录
+            deviceLogMapper.insert(deviceLog);
+        } catch (Exception e) {
+            log.error("记录设备操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+
+    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);
+        }
+        //设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(onlineStatus)){
+            vo.setOnlineStatus(1);
+        }else{
+            vo.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if(StringUtils.isNotBlank(deviceStatus)){
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            vo.setMainLightMode(jsonObject.getString("mainLightMode"));
+            vo.setLaserLightMode(jsonObject.getString("laserLightMode"));
+            vo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
+            vo.setChargeState(jsonObject.getString("chargeState"));
+            vo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
+        }else{
+            vo.setBatteryPercentage("0");
+        }
+
+        String lightModeStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LIGHT_MODE_KEY_PREFIX);
+        // 获取电量
+        if(StringUtils.isNotBlank(deviceStatus)){
+            vo.setMainLightMode(lightModeStatus);
+        }
+
+        String lightBrightnessStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(lightBrightnessStatus)){
+            vo.setLightBrightness(lightBrightnessStatus);
+        }
+
+        String laserLightMode = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LASER_MODE_KEY_PREFIX);
+        if(StringUtils.isNotBlank(laserLightMode)){
+            vo.setLaserLightMode(laserLightMode);
+        }
+
+        // 获取经度纬度
+        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+        String locationInfo = RedisUtils.getCacheObject(locationKey);
+        if(StringUtils.isNotBlank(locationInfo)){
+            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
+            vo.setLongitude(jsonObject.get("longitude").toString());
+            vo.setLatitude(jsonObject.get("latitude").toString());
+            vo.setAddress((String)jsonObject.get("address"));
+        }
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+        if(StringUtils.isNotBlank(alarmStatus)){
+            vo.setAlarmStatus(alarmStatus);
+        }
+
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(lightBrightness)){
+            vo.setLightBrightness(lightBrightness);
+        }
+
+        return vo;
+    }
+
+
+
+    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
+        Long deviceId = bo.getDeviceId();
+        Device deviceObj = deviceMapper.selectById(deviceId);
+        if (deviceObj == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        if(getDeviceStatus(deviceObj.getDeviceImei())){
+            throw new ServiceException(deviceObj.getDeviceName()+",设备已断开连接");
+        }
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", deviceId);
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+//        unitName,position,name,id
+        byte[] unitName = generateFixedBitmapData(bo.getUnitName(), 120);
+        byte[] position = generateFixedBitmapData(bo.getPosition(), 120);
+        byte[] name = generateFixedBitmapData(bo.getName(), 120);
+        byte[] id = generateFixedBitmapData(bo.getCode(), 120);
+        ArrayList<Integer> intData = new ArrayList<>();
+        intData.add(2);
+        buildArr(convertHexToDecimal(unitName), intData);
+        buildArr(convertHexToDecimal(position), intData);
+        buildArr(convertHexToDecimal(name), intData);
+        buildArr(convertHexToDecimal(id), 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 + deviceObj.getDeviceImei(), 1, JSON.toJSONString(map));
+        log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
+        String logContent = "单位："+bo.getUnitName()+",职位："+bo.getPosition()+",姓名："+bo.getName()+",ID："+bo.getCode();
+        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", logContent, AppLoginHelper.getUserId());
+        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+
+            AppPersonnelInfoRecords appPersonnelInfoRecords = new AppPersonnelInfoRecords();
+            BeanUtil.copyProperties(appPersonnelInfo, appPersonnelInfoRecords);
+            appPersonnelInfoRecords.setId(null);
+            appPersonnelInfoRecords.setPersonnelId(appPersonnelInfo.getId());
+
+            appPersonnelInfoRecordsMapper.insert(appPersonnelInfoRecords);
+        } 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());
+            appPersonnelInfoMapper.update(null, uw);
+
+            AppPersonnelInfoVo personnelInfoVo = appPersonnelInfoVos.get(0);
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            AppPersonnelInfoRecords appPersonnelInfoRecords = new AppPersonnelInfoRecords();
+            BeanUtil.copyProperties(appPersonnelInfo, appPersonnelInfoRecords);
+            appPersonnelInfoRecords.setId(null);
+            appPersonnelInfoRecords.setPersonnelId(personnelInfoVo.getId());
+            appPersonnelInfoRecordsMapper.insert(appPersonnelInfoRecords);
+        }
+        return true;
+    }
+    public void uploadDeviceLogo2(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);
+
+            log.info("长度：" + largeData.length);
+            // 在获取 largeData 后，将其与前缀合并
+            byte[] prefix = new byte[]{0x50, 0x49, 0x43, 0x54, 0x55, 0x52, 0x45}; // "PICTURE"
+            byte[] combinedData = new byte[prefix.length + largeData.length];
+            System.arraycopy(prefix, 0, combinedData, 0, prefix.length);
+            System.arraycopy(largeData, 0, combinedData, prefix.length, largeData.length);
+
+            // 将 combinedData 转换为十六进制表示
+            String[] hexArray = new String[combinedData.length];
+            for (int i = 0; i < combinedData.length; i++) {
+                hexArray[i] = String.format("0x%02X", combinedData[i]);
+            }
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("instruct", combinedData);
+            String[] specificChunk = ImageToCArrayConverter.getChunk2(hexArray, 0, bo.getChunkSize());
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , Arrays.toString(specificChunk));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),Arrays.toString(specificChunk));
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+            log.info("长度：" + largeData.length);
+
+            log.info("原始数据大小: {} 字节", largeData.length);
+
+            int[] ints = convertHexToDecimal(largeData);
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX, Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()  + DEVICE_BOOT_LOGO_KEY_PREFIX);
+
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, 0, 512);
+            log.info("第0块数据大小: {} 字节", specificChunk.length);
+//            log.info("第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));
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    /**
+     * 灯光模式
+     * 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("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            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));
+            LightModeEnum modeEnum = LightModeEnum.getByCode(instructValue);
+            recordDeviceLog(device.getId(), device.getDeviceName(), "灯光模式", modeEnum!=null?modeEnum.getName():null, AppLoginHelper.getUserId());
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    //灯光亮度设置
+    public void lightBrightnessSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId = params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            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();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    //激光模式设置
+    public void laserModeSettings(DeviceInstructDto params) {
+        try {
+            Long deviceId =  params.getDeviceId();
+            Device device = deviceMapper.selectById(deviceId);
+            if(device == null){
+                throw new ServiceException("设备不存在");
+            }
+            if(getDeviceStatus(device.getDeviceImei())){
+                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+            }
+            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));
+            // 1代表开启激光灯，此时主灯关闭，主灯控件为关机状态，为0代表关闭激光灯
+            if("1".equals(params.getInstructValue())){
+                recordDeviceLog(device.getId(), device.getDeviceName(), "激光模式设置", "开启激光灯", AppLoginHelper.getUserId());
+            }else{
+                recordDeviceLog(device.getId(), device.getDeviceName(), "激光模式设置", "关闭激光灯", AppLoginHelper.getUserId());
+            }
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    public String mapReverseGeocoding(DeviceInstructDto params) {
+        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());
+    }
+
+    public int sendAlarmMessage(AppDeviceSendMsgBo bo) {
+        try {
+            List<Long> deviceIds = bo.getDeviceIds();
+            if (deviceIds == null || deviceIds.isEmpty()) {
+                throw new ServiceException("请选择设备");
+            }
+
+            for (Long deviceId : deviceIds) {
+                Device device = deviceMapper.selectById(deviceId);
+                if (device == null) {
+                    throw new ServiceException("设备不存在" + deviceId);
+                }
+                if(getDeviceStatus(device.getDeviceImei())){
+                    throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+                }
+                try {
+
+                    ArrayList<Integer> intData = new ArrayList<>();
+                    intData.add(7);
+                    intData.add(Integer.parseInt(bo.getInstructValue()));
+                    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));
+
+                    UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("id", deviceId)
+                            .eq("binding_user_id", AppLoginHelper.getUserId())
+                            .set("send_msg", bo.getSendMsg());
+                    deviceMapper.update(updateWrapper);
+                    recordDeviceLog(device.getId(), device.getDeviceName(), "发送告警信息", bo.getSendMsg(), AppLoginHelper.getUserId());
+                } catch (Exception e) {
+                    log.info("设备发送告警信息信息失败:{}" ,deviceId);
+                    throw new ServiceException("设备发送告警信息信息失败");
+                }
+
+            }
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送告警信息指令失败");
+        }
+        return 1;
+    }
+
+    private boolean getDeviceStatus(String deviceImei) {
+        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+        return StringUtils.isBlank(deviceOnlineStatusRedisKey);
+    }
+}

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

@@ -0,0 +1,396 @@
+package com.fuyuanshen.web.service.device;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+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.AppDeviceShare;
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.app.domain.vo.AppUserVo;
+import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
+import com.fuyuanshen.common.core.exception.ServiceException;
+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.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.*;
+import com.fuyuanshen.equipment.enums.BindingStatusEnum;
+import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
+import com.fuyuanshen.web.service.device.status.base.RealTimeStatusEngine;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.*;
+import java.util.*;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceBizService {
+
+    private final APPDeviceMapper appDeviceMapper;
+    private final DeviceMapper deviceMapper;
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+    private final RealTimeStatusEngine realTimeStatusEngine;
+    private final DeviceLogMapper deviceLogMapper;
+    private final AppDeviceShareMapper appDeviceShareMapper;
+    private final AppUserMapper appUserMapper;;
+
+
+
+    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 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);
+        List<AppDeviceVo> records = result.getRecords();
+        if(records != null && !records.isEmpty()){
+            records.forEach(item -> {
+                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+
+                    //设备在线状态
+                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(onlineStatus)){
+
+                        item.setOnlineStatus(1);
+                    }else{
+                        item.setOnlineStatus(0);
+                    }
+                    String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+                    // 获取电量
+                    if(StringUtils.isNotBlank(deviceStatus)){
+                        JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                        item.setBattery(jsonObject.getString("batteryPercentage"));
+                    }else{
+                        item.setBattery("0");
+                    }
+
+                    String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(location)){
+                        JSONObject jsonObject = JSONObject.parseObject(location);
+                        item.setLatitude(jsonObject.getString("latitude"));
+                        item.setLongitude(jsonObject.getString("longitude"));
+                    }
+
+                    String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(alarmStatus)){
+                        item.setAlarmStatus(alarmStatus);
+                    }
+                }
+            });
+        }
+        return TableDataInfo.build(result);
+    }
+
+    public TableDataInfo<WebDeviceVo> queryWebDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        Page<WebDeviceVo> result = deviceMapper.queryWebDeviceList(pageQuery.build(), bo);
+        List<WebDeviceVo> records = result.getRecords();
+        if(records != null && !records.isEmpty()){
+            records.forEach(item -> {
+                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+
+                    //设备在线状态
+                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(onlineStatus)){
+
+                        item.setOnlineStatus(1);
+                    }else{
+                        item.setOnlineStatus(0);
+                    }
+                    String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+                    // 获取电量
+                    if(StringUtils.isNotBlank(deviceStatus)){
+                        JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                        item.setBattery(jsonObject.getString("batteryPercentage"));
+                    }else{
+                        item.setBattery("0");
+                    }
+
+                    String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(location)){
+                        JSONObject jsonObject = JSONObject.parseObject(location);
+                        item.setLatitude(jsonObject.getString("latitude"));
+                        item.setLongitude(jsonObject.getString("longitude"));
+                    }
+
+                    String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(alarmStatus)){
+                        item.setAlarmStatus(alarmStatus);
+                    }
+                }
+            });
+        }
+        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("设备已绑定");
+            }
+
+            QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
+            bindRecordQueryWrapper.eq("device_id", device.getId());
+            AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
+            if (appDeviceBindRecord != null) {
+                UpdateWrapper<AppDeviceBindRecord> deviceUpdateWrapper = new UpdateWrapper<>();
+                deviceUpdateWrapper.eq("device_id", device.getId())
+                        .set("binding_status", BindingStatusEnum.BOUND.getCode())
+                        .set("binding_user_id", userId)
+                        .set("update_time", new Date())
+                        .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 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_user_id", null)
+                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
+                .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()));
+        }
+
+        AppUserVo appUserVo = appUserMapper.selectVoById(userId);
+        QueryWrapper<AppDeviceShare> appDeviceShareQueryWrapper = new QueryWrapper<>();
+        appDeviceShareQueryWrapper.eq("device_id", device.getId());
+        appDeviceShareQueryWrapper.eq("phonenumber", appUserVo.getPhonenumber());
+        List<AppDeviceShare> appDeviceShareList = appDeviceShareMapper.selectList(appDeviceShareQueryWrapper);
+        if (CollectionUtil.isNotEmpty(appDeviceShareList)) {
+            appDeviceShareList.forEach(appDeviceShare ->
+                    appDeviceShareMapper.deleteById(appDeviceShare.getId()));
+        }
+        return 1;
+    }
+
+    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());
+    }
+
+    public Map<String, Object> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        try {
+//            String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode();"FunctionAccessBatchStatusRule"
+            DeviceStatusRule rule  = realTimeStatusEngine.getDeviceStatusRule(statusDto.getTypeName());
+            if(rule == null){
+                throw new ServiceException("未匹配到处理命令");
+            }
+            return rule.getStatus(statusDto);
+        } catch (Exception e){
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public AppDeviceVo getDeviceInfo(String deviceMac) {
+//        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("device_mac", deviceMac);
+//        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        return deviceMapper.getDeviceInfo(deviceMac);
+    }
+
+    public TableDataInfo<InstructionRecordVo> getInstructionRecord(InstructionRecordDto bo, PageQuery pageQuery) {
+        Page<InstructionRecordVo> result = deviceLogMapper.getInstructionRecord(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    public TableDataInfo<LocationHistoryVo> getLocationHistory(InstructionRecordDto bo, PageQuery pageQuery) {
+        Page<LocationHistoryVo> result = deviceMapper.getLocationHistory(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    public List<LocationHistoryDetailVo> getLocationHistoryDetail(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device == null) {
+            throw new ServiceException("设备不存在");
+        }
+
+        // 计算七天前的凌晨时间戳
+        LocalDateTime sevenDaysAgo = LocalDateTime.of(LocalDate.now().minusDays(7), LocalTime.MIDNIGHT);
+        long startTime = sevenDaysAgo.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        // 计算今天的凌晨时间戳
+        LocalDateTime today = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+        long endTime = today.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        String deviceImei = device.getDeviceImei();
+        String a = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DEVICE_LOCATION_KEY_PREFIX + ":history";
+        Collection<String> list = RedisUtils.zRangeByScore(a, startTime, endTime);
+        if (CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+
+
+        Map<String, List<JSONObject>> map = new LinkedHashMap<>();
+        for (String obj : list){
+            JSONObject jsonObject = JSONObject.parseObject(obj);
+            Long timestamp = jsonObject.getLong("timestamp");
+            LocalDate date = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()).toLocalDate();
+            if (map.containsKey(date.toString())) {
+                map.get(date.toString()).add(jsonObject);
+            } else {
+                ArrayList<JSONObject> jsonList = new ArrayList<>();
+                jsonList.add(jsonObject);
+                map.put(date.toString(), jsonList);
+            }
+        }
+
+        List<LocationHistoryDetailVo> result = new ArrayList<>();
+        for (Map.Entry<String, List<JSONObject>> entry : map.entrySet()) {
+            LocationHistoryDetailVo detailVo = new LocationHistoryDetailVo();
+            detailVo.setDate(entry.getKey());
+            detailVo.setDeviceName(device.getDeviceName());
+            detailVo.setStartLocation(entry.getValue().get(0).getString("address"));
+            detailVo.setEndLocation(entry.getValue().get(entry.getValue().size()-1).getString("address"));
+            String jsonString = JSONArray.toJSONString(entry.getValue());
+            List<Object> strings = JSONArray.parseArray(jsonString);
+            detailVo.setDetailList(strings);
+            result.add(detailVo);
+        }
+
+
+        return result;
+    }
+
+}

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

@@ -0,0 +1,269 @@
+package com.fuyuanshen.web.service.device;
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+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.json.utils.JsonUtils;
+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.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.LightModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+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.Bitmap80x12Generator.buildArr;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_BOOT_LOGO_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceXinghanBizService {
+
+    private final DeviceMapper deviceMapper;
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final MqttGateway mqttGateway;
+    private final DeviceLogMapper deviceLogMapper;
+
+    /**
+     * 所有档位的描述表
+     * key   : 指令类型，如 "ins_DetectGrade"、"ins_LightGrade" ……
+     * value : Map<Integer,String>  值 -> 描述
+     */
+    private static final Map<String, Map<Integer, String>> GRADE_DESC = Map.of(
+            "ins_DetectGrade", Map.of(1, "低档", 2, "中档", 3, "高档"),
+            "ins_LightGrade",  Map.of(1, "强光", 2, "弱光"),
+            "ins_SOSGrade",  Map.of(1, "爆闪模式", 2, "红蓝模式"),
+            "ins_ShakeBit",  Map.of(0, "未静止报警", 1, "正在静止报警")
+            // 再加 4、5、6…… 档，直接往 Map 里塞即可
+    );
+
+    /**
+     * 根据指令类型和值，返回中文描述
+     */
+    private static String resolveGradeDesc(String type, int value) {
+        return GRADE_DESC.getOrDefault(type, Map.of())
+                .getOrDefault(value, "关闭");
+    }
+
+    /**
+     * 设置静电预警档位
+     */
+    public void upDetectGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_DetectGrade","静电预警档位");
+    }
+
+    /**
+     * 设置照明档位
+     */
+    public void upLightGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_LightGrade","照明档位");
+    }
+
+    /**
+     * 设置SOS档位
+     */
+    public void upSOSGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_SOSGrade","SOS档位");
+    }
+
+    /**
+     * 设置强制报警
+     */
+    public void upShakeBitSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_ShakeBit","强制报警");
+    }
+
+    /**
+     * 上传设备logo
+     */
+    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            if (isDeviceOffline(device.getDeviceImei())) {
+                throw new ServiceException("设备已断开连接：" + device.getDeviceName());
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+            log.info("长度：" + largeData.length);
+
+            log.info("原始数据大小: {} 字节", largeData.length);
+
+            int[] ints = convertHexToDecimal(largeData);
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX, Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+            Map<String, Object> payload = Map.of("ins_PicTrans",
+                    Collections.singletonList(0));
+            String topic = MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei();
+            String json = JsonUtils.toJsonString(payload);
+
+            try {
+                mqttGateway.sendMsgToMqtt(topic, 1, json);
+            } catch (Exception e) {
+                log.error("上传开机画面失败, topic={}, payload={}", topic, json, e);
+                throw new ServiceException("上传LOGO失败：" + e.getMessage());
+            }
+            log.info("发送上传开机画面到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),json);
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    /**
+     * 人员登记
+     * @param bo
+     */
+    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
+        Long deviceId = bo.getDeviceId();
+        Device deviceObj = deviceMapper.selectById(deviceId);
+        if (deviceObj == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        if (isDeviceOffline(deviceObj.getDeviceImei())) {
+            throw new ServiceException("设备已断开连接：" + deviceObj.getDeviceName());
+        }
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", deviceId);
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+
+        List<String> list = new ArrayList<>();
+        list.add(bo.getUnitName());
+        list.add(bo.getName());
+        list.add(bo.getPosition());
+        list.add(bo.getCode());
+        RedisUtils.setCacheList(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceObj.getDeviceImei() + ":app_send_message_data", list);
+
+        Map<String, Object> payload = Map.of("ins_TexTrans",
+                Collections.singletonList(0));
+        String topic = MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei();
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+        } catch (Exception e) {
+            log.error("人员信息登记失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("人员信息登记失败：" + e.getMessage());
+        }
+        log.info("发送人员信息登记到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
+
+        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", JSON.toJSONString(bo), AppLoginHelper.getUserId());
+        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;
+        }
+    }
+
+    /* ---------------------------------- 私有通用方法 ---------------------------------- */
+
+    private void sendCommand(DeviceInstructDto dto,
+                             String payloadKey,String deviceAction) {
+        long deviceId = dto.getDeviceId();
+        Device device = deviceMapper.selectById(deviceId);
+        if (device == null) {
+            throw new ServiceException("设备不存在");
+        }
+        if (isDeviceOffline(device.getDeviceImei())) {
+            throw new ServiceException("设备已断开连接：" + device.getDeviceName());
+        }
+
+        Integer value = Integer.parseInt(dto.getInstructValue());
+
+        Map<String, Object> payload = Map.of(payloadKey,
+                Collections.singletonList(value));
+
+        String topic = MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei();
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+        } catch (Exception e) {
+            log.error("发送指令失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("发送指令失败：" + e.getMessage());
+        }
+
+        log.info("发送指令成功 => topic:{}, payload:{}", topic, json);
+        String content = resolveGradeDesc("ins_DetectGrade", value);
+        recordDeviceLog(device.getId(),
+                device.getDeviceName(),
+                deviceAction,
+                content,
+                AppLoginHelper.getUserId());
+    }
+
+    private boolean isDeviceOffline(String imei) {
+        // 原方法名语义相反，这里取反，使含义更清晰
+        return getDeviceStatus(imei);
+    }
+
+    /**
+     * 记录设备操作日志
+     * @param deviceId 设备ID
+     * @param content 日志内容
+     * @param operator 操作人
+     */
+    private void recordDeviceLog(Long deviceId,String deviceName, String deviceAction, String content, Long operator) {
+        try {
+            // 创建设备日志实体
+            com.fuyuanshen.equipment.domain.DeviceLog deviceLog = new com.fuyuanshen.equipment.domain.DeviceLog();
+            deviceLog.setDeviceId(deviceId);
+            deviceLog.setDeviceAction(deviceAction);
+            deviceLog.setContent(content);
+            deviceLog.setCreateBy(operator);
+            deviceLog.setDeviceName(deviceName);
+            deviceLog.setCreateTime(new Date());
+
+            // 插入日志记录
+            deviceLogMapper.insert(deviceLog);
+        } catch (Exception e) {
+            log.error("记录设备操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+    private boolean getDeviceStatus(String deviceImei) {
+        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+        return StringUtils.isBlank(deviceOnlineStatusRedisKey);
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessBatchStatusRule.java

@@ -0,0 +1,75 @@
+package com.fuyuanshen.web.service.device.status;
+
+import cn.hutool.json.JSONUtil;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
+import com.fuyuanshen.web.service.device.status.constants.DeviceTypeConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+
+
+@Slf4j
+@Component
+public class FunctionAccessBatchStatusRule implements DeviceStatusRule {
+    @Override
+    public String getCommandType() {
+        return "FunctionAccessBatchStatusRule";
+    }
+
+    @Override
+    public boolean supports(String deviceType) {
+        return true; // 适用于所有设备类型
+    }
+
+    @Override
+    public Map<String, Object> getStatus(AppRealTimeStatusDto dto) {
+        Map<String, Object> status = new HashMap<>();
+        String functionAccess = RedisUtils.getCacheObject(
+                FUNCTION_ACCESS_KEY + dto.getBatchId());
+        log.info("FunctionAccessBatchStatusRule:{}",functionAccess);
+        if(StringUtils.isBlank(functionAccess)){
+            status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            return status;
+        }
+        List<String> cachedDeviceImeiList = JSONUtil.toList(functionAccess, String.class);
+        if(cachedDeviceImeiList.isEmpty()){
+            status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            return status;
+        }
+        for (String key : cachedDeviceImeiList) {
+            String item = RedisUtils.getCacheObject(FUNCTION_ACCESS_KEY + key);
+            if("ACTIVE".equals(item)){
+                status.put("functionAccess", FunctionAccessStatus.ACTIVE.getCode());
+                break;
+            }else {
+                status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            }
+//            if (StringUtils.isBlank(item)) {
+//                String timeOut = RedisUtils.getCacheObject(FUNCTION_ACCESS_TIMEOUT_KEY + dto.getDeviceImei());
+//                if ("TIMEOUT".equals(timeOut)) {
+//                    status.put("functionAccess", FunctionAccessStatus.TIMEOUT.getCode());
+//                    break;
+//                } else {
+//                    status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+//                }
+//            } else {
+//                if (!FunctionAccessStatus.OK.getCode().equals(item)) {
+//                    status.put("functionAccess", FunctionAccessStatus.FAILED.getCode());
+//                    break;
+//                } else {
+//                    status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+//                }
+//            }
+        }
+        return status;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessStatusRule.java

@@ -0,0 +1,51 @@
+package com.fuyuanshen.web.service.device.status;
+
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
+import com.fuyuanshen.web.service.device.status.constants.DeviceTypeConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+
+// 上传开机图片
+@Slf4j
+@Component
+public class FunctionAccessStatusRule implements DeviceStatusRule {
+    @Override
+    public String getCommandType() {
+        return "FunctionAccessStatusRule";
+    }
+
+    @Override
+    public boolean supports(String deviceType) {
+        return true; // 适用于所有设备类型
+    }
+    
+    @Override
+    public Map<String, Object> getStatus(AppRealTimeStatusDto dto) {
+        Map<String, Object> status = new HashMap<>();
+        String functionAccess = RedisUtils.getCacheObject(
+                FUNCTION_ACCESS_KEY + dto.getDeviceImei());
+        log.info("FunctionAccessStatusRule:{}",functionAccess);
+        if(StringUtils.isBlank(functionAccess)){
+            String timeOut = RedisUtils.getCacheObject(FUNCTION_ACCESS_TIMEOUT_KEY + dto.getDeviceImei());
+            if("TIMEOUT".equals(timeOut)){
+                status.put("functionAccess", FunctionAccessStatus.TIMEOUT.getCode());
+                RedisUtils.deleteObject(FUNCTION_ACCESS_TIMEOUT_KEY + dto.getDeviceImei());
+            }else{
+                status.put("functionAccess", FunctionAccessStatus.OK.getCode());
+            }
+        }else{
+            status.put("functionAccess", functionAccess);
+        }
+        return status;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/base/DeviceStatusRule.java

@@ -0,0 +1,19 @@
+package com.fuyuanshen.web.service.device.status.base;
+
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+
+import java.util.Map;
+
+// 规则接口
+public interface DeviceStatusRule {
+
+    /**
+     * 获取命令类型
+     * @return 命令类型
+     */
+    String getCommandType();
+
+    boolean supports(String deviceType);
+
+    Map<String, Object> getStatus(AppRealTimeStatusDto statusDto);
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/base/RealTimeStatusEngine.java

@@ -0,0 +1,23 @@
+package com.fuyuanshen.web.service.device.status.base;
+
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+
+
+@Component
+public class RealTimeStatusEngine {
+    
+
+    private final LinkedHashMap<String, DeviceStatusRule> rulesMap = new LinkedHashMap<>();
+    public RealTimeStatusEngine(List<DeviceStatusRule> rules) {
+        rules.forEach(rule -> rulesMap.put(rule.getCommandType(), rule)
+        );
+    }
+
+
+    public DeviceStatusRule getDeviceStatusRule(String commandType) {
+        return rulesMap.get(commandType);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/constants/DeviceTypeConstants.java

@@ -0,0 +1,6 @@
+package com.fuyuanshen.web.service.device.status.constants;
+
+public class DeviceTypeConstants {
+    public static final String TYPE_BJQ6170 = "BJQ6170";
+
+}

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

@@ -14,6 +14,7 @@ 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;
@@ -108,7 +109,9 @@ public class AppPasswordAuthStrategy implements IAuthStrategy {
     }
 
     private AppUserVo loadUserByUsername(String username) {
-        AppUserVo user = appUserMapper.selectVoOne(new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserName, 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);

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,156 @@
+package com.fuyuanshen.web.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.app.domain.AppDeviceShare;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceAlarm;
+import com.fuyuanshen.equipment.domain.DeviceAssignments;
+import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
+import com.fuyuanshen.equipment.enums.BindingStatusEnum;
+import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper;
+import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.web.service.WEBDeviceService;
+import com.fuyuanshen.web.service.device.DeviceBizService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements WEBDeviceService {
+
+    private final DeviceAssignmentsMapper deviceAssignmentsMapper;
+
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+    private final AppPersonnelInfoRecordsMapper infoRecordsMapper;
+    private final DeviceLogMapper deviceLogMapper;
+    private final DeviceAlarmMapper deviceAlarmMapper;
+
+    private final DeviceMapper deviceMapper;
+    private final AppDeviceShareMapper appDeviceShareMapper;
+
+
+    /**
+     * WEB端解绑设备
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    @Transactional
+    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;
+        }
+
+        QueryWrapper<AppDeviceBindRecord> deviceId = new QueryWrapper<AppDeviceBindRecord>().eq("device_id", id);
+
+        // appDeviceService.unBindDevice(id, userId, type);
+        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+        deviceUpdateWrapper.eq("id", id)
+                .set("binding_user_id", null)
+                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
+                .set("binding_time", null);
+        deviceMapper.update(null, deviceUpdateWrapper);
+
+        return appDeviceBindRecordMapper.delete(deviceId);
+    }
+
+
+    /**
+     * WEB端设备详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public WebDeviceVo getDevice(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device != null) {
+            WebDeviceVo webDeviceVo = new WebDeviceVo();
+            BeanUtil.copyProperties(device, webDeviceVo);
+            // 查询分享用户数
+            Long count = appDeviceShareMapper.selectCount(new QueryWrapper<AppDeviceShare>().eq("device_id", id));
+            webDeviceVo.setShareUsersNumber(Math.toIntExact(count));
+            return webDeviceVo;
+        }
+        return null;
+    }
+
+
+    /**
+     * 设备用户详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public List<AppPersonnelInfoRecords> getDeviceUser(Long id) {
+        List<AppPersonnelInfoRecords> appPersonnelInfoRecords = infoRecordsMapper.selectList(
+                new QueryWrapper<AppPersonnelInfoRecords>().eq("device_id", id)
+                        .orderByDesc("create_time"));
+        return appPersonnelInfoRecords;
+    }
+
+
+    /**
+     * 设备操作记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public List<DeviceLog> getOperationRecord(Long deviceId) {
+        List<DeviceLog> logList = deviceLogMapper.selectList(
+                new QueryWrapper<DeviceLog>().eq("device_id", deviceId)
+                        .orderByDesc("create_time"));
+        return logList;
+    }
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public List<DeviceAlarmVo> getAlarmRecord(Long deviceId) {
+        List<DeviceAlarm> alarmList = deviceAlarmMapper.selectList(
+                new QueryWrapper<DeviceAlarm>().eq("device_id", deviceId)
+                        .orderByDesc("create_time"));
+        List<DeviceAlarmVo> deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class);
+        return deviceAlarmVoList;
+    }
+
+
+}

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

@@ -8,8 +8,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}
 
 --- # snail-job 配置
 snail-job:
@@ -174,14 +174,14 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: LTAI5tJdDNpZootsPQ5hdELx
+      access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt
+      access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh
         #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
-      template-id: SMS_322180518
+      template-id: SMS_324526343
         #模板变量 上述模板的变量
       templateName: code
-      signature:  湖北星汉研创科技
+      signature:  深圳市富源晟科技
 #      sdk-app-id: 您的sdkAppId
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
@@ -303,6 +303,6 @@ mqtt:
   password: fys123456
   url: tcp://47.107.152.87:1883
   subClientId: fys_subClient
-  subTopic: worker/alert/#,worker/location/#
-  pubTopic: worker/location
+  subTopic: 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`表
@@ -52,7 +52,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost: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://47.107.152.87:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
           password: Jz_5623_cl1
 #        # 从库数据源
@@ -101,7 +101,7 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: localhost
+    host: 47.107.152.87
     # 端口，默认为6379
     port: 6379
     # 数据库索引
@@ -177,11 +177,14 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: 您的accessKey
+      access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: 您的accessKeySecret
-      signature: 您的短信签名
-      sdk-app-id: 您的sdkAppId
+      access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh
+      #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
+      template-id: SMS_324526343
+      #模板变量 上述模板的变量
+      templateName: code
+      signature:  深圳市富源晟科技
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: tencent
@@ -277,12 +280,13 @@ 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
+  enabled: false
 
 
 # 文件存储路径

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

@@ -35,7 +35,8 @@ captcha:
 # 日志配置
 logging:
   level:
-    com.fuyuanshen: @logging.level@
+    #com.fuyuanshen: @logging.level@
+    com.fuyuanshen: ${logging.level}
     org.springframework: warn
     org.mybatis.spring.mapper: error
     org.apache.fury: warn
@@ -63,7 +64,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: @profiles.active@
+    active: ${profiles.active}
   # 文件上传
   servlet:
     multipart:
@@ -218,6 +219,8 @@ springdoc:
       packages-to-scan: com.fuyuanshen.customer
     - group: APP模块
       packages-to-scan: com.fuyuanshen.app
+    - group: 设备分组
+      packages-to-scan: com.fuyuanshen.web.controller.device
 
 # 防止XSS攻击
 xss:
@@ -231,7 +234,7 @@ xss:
 # 如使用JDK21请直接使用虚拟线程 不要开启此配置
 thread-pool:
   # 是否开启线程池
-  enabled: false
+  enabled: true
   # 队列最大长度
   queueCapacity: 128
   # 线程池维护线程所允许的空闲时间
@@ -254,7 +257,7 @@ management:
     health:
       show-details: ALWAYS
     logfile:
-      external-file: ./logs/sys-console.log
+      external-file: ./logs/sys-admin-console.log
 
 --- # 默认/推荐使用sse推送
 sse:

fys-admin/src/main/resources/logback-plus.xml

@@ -15,13 +15,13 @@
 
     <!-- 控制台输出 -->
     <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/sys-console.log</file>
-        <!-- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> -->
-        <!--     &lt;!&ndash; 日志文件名格式 &ndash;&gt; -->
-        <!--     <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern> -->
-        <!--     &lt;!&ndash; 日志最大 1天 &ndash;&gt; -->
-        <!--     <maxHistory>1</maxHistory> -->
-        <!-- </rollingPolicy> -->
+        <file>${log.path}/sys-admin-console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-admin-console.log.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 1天 -->
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
             <charset>utf-8</charset>

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

@@ -17,6 +17,11 @@ 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
      */
@@ -36,4 +41,9 @@ public interface GlobalConstants {
      * 三方认证 redis key
      */
     String SOCIAL_AUTH_CODE_KEY = GLOBAL_REDIS_KEY + "social_auth_codes:";
+
+
+    String  FUNCTION_ACCESS_KEY =  GLOBAL_REDIS_KEY + "device:function_access:";
+
+    String  FUNCTION_ACCESS_TIMEOUT_KEY =  GLOBAL_REDIS_KEY + "device:function_access_timeout:";
 }

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、权限识别等）