设备协议

Reviewed-on: dyf/fys-Multi-tenant#18

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>
+        <!--<dependency>
             <groupId>com.fuyuanshen</groupId>
             <artifactId>fys-demo</artifactId>
-        </dependency>
+        </dependency>-->
 
         <!--  工作流模块  -->
         <dependency>
@@ -123,6 +123,17 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv-platform</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv</artifactId>
+            <version>1.5.7</version>
+            <scope>compile</scope>
+        </dependency>
+
         <!-- skywalking 整合 logback -->
 <!--        <dependency>-->
 <!--            <groupId>org.apache.skywalking</groupId>-->

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

@@ -3,6 +3,7 @@ package com.fuyuanshen;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 启动程序
@@ -10,6 +11,7 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
  * @author Lion Li
  */
 @SpringBootApplication
+@EnableScheduling
 public class DromaraApplication {
 
     public static void main(String[] args) {

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

@@ -4,28 +4,43 @@ 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 cn.hutool.core.util.RandomUtil;
+import com.alibaba.fastjson.JSON;
+import com.fuyuanshen.app.model.AppRegisterBody;
+import com.fuyuanshen.app.model.AppSmsLoginBody;
 import com.fuyuanshen.app.service.AppLoginService;
+import com.fuyuanshen.app.service.AppRegisterService;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.constant.SystemConstants;
 import com.fuyuanshen.common.core.domain.R;
-import com.fuyuanshen.common.core.domain.model.AppLoginBody;
-import com.fuyuanshen.common.core.domain.model.AppSmsRegisterBody;
-import com.fuyuanshen.common.core.domain.model.PasswordLoginBody;
+import com.fuyuanshen.common.core.domain.model.AppPasswordLoginBody;
+import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.domain.model.SmsLoginBody;
+import com.fuyuanshen.common.core.enums.LoginType;
 import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.encrypt.annotation.ApiEncrypt;
 import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.tenant.helper.TenantHelper;
 import com.fuyuanshen.system.domain.bo.SysTenantBo;
 import com.fuyuanshen.system.domain.vo.SysClientVo;
+import com.fuyuanshen.system.domain.vo.SysDictDataVo;
 import com.fuyuanshen.system.domain.vo.SysTenantVo;
 import com.fuyuanshen.system.service.ISysClientService;
 import com.fuyuanshen.system.service.ISysConfigService;
+import com.fuyuanshen.system.service.ISysDictTypeService;
 import com.fuyuanshen.system.service.ISysTenantService;
+import com.fuyuanshen.web.domain.Dto.SystemVersionDto;
 import com.fuyuanshen.web.domain.vo.LoginTenantVo;
 import com.fuyuanshen.web.domain.vo.LoginVo;
 import com.fuyuanshen.web.domain.vo.TenantListVo;
-import com.fuyuanshen.web.service.AppRegisterService;
 import com.fuyuanshen.web.service.IAuthStrategy;
+import com.fuyuanshen.web.service.SysRegisterService;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotBlank;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.SmsBlend;
@@ -35,8 +50,14 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.net.URL;
+import java.time.Duration;
+import java.util.LinkedHashMap;
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.fuyuanshen.common.core.constant.GlobalConstants.DEVICE_SHARE_CODES_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+
 /**
  * APP认证
  *
@@ -54,6 +75,7 @@ public class AppAuthController {
     private final ISysConfigService configService;
     private final ISysTenantService tenantService;
     private final ISysClientService clientService;
+    private final ISysDictTypeService dictTypeService;
 
 
     /**
@@ -63,18 +85,36 @@ public class AppAuthController {
      */
 //    @ApiEncrypt
     @PostMapping("/login")
-    public R<LoginVo> login(@RequestBody AppLoginBody appLoginBody) {
+    public R<LoginVo> login(@RequestBody AppSmsLoginBody appSmsLoginBody) {
 //        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
-        ValidatorUtils.validate(appLoginBody);
-        PasswordLoginBody loginBody = new PasswordLoginBody();
-        loginBody.setUsername(appLoginBody.getUserName());
-        loginBody.setPassword(appLoginBody.getPassword());
-        loginBody.setTenantId(appLoginBody.getTenantId());
-        loginBody.setClientId("835b15335d389c9fcfdf99421fa8019b");
-        loginBody.setGrantType("appPassword");
+        String loginType = appSmsLoginBody.getLoginType();
+        String body = "";
         // 授权类型和客户端id
-        String clientId = loginBody.getClientId();
-        String grantType = loginBody.getGrantType();
+        String clientId = "";
+        String grantType = "";
+        String tenantId = appSmsLoginBody.getTenantId();
+        ValidatorUtils.validate(appSmsLoginBody);
+        if("2".equals(loginType)){
+            AppPasswordLoginBody loginBody = new AppPasswordLoginBody();
+            loginBody.setUsername(appSmsLoginBody.getPhonenumber());
+            loginBody.setPassword(appSmsLoginBody.getLoginPassword());
+            loginBody.setClientId("835b15335d389c9fcfdf99421fa8019b");
+            loginBody.setGrantType("appPassword");
+            clientId = loginBody.getClientId();
+            grantType = loginBody.getGrantType();
+            body = JsonUtils.toJsonString(loginBody);
+        }else{
+            SmsLoginBody loginBody = new SmsLoginBody();
+            loginBody.setPhonenumber(appSmsLoginBody.getPhonenumber());
+            loginBody.setSmsCode(appSmsLoginBody.getSmsCode());
+            loginBody.setTenantId(appSmsLoginBody.getTenantId());
+            loginBody.setClientId("ca839698e245d60aa2f0e59bd52b34f8");
+            loginBody.setGrantType("appSms");
+            clientId = loginBody.getClientId();
+            grantType = loginBody.getGrantType();
+            body = JsonUtils.toJsonString(loginBody);
+        }
+
         SysClientVo client = clientService.queryByClientId(clientId);
         // 查询不到 client 或 client 内不包含 grantType
         if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
@@ -84,31 +124,85 @@ public class AppAuthController {
             return R.fail(MessageUtils.message("auth.grant.type.blocked"));
         }
         // 校验租户
-        loginService.checkTenant(loginBody.getTenantId());
+//        loginService.checkTenant(loginBody.getTenantId());
+        loginService.checkTenant(tenantId);
         // 登录
-        String body = JsonUtils.toJsonString(loginBody);
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
         return R.ok(loginVo);
     }
 
 
-
-
     /**
-     * 退出登录
+     * 用户注销
      */
-    @PostMapping("/logout")
-    public R<Void> logout() {
-//        loginService.logout();
-        return R.ok("退出成功");
+    @PostMapping("/cancelAccount")
+    public R<Void> cancelAccount() {
+        loginService.cancelAccount();
+        return R.ok("用户注销成功");
     }
 
+
     /**
      * 用户注册
      */
     @PostMapping("/register")
-    public R<Void> register(@Validated @RequestBody AppSmsRegisterBody user) {
-        registerService.register(user);
+    public R<Void> register(@Validated @RequestBody AppRegisterBody body) {
+        registerService.register(body);
+        return R.ok();
+    }
+
+
+    /**
+     * 找回密码
+     */
+    @PostMapping("/forgetPassword")
+    public R<Void> forgetPassword(@Validated @RequestBody AppRegisterBody body) {
+        registerService.forgetPassword(body);
+        return R.ok();
+    }
+
+
+    /**
+     * 用户注册短信验证码
+     *
+     * @param phonenumber 用户手机号
+     */
+    @SaIgnore
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/registerSmsCode")
+    public R<Void> registerSmsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.REGISTER_CODE_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();
+    }
+
+    /**
+     * 找回密码短信验证码
+     *
+     * @param phonenumber 用户手机号
+     */
+    @SaIgnore
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/forgetPasswordSmsCode")
+    public R<Void> forgetPasswordSmsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.FORGET_PASSWORD_CODE_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();
     }
 
@@ -165,4 +259,20 @@ public class AppAuthController {
         SmsResponse smsResponse = smsBlend.sendMessage("18656573389", "123");
     }
 
+    /**
+     * 获取app版本
+     * @return
+     */
+    @GetMapping("/version")
+    public R<List<SystemVersionDto>> getAppVersion() {
+        String versionKey = GLOBAL_REDIS_KEY + "System:Version:Xinghan";
+        // 缓存告警消息到Redis
+        String versionJson = RedisUtils.getCacheObject(versionKey);
+        if (StringUtils.isBlank(versionJson)) {   // hutool 工具，可用 StringUtils.isBlank 代替
+            return R.fail(versionJson);
+        }
+        List<SystemVersionDto> list = JSON.parseArray(versionJson, SystemVersionDto.class);
+        return R.ok(list);
+    }
+
 }

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

@@ -1,24 +1,27 @@
 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.satoken.utils.AppLoginHelper;
 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 +29,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 +45,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 +54,8 @@ public class AppDeviceController extends BaseController {
      */
     @DeleteMapping("/unBind")
     public R<Void> unBind(Long id) {
-        return toAjax(deviceService.unBindDevice(id));
+        Long userId = AppLoginHelper.getUserId();
+        return toAjax(appDeviceService.unBindDevice(id,userId,0));
     }
 
     /**
@@ -76,4 +77,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,119 @@
+package com.fuyuanshen.app.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.RandomUtil;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.app.service.AppDeviceShareService;
+import com.fuyuanshen.app.service.IAppDeviceShareService;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.web.core.BaseController;
+import 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 AppDeviceShareService 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/AppUserCenterController.java

@@ -0,0 +1,55 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.app.model.AppRegisterBody;
+import com.fuyuanshen.app.model.AppUpdatePasswordBody;
+import com.fuyuanshen.app.service.AppLoginService;
+import com.fuyuanshen.app.service.AppRegisterService;
+import com.fuyuanshen.common.core.domain.R;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * APP我的
+ *
+ */
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/userCenter")
+public class AppUserCenterController {
+
+    private final AppLoginService loginService;
+    private final AppRegisterService registerService;
+    /**
+     * 用户注销
+     */
+    @PostMapping("/cancelAccount")
+    public R<Void> cancelAccount() {
+        loginService.cancelAccount();
+        return R.ok("用户注销成功");
+    }
+
+
+    /**
+     * 修改密码
+     */
+    @PostMapping("/updatePassword")
+    public R<Void> updatePassword(@Validated @RequestBody AppUpdatePasswordBody body) {
+        registerService.updatePassword(body);
+        return R.ok();
+    }
+
+    /**
+     * 退出登录
+     */
+    @PostMapping("/logout")
+    public R<Void> logout() {
+        loginService.logout();
+        return R.ok("退出成功");
+    }
+}

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

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

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

@@ -0,0 +1,54 @@
+package com.fuyuanshen.app.controller;
+
+import com.fuyuanshen.app.service.AudioProcessService;
+import com.fuyuanshen.app.service.VideoProcessService;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.web.core.BaseController;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Base64;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * APP 视频处理控制器
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/video")
+public class AppVideoController extends BaseController {
+
+    private final VideoProcessService videoProcessService;
+    private final AudioProcessService audioProcessService;
+
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
+    public R<List<String>> uploadVideo(@RequestParam("file") MultipartFile file) {
+        return R.ok(videoProcessService.processVideo(file));
+    }
+
+    /**
+     * 上传音频文件并转码
+     */
+    @PostMapping(value = "/audio", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
+    public R<List<String>> uploadAudio(@RequestParam("file") MultipartFile file) {
+        return R.ok(audioProcessService.processAudio(file));
+    }
+
+    /**
+     * 文字转音频TTS服务
+     */
+    @GetMapping("/audioTTS")
+    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
+    public R<List<String>> uploadAudioTTS(@RequestParam String text) throws IOException {
+        return R.ok(audioProcessService.generateStandardPcmData(text));
+    }
+}

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

@@ -0,0 +1,124 @@
+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.exception.ServiceException;
+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;
+
+import java.util.List;
+
+/**
+ * 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/AppDeviceHBYController.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;
+
+/**
+ * HBY210设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/hby/device")
+public class AppDeviceHBYController 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,145 @@
+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.log.annotation.Log;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.customer.mapper.CustomerMapper;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.DeviceTypeService;
+import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * HBY670设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/xinghan/device")
+public class AppDeviceXinghanController extends BaseController {
+
+    private final DeviceXinghanBizService appDeviceService;
+    private final DeviceService deviceService;
+    /**
+     * 人员信息登记
+     */
+    @Log(title = "xinghan指令-人员信息登记")
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送紧急通知
+     */
+    @Log(title = "xinghan指令-发送紧急通知")
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @Log(title = "xinghan指令-上传设备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,分别表示高档/中档/低挡/关闭
+     */
+    @Log(title = "xinghan指令-静电预警档位")
+    @PostMapping("/DetectGradeSettings")
+    public R<Void> DetectGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upDetectGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @Log(title = "xinghan指令-照明档位")
+    @PostMapping("/LightGradeSettings")
+    public R<Void> LightGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upLightGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位s
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @Log(title = "xinghan指令-SOS档位s")
+    @PostMapping("/SOSGradeSettings")
+    public R<Void> SOSGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upSOSGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 静止报警状态
+     * 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @Log(title = "xinghan指令-静止报警状态")
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upShakeBitSettings(params);
+        return R.ok();
+    }
+
+    @GetMapping(value = "/typeAll")
+    @Operation(summary = "查询所有设备类型")
+    public  R<List<DeviceType>> queryDeviceTypes() {
+        List<DeviceType> deviceTypes = appDeviceService.queryDeviceTypes();
+        return R.ok(deviceTypes);
+    }
+
+    // @Log("新增设备")
+    @Operation(summary = "新增设备")
+    @PostMapping(value = "/add")
+    public R<Void> addDevice(@RequestBody DeviceForm deviceForm) {
+        try {
+            appDeviceService.addDevice(deviceForm);
+        } catch (Exception e) {
+            return R.fail(e.getMessage());
+        }
+        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,28 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Data
+public class AppDeviceLogoUploadDto {
+
+    private Long deviceId;
+
+    private String deviceImei;
+    /**
+     *  文件
+     */
+    private MultipartFile file;
+
+//    /**
+//     *  文件
+//     */
+//    private List<MultipartFile> files;
+
+
+    private List<Long> deviceIds;
+
+    private Integer chunkSize;
+}

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

@@ -18,4 +18,9 @@ public class AppFileDto {
      */
     private MultipartFile[] files;
 
+    /**
+     * 多设备id
+     */
+    private Long[] deviceIds;
+
 }

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

@@ -0,0 +1,30 @@
+package com.fuyuanshen.app.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+public class AppRegisterBody {
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "{user.phonenumber.not.blank}")
+    private String phonenumber;
+
+    /**
+     * 短信code
+     */
+    private String smsCode;
+
+    /**
+     * 租户ID
+     */
+    @NotBlank(message = "租户ID不能为空")
+    private String tenantId;
+
+
+    /**
+     * 登录密码
+     */
+    private String password;
+}

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

@@ -14,7 +14,6 @@ public class AppSmsLoginBody {
     /**
      * 短信code
      */
-    @NotBlank(message = "{sms.code.not.blank}")
     private String smsCode;
 
     /**
@@ -23,4 +22,14 @@ public class AppSmsLoginBody {
     @NotBlank(message = "租户ID不能为空")
     private String tenantId;
 
+    /**
+     * 登录方式 1:手机验证码登录 2:密码登录
+     */
+    @NotBlank(message = "登录方式不能为空")
+    private String loginType;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
 }

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

@@ -0,0 +1,12 @@
+package com.fuyuanshen.app.model;
+
+import lombok.Data;
+
+@Data
+public class AppUpdatePasswordBody {
+
+    /**
+     * 登录密码
+     */
+    private String password;
+}

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

@@ -0,0 +1,263 @@
+package com.fuyuanshen.app.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 AppDeviceShareService {
+
+    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(AppDeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+    public TableDataInfo<AppDeviceShareVo> queryWebPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+//        Long userId = AppLoginHelper.getUserId();
+//        bo.setCreateBy(userId);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(AppDeviceShareService::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("1".equals(onlineStatus)){
+            item.setOnlineStatus(1);
+        }else if("2".equals(onlineStatus)){
+            item.setOnlineStatus(2);
+        }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(AppDeviceShareService::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(AppDeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+}

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

@@ -32,7 +32,7 @@ public class AppFileService {
     private final IAppBusinessFileService appBusinessFileService;
 
     public List<AppFileVo> list(AppBusinessFileBo bo) {
-        bo.setCreateBy(AppLoginHelper.getUserId());
+//        bo.setCreateBy(AppLoginHelper.getUserId());
         return appBusinessFileService.queryAppFileList(bo);
     }
 
@@ -68,7 +68,7 @@ public class AppFileService {
 
     public Boolean delete(Long[] ids) {
         AppBusinessFileBo bo = new AppBusinessFileBo();
-        bo.setCreateBy(AppLoginHelper.getUserId());
+//        bo.setCreateBy(AppLoginHelper.getUserId());
         bo.setIds(List.of(ids));
         List<AppBusinessFileVo> appBusinessFileVos = appBusinessFileService.queryList(bo);
         List<Long> fileIds = appBusinessFileVos.stream().map(AppBusinessFileVo::getFileId).toList();

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/app/service/AppRegisterService.java

@@ -0,0 +1,156 @@
+package com.fuyuanshen.app.service;
+
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.AppUser;
+import com.fuyuanshen.app.mapper.AppUserMapper;
+import com.fuyuanshen.app.model.AppRegisterBody;
+import com.fuyuanshen.app.model.AppUpdatePasswordBody;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.model.RegisterBody;
+import com.fuyuanshen.common.core.enums.UserType;
+import com.fuyuanshen.common.core.exception.user.CaptchaException;
+import com.fuyuanshen.common.core.exception.user.CaptchaExpireException;
+import com.fuyuanshen.common.core.exception.user.UserException;
+import com.fuyuanshen.common.core.utils.MessageUtils;
+import com.fuyuanshen.common.core.utils.ServletUtils;
+import com.fuyuanshen.common.core.utils.SpringUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.log.event.LogininforEvent;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.common.web.config.properties.CaptchaProperties;
+import com.fuyuanshen.system.domain.SysUser;
+import com.fuyuanshen.system.domain.bo.SysUserBo;
+import com.fuyuanshen.system.mapper.SysUserMapper;
+import com.fuyuanshen.system.service.ISysUserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+
+/**
+ * 注册校验方法
+ *
+ * @author Lion Li
+ */
+@RequiredArgsConstructor
+@Service
+public class AppRegisterService {
+
+    private final IAppUserService userService;
+    private final AppUserMapper userMapper;
+
+    /**
+     * 注册
+     */
+    public void register(AppRegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getPhonenumber();
+        String password = registerBody.getPassword();
+
+        boolean codeValidate = validateRegisterSmsCode(tenantId, username, registerBody.getSmsCode());
+        if (!codeValidate) {
+            throw new CaptchaException();
+        }
+
+        // 校验用户类型是否存在
+        String userType = UserType.APP_USER.getUserType();
+
+        boolean exist = TenantHelper.dynamic(tenantId, () -> {
+            return userMapper.exists(new LambdaQueryWrapper<AppUser>()
+                .eq(AppUser::getUserName, username));
+        });
+        if (exist) {
+            throw new UserException("user.register.save.error", username);
+        }
+        AppUser appUser = new AppUser();
+        appUser.setPhonenumber(username);
+        appUser.setUserName(username);
+        appUser.setStatus("0");
+        appUser.setLoginDate(new Date());
+        appUser.setLoginIp(ServletUtils.getClientIP());
+        appUser.setTenantId(tenantId);
+        appUser.setPassword(password);
+        appUser.setUserType(userType);
+        userMapper.insert(appUser);
+        recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+    /**
+     * 注册校验短信验证码
+     */
+    private boolean validateRegisterSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.REGISTER_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
+    /**
+     * 忘记密码校验验证码
+     */
+    private boolean validateForgetPasswordCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.FORGET_PASSWORD_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            recordLogininfor(tenantId, phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param tenantId 租户ID
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     * @return
+     */
+    private void recordLogininfor(String tenantId, String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setTenantId(tenantId);
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+    public void forgetPassword(AppRegisterBody registerBody) {
+        String tenantId = registerBody.getTenantId();
+        String username = registerBody.getPhonenumber();
+        String password = registerBody.getPassword();
+        boolean codeValidate = validateForgetPasswordCode(tenantId, username, registerBody.getSmsCode());
+        if (!codeValidate) {
+            throw new CaptchaException();
+        }
+        boolean exist = TenantHelper.dynamic(tenantId, () -> {
+            return userMapper.exists(new LambdaQueryWrapper<AppUser>()
+                    .eq(AppUser::getUserName, username));
+        });
+        if (!exist) {
+            throw new UserException("用户不存在");
+        }
+
+        UpdateWrapper<AppUser> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("user_name", username)
+                .set("password", password);
+        userMapper.update(updateWrapper);
+    }
+
+    public void updatePassword(AppUpdatePasswordBody body) {
+        String username = AppLoginHelper.getUsername();
+        String password = body.getPassword();
+        UpdateWrapper<AppUser> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("user_name", username)
+                .set("password", password);
+        userMapper.update(updateWrapper);
+    }
+}

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

@@ -0,0 +1,174 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.equipment.utils.AlibabaTTSUtil;
+import com.fuyuanshen.equipment.utils.AudioProcessUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 音频处理服务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AudioProcessService {
+
+    // 配置参数
+    private static final int MAX_AUDIO_SIZE = 5 * 1024 * 1024; // 5MB
+    private static final List<String> SUPPORTED_FORMATS = Arrays.asList(
+            ".wav", ".mp3", ".aac", ".flac", ".m4a", ".ogg"
+    );
+
+    private final AudioProcessUtil audioProcessUtil;
+    private final AlibabaTTSUtil alibabaTTSUtil;
+
+    /**
+     * 处理上传的音频文件
+     */
+    public List<String> processAudio(MultipartFile file) {
+        // 1. 参数校验
+        validateAudioFile(file);
+
+        File tempFile = null;
+        try {
+            // 2. 创建临时文件
+            tempFile = createTempAudioFile(file);
+
+            // 3. 转码为标准PCM-WAV格式
+            byte[] pcmData = audioProcessUtil.convertToStandardWav(tempFile);
+            log.info("音频处理成功，输出数据大小: {} bytes", pcmData.length);
+
+            // 获取音频信息
+//            String audioInfo = audioProcessUtil.getAudioInfo(pcmData);
+//            log.info("音频处理成功，音频信息: {}", audioInfo);
+//
+//            // 保存测试文件（用于验证）
+//            String savedPath = audioProcessUtil.saveWavToFile(pcmData, "test_output.wav");
+//            if (savedPath != null) {
+//                log.info("测试文件已保存: {}", savedPath);
+//            }
+
+            // 将byte[]转换为16进制字符串列表
+            List<String> hexList = audioProcessUtil.bytesToHexList(pcmData);
+
+            log.info("音频处理完成，原始数据大小: {} bytes, 16进制数据长度: {}",
+                    pcmData.length, hexList.size());
+
+            return hexList;
+
+        } catch (Exception e) {
+            log.error("音频处理失败", e);
+            throw new RuntimeException("音频处理失败", e);
+        } finally {
+            // 4. 清理临时文件
+            deleteTempFile(tempFile);
+        }
+    }
+
+    /**
+     * 生成标准PCM数据（单声道，16K采样率，16bit深度，包含44字节WAV头）
+     * 数据总大小不超过2MB，如果超过将抛出异常
+     * @param text 要转换的文本内容
+     * @return 标准PCM数据字节数组（WAV格式）
+     * @throws IOException 处理失败时抛出
+     * @throws IllegalArgumentException 如果生成的数据超过2MB
+     */
+    public List<String> generateStandardPcmData(String text) throws IOException {
+        // 参数校验
+        if (text == null || text.trim().isEmpty()) {
+            throw new IllegalArgumentException("文本内容不能为空");
+        }
+        if (text.length() > 100) {
+            throw new IllegalArgumentException("文本长度超过限制（最大100字符）");
+        }
+        log.info("输入文本长度: {}", text.length());
+        try {
+            byte[] rawPcmData = alibabaTTSUtil.generateStandardPcmData(text);
+
+            // 使用AudioProcessUtil转换成带头44字节 PCM
+            byte[] pcmData = audioProcessUtil.rawPcmToStandardWav(rawPcmData);
+
+//            String savedPath = audioProcessUtil.saveWavToFile(pcmData, "test_output.wav");
+//            if (savedPath != null) {
+//                log.info("测试文件已保存: {}", savedPath);
+//            }
+
+            // 将byte[]转换为16进制字符串列表
+            List<String> hexList = audioProcessUtil.bytesToHexList(pcmData);
+
+            log.info("generateStandardPcmData音频处理完成，原始数据大小: {} bytes, 16进制数据长度: {}",
+                    pcmData.length, hexList.size());
+
+            return hexList;
+        } finally {
+            // 4. 清理临时文件
+        }
+    }
+
+    /**
+     * 验证音频文件
+     */
+    private void validateAudioFile(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("上传文件不能为空");
+        }
+
+        if (!isAudioFile(file.getOriginalFilename())) {
+            throw new IllegalArgumentException("只允许上传音频文件");
+        }
+
+        if (file.getSize() > MAX_AUDIO_SIZE) {
+            throw new IllegalArgumentException("音频大小不能超过5MB");
+        }
+    }
+
+    /**
+     * 判断是否是支持的音频格式
+     */
+    private boolean isAudioFile(String filename) {
+        if (filename == null || filename.lastIndexOf('.') == -1) {
+            return false;
+        }
+        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
+        return SUPPORTED_FORMATS.contains(ext);
+    }
+
+    /**
+     * 创建临时音频文件
+     */
+    private File createTempAudioFile(MultipartFile file) throws IOException {
+        String originalFilename = file.getOriginalFilename();
+        String extension = "";
+        if (originalFilename != null && originalFilename.contains(".")) {
+            extension = originalFilename.substring(originalFilename.lastIndexOf("."));
+        }
+
+        File tempFile = File.createTempFile("audio-", extension);
+        file.transferTo(tempFile);
+        log.debug("创建临时音频文件: {}", tempFile.getAbsolutePath());
+        return tempFile;
+    }
+
+    /**
+     * 删除临时文件
+     */
+    private void deleteTempFile(File file) {
+        if (file != null && file.exists()) {
+            if (file.delete()) {
+                log.debug("删除临时文件成功: {}", file.getAbsolutePath());
+            } else {
+                log.warn("无法删除临时文件: {}", file.getAbsolutePath());
+            }
+        }
+    }
+
+
+}

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

@@ -0,0 +1,84 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.web.util.VideoProcessUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 视频处理服务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class VideoProcessService {
+
+    // 配置参数
+    private static final int MAX_VIDEO_SIZE = 10 * 1024 * 1024;
+    private static final List<String> SUPPORTED_FORMATS = Arrays.asList(".mp4", ".avi", ".mov", ".mkv");
+    private static final int FRAME_RATE = 15;
+    private static final int DURATION = 2;
+    private static final int WIDTH = 160;
+    private static final int HEIGHT = 80;
+
+    private final VideoProcessUtil videoProcessUtil;
+
+    public List<String> processVideo(MultipartFile file) {
+        // 1. 参数校验
+        validateVideoFile(file);
+
+        File tempFile = null;
+        try {
+            // 2. 创建临时文件
+            tempFile = videoProcessUtil.createTempVideoFile(file);
+
+            // 3. 处理视频并提取帧数据
+            List<String> hexList = videoProcessUtil.processVideoToHex(
+                    tempFile, FRAME_RATE, DURATION, WIDTH, HEIGHT
+            );
+
+            log.info("视频处理成功，生成Hex数据长度: {}", hexList.size());
+            return hexList;
+
+        } catch (Exception e) {
+            log.error("视频处理失败", e);
+            throw new RuntimeException("视频处理失败", e);
+        } finally {
+            // 4. 清理临时文件
+            videoProcessUtil.deleteTempFile(tempFile);
+        }
+    }
+
+    /**
+     * 验证视频文件
+     */
+    private void validateVideoFile(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("上传文件不能为空");
+        }
+
+        if (!isVideoFile(file.getOriginalFilename())) {
+            throw new IllegalArgumentException("只允许上传视频文件");
+        }
+
+        if (file.getSize() > MAX_VIDEO_SIZE) {
+            throw new IllegalArgumentException("视频大小不能超过10MB");
+        }
+    }
+
+    /**
+     * 判断是否是支持的视频格式
+     */
+    private boolean isVideoFile(String filename) {
+        if (filename == null || filename.lastIndexOf('.') == -1) {
+            return false;
+        }
+        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
+        return SUPPORTED_FORMATS.contains(ext);
+    }
+}

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,43 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import org.springframework.stereotype.Component;
+
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+/**
+ * MQTT消息引擎
+ */
+@Component
+public class MqttRuleEngine {
+
+//    @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));
+            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,74 @@
+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("sta_ShakeBit")
+    public Integer staShakeBit;
+    /**
+     * 第八键值对, 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;
+    /**
+     * 第十二键值对，系统现状，0关机，1仅充电，2开机未充电,3，开机且充电
+     */
+    @JsonProperty("sta_system")
+    public String stasystem;
+    /**
+     * 电量百分比(适配控制列表显示)
+     */
+    public String batteryPercentage;
+
+}

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

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

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

@@ -0,0 +1,25 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * MQTT消息处理上下文
+ */
+@Data
+public class NewMqttRuleContext {
+    /**
+     * 命令类型
+     */
+    private String commandType;
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * MQTT消息负载字典
+     */
+    private Map<String, Object> payloadDict;
+}

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

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

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

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

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

@@ -1,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,10 @@
-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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -15,13 +17,9 @@ 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
+@Slf4j
 public class MqttInboundConfiguration {
     @Autowired
     private MqttPropertiesConfig mqttPropertiesConfig;
@@ -43,11 +41,13 @@ public class MqttInboundConfiguration {
     public MessageProducer messageProducer(){
         // 生成一个不重复的随机数
         String clientId = mqttPropertiesConfig.getSubClientId() + "_" + UUID.fastUUID();
+        String subTopic = mqttPropertiesConfig.getSubTopic();
+        log.info("订阅主题：{}", subTopic);
         MqttPahoMessageDrivenChannelAdapter mqttPahoMessageDrivenChannelAdapter = new MqttPahoMessageDrivenChannelAdapter(
                 mqttPropertiesConfig.getUrl(),
                 clientId,
                 mqttPahoClientFactory,
-                mqttPropertiesConfig.getSubTopic().split(",")
+                subTopic.split(",")
         );
         mqttPahoMessageDrivenChannelAdapter.setQos(1);
         mqttPahoMessageDrivenChannelAdapter.setConverter(new DefaultPahoMessageConverter());
@@ -60,4 +60,10 @@ public class MqttInboundConfiguration {
     public MessageHandler messageHandler(){
         return receiverMessageHandler;
     }
+
+    // @Bean
+    // @ServiceActivator(inputChannel = "messageInboundChannel") // 确保通道名称正确
+    // public MessageHandler deviceAlarmMessageHandler() {
+    //     return new DeviceAlrmMessageHandler();
+    // }
 }

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(mqttPropertiesConfig.getPubTopic());
         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
@@ -19,6 +14,8 @@ public class MqttPropertiesConfig {
     private String url;
     private String subClientId;
     private String subTopic;
+    private String subTopic2;
     private String pubClientId;
     private String pubTopic;
+    private String pubTopic2;
 }

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

@@ -0,0 +1,68 @@
+package com.fuyuanshen.global.mqtt.config;
+
+
+import cn.hutool.core.lang.UUID;
+import com.fuyuanshen.global.mqtt.receiver.NewReceiverMessageHandler;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+
+@Configuration
+@Slf4j
+public class NewMqttInboundConfiguration {
+    @Autowired
+    private MqttPropertiesConfig mqttPropertiesConfig;
+    @Autowired
+    private MqttPahoClientFactory mqttPahoClientFactory;
+    @Autowired
+    private NewReceiverMessageHandler receiverMessageHandler2;
+    //消息通道
+    @Bean
+    public MessageChannel messageInboundChannel2(){
+        return new DirectChannel();
+    }
+ 
+    /**
+     * 配置入站适配器
+     * 作用： 设置订阅主题，以及指定消息的通道 等相关属性
+     * */
+    @Bean
+    public MessageProducer messageProducer2(){
+        // 生成一个不重复的随机数
+        String clientId = mqttPropertiesConfig.getSubClientId() + "_" + UUID.fastUUID();
+        String subTopic = mqttPropertiesConfig.getSubTopic2();
+        log.info("订阅主题：{}", subTopic);
+        MqttPahoMessageDrivenChannelAdapter mqttPahoMessageDrivenChannelAdapter = new MqttPahoMessageDrivenChannelAdapter(
+                mqttPropertiesConfig.getUrl(),
+                clientId,
+                mqttPahoClientFactory,
+                subTopic.split(",")
+        );
+        mqttPahoMessageDrivenChannelAdapter.setQos(1);
+        mqttPahoMessageDrivenChannelAdapter.setConverter(new DefaultPahoMessageConverter());
+        mqttPahoMessageDrivenChannelAdapter.setOutputChannel(messageInboundChannel2());
+        return mqttPahoMessageDrivenChannelAdapter;
+    }
+    /**  指定处理消息来自哪个通道 */
+    @Bean
+    @ServiceActivator(inputChannel = "messageInboundChannel2")
+    public MessageHandler messageHandler2(){
+        return receiverMessageHandler2;
+    }
+
+    // @Bean
+    // @ServiceActivator(inputChannel = "messageInboundChannel") // 确保通道名称正确
+    // public MessageHandler deviceAlarmMessageHandler() {
+    //     return new DeviceAlrmMessageHandler();
+    // }
+}

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

@@ -0,0 +1,46 @@
+package com.fuyuanshen.global.mqtt.config;
+
+import cn.hutool.core.lang.UUID;
+import lombok.extern.slf4j.Slf4j;
+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.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+
+@Configuration
+@Slf4j
+public class NewMqttOutboundConfiguration {
+    @Autowired
+    private MqttPropertiesConfig mqttPropertiesConfig;
+    @Autowired
+    private MqttPahoClientFactory mqttPahoClientFactory;
+ 
+    // 消息通道
+    @Bean
+    public MessageChannel mqttOutboundChannel2(){
+        return new DirectChannel();
+    }
+
+
+    /** 配置出站消息处理器 */
+    @Bean
+    @ServiceActivator(inputChannel = "mqttOutboundChannel2")  // 指定处理器针对哪个通道的消息进行处理
+    public MessageHandler mqttOutboundMessageHandler2(){
+        String clientId = mqttPropertiesConfig.getPubClientId() + "_" + UUID.fastUUID();
+        MqttPahoMessageHandler mqttPahoMessageHandler = new MqttPahoMessageHandler(
+                mqttPropertiesConfig.getUrl(),
+                clientId,
+                mqttPahoClientFactory
+        );
+        mqttPahoMessageHandler.setDefaultQos(1);
+        mqttPahoMessageHandler.setDefaultTopic(mqttPropertiesConfig.getPubTopic2());
+        mqttPahoMessageHandler.setAsync(true);
+        return mqttPahoMessageHandler;
+    }
+ 
+}

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

@@ -0,0 +1,55 @@
+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";
+
+    /**
+     * 告警信息
+     */
+    public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
+}

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,105 @@
+package com.fuyuanshen.global.mqtt.listener;
+
+import cn.hutool.core.thread.ThreadUtil;
+import com.baomidou.lock.LockInfo;
+import com.baomidou.lock.LockTemplate;
+import com.baomidou.lock.executor.RedissonLockExecutor;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.connection.Message;
+import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
+
+@Component
+@Slf4j
+public class RedisKeyExpirationListener implements MessageListener {
+
+    @Autowired
+    @Qualifier("threadPoolTaskExecutor")
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Autowired
+    private LockTemplate lockTemplate;
+
+    @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);
+        }
+        if(expiredKey.endsWith(DEVICE_ONLINE_STATUS_KEY_PREFIX)) {
+
+            threadPoolTaskExecutor.execute(() -> {
+                log.info("设备离线：{}", expiredKey);
+                String element = expiredKey.substring(GlobalConstants.GLOBAL_REDIS_KEY.length() + DEVICE_KEY_PREFIX.length(), expiredKey.length() - DEVICE_ONLINE_STATUS_KEY_PREFIX.length());
+
+                // 构造设备锁键
+                String deviceLockKey = GlobalConstants.GLOBAL_REDIS_KEY + ":device_lock:" + element;
+
+                // 尝试获取Redis锁
+                LockInfo lockInfo = lockTemplate.lock(deviceLockKey, 30000L, 5000L, RedissonLockExecutor.class); // 30秒过期
+
+                if (lockInfo != null) {
+                    try {
+                        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ message + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+//                        String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
+//                        if(StringUtils.isBlank(deviceOnlineStatusRedis)){
+//                            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+//                            deviceUpdateWrapper.eq("device_imei", element);
+//                            deviceUpdateWrapper.set("online_status", 0);
+//                            deviceMapper.update(deviceUpdateWrapper);
+//                        }else{
+//                            RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
+//                        }
+
+                        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+                        deviceUpdateWrapper.eq("device_imei", element);
+                        deviceUpdateWrapper.set("online_status", 0);
+                        deviceMapper.update(deviceUpdateWrapper);
+                        String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
+                        if(StringUtils.isNotBlank(deviceOnlineStatusRedis)){
+                            RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
+                        }
+                    } finally {
+                        //释放锁
+                        lockTemplate.releaseLock(lockInfo);
+                    }
+                } else {
+                    log.warn("无法获取设备锁，跳过设备离线处理: {}", 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,20 +1,22 @@
-package com.fuyuanshen.system.mqtt.publish;
+package com.fuyuanshen.global.mqtt.publish;
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/")
+@RequestMapping("/api")
+@SaIgnore
 @Slf4j
 public class DeviceDataController {
 
     @Autowired
     private MqttClientTest mqttClientTest;
-    
-//    @PostMapping("/{deviceId}/command")
+    @GetMapping("/command")
     public ResponseEntity<String> sendCommand() {
 
         mqttClientTest.sendMsg();

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;
@@ -13,10 +13,10 @@ public class MqttClientTest {
     private MqttGateway mqttGateway;
 
     public void sendMsg() {
-        mqttGateway.sendMsgToMqtt("worker/location/1", "hello mqtt spring boot");
+        mqttGateway.sendMsgToMqtt("command/894078/HBY670/864865082081523", "hello mqtt spring boot");
         log.info("message is send");
 
-        mqttGateway.sendMsgToMqtt("worker/alert/2", "hello mqtt spring boot2");
+        mqttGateway.sendMsgToMqtt("report/894078/HBY670/864865082081523", "hello mqtt spring boot2");
         log.info("message is send2");
     }
 }

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

@@ -0,0 +1,146 @@
+package com.fuyuanshen.global.mqtt.receiver;
+
+import cn.hutool.core.lang.Dict;
+import com.baomidou.lock.LockTemplate;
+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.global.mqtt.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleEngine;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+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 java.util.concurrent.TimeUnit;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+@Service
+@Slf4j
+public class NewReceiverMessageHandler implements MessageHandler {
+
+    @Autowired
+    private NewMqttRuleEngine newRuleEngine;
+
+    @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("MQTT2 payload= {} \n receivedTopic = {} \n receivedQos = {} \n timestamp = {}",
+                payload, receivedTopic, receivedQos, timestamp);
+
+        Dict payloadDict = JsonUtils.parseMap(payload.toString());
+        if (receivedTopic == null || payloadDict == null) {
+            return;
+        }
+        String imei = payloadDict.getStr("imei");
+        String funcType = payloadDict.getStr("funcType");
+        RedissonClient client = RedisUtils.getClient();
+        String lockKey = "mqtt:consumer:lock:";
+        String  KEY = GlobalConstants.GLOBAL_REDIS_KEY + lockKey + imei;
+        log.info("MQTT2获取锁开始{}", KEY);
+        RLock lock = client.getLock(KEY);
+
+        try {
+            // 尝试获取锁，
+            boolean isLocked = lock.tryLock(60, 3000, TimeUnit.MILLISECONDS);
+            if (isLocked) {
+                // 执行业务逻辑
+                if(StringUtils.isNotBlank(imei)){
+                    String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+                    String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
+                    RedisUtils.offerDeduplicated(queueKey,dedupKey,imei, Duration.ofSeconds(900));
+                    //在线状态
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ imei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
+                }
+
+                String[] topicArr = receivedTopic.split("/");
+
+                NewMqttRuleContext context = new NewMqttRuleContext();
+                context.setCommandType(topicArr[2]+"_"+funcType);
+                context.setDeviceImei(imei);
+                context.setPayloadDict(payloadDict);
+
+                boolean ruleExecuted = newRuleEngine.executeRule(context);
+
+                if (!ruleExecuted) {
+                    log.warn("未找到匹配的规则来处理命令类型: {}", topicArr[2] + " : " +funcType);
+                }
+            }else{
+                log.warn("MQTT2获取锁失败，请稍后再试");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        } finally {
+            // 释放锁
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+//        final LockInfo lockInfo = lockTemplate.lock(GlobalConstants.GLOBAL_REDIS_KEY + lockKey + imei, 100L, 3000L, RedissonLockExecutor.class);
+//        if (null == lockInfo) {
+//            log.info("MQTT3业务处理中,请稍后再试:funcType=>{},imei=>{}",funcType,imei);
+//            return;
+//        }
+////         获取锁成功，处理业务
+//        try {
+//            if(StringUtils.isNotBlank(imei)){
+//                String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+//                String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
+//                RedisUtils.offerDeduplicated(queueKey,dedupKey,imei, Duration.ofSeconds(900));
+//                //在线状态
+//                String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ imei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+//                RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
+//            }
+//
+//            String[] topicArr = receivedTopic.split("/");
+//
+//            NewMqttRuleContext context = new NewMqttRuleContext();
+//            context.setCommandType(topicArr[2]+"_"+funcType);
+//            context.setDeviceImei(imei);
+//            context.setPayloadDict(payloadDict);
+//
+//            boolean ruleExecuted = newRuleEngine.executeRule(context);
+//
+//            if (!ruleExecuted) {
+//                log.warn("未找到匹配的规则来处理命令类型: {}", topicArr[2] + " : " +funcType);
+//            }
+//        } finally {
+//            //释放锁
+//            lockTemplate.releaseLock(lockInfo);
+//        }
+
+
+        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
+//        int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
+//        if (intType > 0) {
+//            MqttRuleContext newCtx = new MqttRuleContext();
+//            String commandType = "Light_"+intType;
+//            newCtx.setCommandType(commandType);
+//            newCtx.setDeviceImei(imei);
+//            newCtx.setPayloadDict(payloadDict);
+//
+//            boolean ok = ruleEngine.executeRule(newCtx);
+//            if (!ok) {
+//                log.warn("新规则引擎未命中, imei={}", imei);
+//            }
+//        }
+    }
+}

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

@@ -0,0 +1,119 @@
+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.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+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 java.util.concurrent.TimeUnit;
+
+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];
+
+
+        RedissonClient client = RedisUtils.getClient();
+        String lockKey = "mqtt:consumer:lock:";
+        String  KEY = GlobalConstants.GLOBAL_REDIS_KEY + lockKey + deviceImei;
+        RLock lock = client.getLock(KEY);
+
+        try {
+            // 尝试获取锁，
+            boolean isLocked = lock.tryLock(60, 3000, TimeUnit.MILLISECONDS);
+            if (isLocked) {
+                String state = payloadDict.getStr("state");
+                Object[] convertArr = ImageToCArrayConverter.convertByteStringToMixedObjectArray(state);
+                if(StringUtils.isNotBlank(deviceImei)){
+                    String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+                    String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
+                    RedisUtils.offerDeduplicated(queueKey,dedupKey,deviceImei, Duration.ofSeconds(900));
+                    //在线状态
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
+                }
+
+
+
+                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);
+                    }
+                }
+            }else{
+                log.warn("MQTT获取锁失败，请稍后再试");
+            }
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        } finally {
+            // 释放锁
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
+        }
+    }
+}

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,135 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.model.LoginUser;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.core.utils.date.DurationUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+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.Date;
+import java.util.concurrent.CompletableFuture;
+
+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.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqAlarmRule implements MqttMessageRule {
+
+    private final IDeviceAlarmService deviceAlarmService;
+    private final DeviceService deviceService;
+
+
+    @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;
+//                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+//                if ("1".equals(convertValue)) {
+//                    RedisUtils.setCacheObject(sendMessageIng, "1", Duration.ofDays(1));
+//                    // 存储到Redis
+//                    RedisUtils.setCacheObject(deviceRedisKey, "1");
+//                }else if ("0".equals(convertValue)){
+//                    RedisUtils.deleteObject(sendMessageIng);
+//                    RedisUtils.deleteObject(deviceRedisKey);
+//                }
+//            }
+//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+//            //  保存告警信息
+//            String deviceImei = context.getDeviceImei();
+//            // 设备告警状态 0:解除告警 1:报警产生
+//            Byte state = (Byte) convertArr[1];
+//            savaAlarm(deviceImei, state);
+
+        } catch (Exception e) {
+            log.error("处理告警命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+
+    public void savaAlarm(String deviceImei, Byte state) {
+        DeviceAlarmVo deviceAlarmVo = deviceAlarmService.queryLatestByDeviceImei(deviceImei);
+        DeviceAlarmBo deviceAlarmBo = new DeviceAlarmBo();
+
+        // 解除告警
+        if (state == 0) {
+            if (deviceAlarmVo != null) {
+                if (deviceAlarmVo.getFinishTime() == null) {
+                    BeanUtil.copyProperties(deviceAlarmVo, deviceAlarmBo);
+                    deviceAlarmBo.setFinishTime(new Date());
+                    String durationBetween = DurationUtils.getDurationBetween(deviceAlarmVo.getStartTime(), deviceAlarmBo.getFinishTime());
+                    deviceAlarmBo.setDurationTime(durationBetween);
+                    // 0已处理，1未处理
+                    deviceAlarmBo.setTreatmentState(0);
+                    // 告警状态，0 解除告警， 1 告警中
+                    deviceAlarmBo.setAlarmState(0);
+                    deviceAlarmService.updateByBo(deviceAlarmBo);
+                }
+            }
+        }
+
+        // 报警产生
+        if (state == 1) {
+            if (deviceAlarmVo == null || deviceAlarmVo.getFinishTime() != null) {
+
+                Device device = deviceService.selectDeviceByImei(deviceImei);
+                deviceAlarmBo.setDeviceId(device.getId());
+                deviceAlarmBo.setDeviceImei(deviceImei);
+                //  0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
+                deviceAlarmBo.setDeviceAction(0);
+                deviceAlarmBo.setStartTime(new Date());
+                // 0已处理，1未处理
+                deviceAlarmBo.setTreatmentState(1);
+                // 告警状态，0 解除告警， 1 告警中
+                deviceAlarmBo.setAlarmState(1);
+
+                // LoginUser loginUser = LoginHelper.getLoginUser();
+                // deviceAlarmBo.setCreateBy(loginUser.getUserId());
+                deviceAlarmBo.setTenantId(device.getTenantId());
+
+                String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX);
+                if (StringUtils.isNotBlank(location)) {
+                    JSONObject jsonObject = JSONObject.parseObject(location);
+                    deviceAlarmBo.setLocation(jsonObject.getString("address"));
+                }
+                deviceAlarmService.insertByBo(deviceAlarmBo);
+            }
+        }
+
+    }
+
+}

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,250 @@
+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.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+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;
+    private final DeviceService deviceService;
+
+
+    @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();
+//            // 判断 latitude 和 longitude 是否都为 0
+//            if ("0".equals(latitude) && "0".equals(longitude)) {
+//                log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
+//                return;
+//            }
+//            // 异步发送经纬度到Redis
+//            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
+//            // 异步保存数据
+//            asyncSaveLocationToMySQLWithFuture(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);
+            }
+        });
+    }
+
+
+    /**
+     * 异步保存位置信息到MySQL数据库
+     *
+     * @param deviceImei 设备IMEI
+     * @param latitude   纬度
+     * @param longitude  经度
+     */
+    public void asyncSaveLocationToMySQLWithFuture(String deviceImei, String latitude, String longitude) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                if (StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)) {
+                    return;
+                }
+
+                // 调用服务层方法更新设备位置信息
+                deviceService.updateDeviceLocationByImei(deviceImei, longitude, latitude);
+
+                log.info("位置信息已异步保存到MySQL: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            } catch (Exception e) {
+                log.error("异步保存位置信息到MySQL时出错: 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,146 @@
+package com.fuyuanshen.global.mqtt.rule.bjq;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.core.utils.date.DurationUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+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.Date;
+import java.util.concurrent.CompletableFuture;
+
+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.*;
+
+/**
+ * 灯光模式订阅设备回传消息
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class BjqModeRule implements MqttMessageRule {
+
+    private final DeviceService deviceService;
+    private final IDeviceAlarmService deviceAlarmService;
+
+
+    @Override
+    public String getCommandType() {
+        return LightingCommandTypeConstants.LIGHT_MODE;
+    }
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
+        try {
+            log.info("处理灯光模式命令");
+            log.info("MQTT消息负载字典：{}", context.getPayloadDict());
+//            Object[] convertArr = context.getConvertArr();
+//
+//            String mainLightMode = convertArr[1].toString();
+//            String batteryRemainingTime = convertArr[2].toString();
+//            if (StringUtils.isNotBlank(mainLightMode)) {
+//                log.info("设备离线mainLightMode：{}", 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");
+//
+//                    String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+//                    String messageSendingValue = RedisUtils.getCacheObject(sendMessageIng);
+//                    if ("1".equals(messageSendingValue)) {
+//                        // 设置为故障状态
+//                        RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "2");
+//                        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+//                        updateWrapper.eq("device_imei", context.getDeviceImei());
+//                        updateWrapper.set("online_status", 2);
+//                        deviceService.update(updateWrapper);
+//                        RedisUtils.deleteObject(sendMessageIng);
+//
+//                        // 解除告警
+//                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
+//                        if (RedisUtils.getCacheObject(deviceRedisKey) != null) {
+//                            RedisUtils.deleteObject(deviceRedisKey);
+//                        }
+//                        cancelAlarm(context.getDeviceImei());
+//                    }
+//                }
+//                // 发送设备状态和位置信息到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);
+        }
+    }
+
+
+    /**
+     * 解除告警
+     *
+     * @param deviceImei 设备IMEI
+     */
+
+    public void cancelAlarm(String deviceImei) {
+        DeviceAlarmVo deviceAlarmVo = deviceAlarmService.queryLatestByDeviceImei(deviceImei);
+        DeviceAlarmBo deviceAlarmBo = new DeviceAlarmBo();
+        if (deviceAlarmVo != null) {
+            if (deviceAlarmVo.getFinishTime() == null) {
+                BeanUtil.copyProperties(deviceAlarmVo, deviceAlarmBo);
+                deviceAlarmBo.setFinishTime(new Date());
+                String durationBetween = DurationUtils.getDurationBetween(deviceAlarmVo.getStartTime(), deviceAlarmBo.getFinishTime());
+                deviceAlarmBo.setDurationTime(durationBetween);
+                // 0已处理，1未处理
+                deviceAlarmBo.setTreatmentState(0);
+                // 告警状态，0 解除告警， 1 告警中
+                deviceAlarmBo.setAlarmState(0);
+                deviceAlarmService.updateByBo(deviceAlarmBo);
+            }
+        }
+    }
+
+
+}

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,95 @@
+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];
+//            String val2Str = context.getConvertArr()[1].toString();
+//            int val2 = Integer.parseInt(val2Str);
+//            System.out.println("收到设备信息命令:"+val2);
+//            if (val2 == 100) {
+//                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+//                return;
+//            }
+//
+//            if(val2==200){
+//                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+//                RedisUtils.deleteObject(sendMessageIng);
+//                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(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,163 @@
+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 + "LOGO:" + ctx.getDeviceImei();
+        try {
+            MqttXinghanLogoJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), MqttXinghanLogoJson.class);
+
+            String respText = payload.getStaPicTrans();
+            log.warn("设备上报LOGO：{}", respText);
+
+            // --- 去重 START ---
+            String dedupKey = "xd:MSG:LOGO:" + ctx.getDeviceImei() + ":" + respText;
+            boolean first = RedisUtils.setObjectIfAbsent(dedupKey, "1", Duration.ofSeconds(3));
+            if (!first) {
+                log.warn("重复消息丢弃 {}", dedupKey);
+                return;
+            }
+
+            // 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;
+
+    /**
+     * 计算数据的CRC32校验值，并将结果转换为整数列表
+     *
+     * @param data 需要计算CRC32校验值的字节数组
+     * @return 包含CRC32校验值的整数列表，每个字节对应一个无符号整数
+     */
+    private static ArrayList<Integer> crc32AsList(byte[] data) {
+        // 计算CRC32校验值
+        CRC32 crc = new CRC32();
+        crc.update(data);
+
+        // 将CRC32值转换为字节数组
+        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,361 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+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.core.utils.date.DurationUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+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.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import com.fuyuanshen.web.enums.AlarmTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+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.*;
+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;
+    private final IDeviceAlarmService deviceAlarmService;
+    private final DeviceService deviceService;
+    private final DeviceAlarmMapper deviceAlarmMapper;
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + "DATA:" + context.getDeviceImei();
+        try {
+            // Latitude, longitude
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            MqttXinghanJson deviceStatus = objectMapper.convertValue(context.getPayloadDict(), MqttXinghanJson.class);
+            deviceStatus.setBatteryPercentage(deviceStatus.getStaPowerPercent().toString());
+            // 发送设备状态和位置信息到Redis
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),deviceStatus);
+            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 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());
+
+                // 保存报警信息
+                saveAlarm(deviceImei,deviceStatus);
+
+            } catch (Exception e) {
+                log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+
+    /**
+     * 入口：保存报警（SOS 与 Shake 完全独立）
+     */
+    public void saveAlarm(String deviceImei, MqttXinghanJson status) {
+        int sos = Optional.ofNullable(status.getStaSOSGrade()).orElse(0);
+        // 1. 处理 SOS 报警
+        handleSingleAlarm(deviceImei,
+                sos > 0,
+                AlarmTypeEnum.SOS);
+        int shake = Optional.ofNullable(status.getStaShakeBit()).orElse(0);
+        // 2. 处理 Shake 报警
+        handleSingleAlarm(deviceImei,
+                shake > 0,
+                AlarmTypeEnum.SHAKE);
+    }
+
+    /**
+     * 通用：对单个报警源的“开始/结束”生命周期管理
+     */
+    private void handleSingleAlarm(String deviceImei, boolean nowAlarming, AlarmTypeEnum type) {
+        String redisKey = buildAlarmRedisKey(deviceImei, type);
+
+        Long alarmId = RedisUtils.getCacheObject(redisKey);
+
+        String lockKey  = redisKey + ":lock";                     // 分布式锁 key
+        RedissonClient client = RedisUtils.getClient();           // 唯一用到的“旧”入口
+        RLock lock = client.getLock(lockKey);
+
+        // ---------- 情况 1：当前正在报警 ----------
+        if (nowAlarming) {
+            // 已存在未结束报警 -> 什么都不做（同一条报警）
+            if (alarmId != null) {
+                // key 还在 -> 同一条报警，只续期
+                RedisUtils.setCacheObject(redisKey, alarmId, Duration.ofMinutes(10));
+                return;
+            }
+            // 需要新建，抢锁
+            boolean locked = false;
+            try {
+                locked = lock.tryLock(3, TimeUnit.SECONDS);   // 最多等 3 s
+                if (!locked) {                                // 抢不到直接放弃
+                    return;
+                }
+                // 锁内二次校验（double-check）
+                alarmId = RedisUtils.getCacheObject(redisKey);
+                if (alarmId != null) {
+                    return;           // 并发线程已建好
+                }
+
+                // 不存在 -> 新建
+                DeviceAlarmBo bo = createAlarmBo(deviceImei, type);
+                if (bo == null){
+                    return;
+                }
+                deviceAlarmService.insertByBo(bo);
+                RedisUtils.setCacheObject(redisKey, bo.getId(), Duration.ofMinutes(10)); // 5分钟后结束过期
+            }catch (InterruptedException ignore) {
+                // 立即中断并退出，禁止继续往下走
+                Thread.currentThread().interrupt();
+            } finally {
+                if (locked && lock.isHeldByCurrentThread()) {
+                    lock.unlock();
+                }
+            }
+            return;
+        }
+
+        // ---------- 情况 2：当前不报警 ----------
+        if (alarmId != null) {
+            // 结束它
+            finishAlarm(alarmId);
+            RedisUtils.deleteObject(redisKey);
+        }
+    }
+
+    /**
+     * 结束报警：写库
+     */
+    private void finishAlarm(Long alarmId) {
+        DeviceAlarmVo vo = deviceAlarmService.queryById(alarmId);
+        if (vo == null || vo.getTreatmentState() == 0) {
+            return; // 已处理或已被删
+        }
+        DeviceAlarmBo bo = BeanUtil.toBean(vo, DeviceAlarmBo.class);
+        bo.setFinishTime(new Date());
+        bo.setDurationTime(DurationUtils.getDurationBetween(vo.getStartTime(), bo.getFinishTime()));
+        bo.setTreatmentState(0); // 已处理
+        deviceAlarmService.updateByBo(bo);
+    }
+
+    /**
+     * 新建报警 Bo
+     */
+    private DeviceAlarmBo createAlarmBo(String deviceImei, AlarmTypeEnum type) {
+        Device device = deviceService.selectDeviceByImei(deviceImei);
+        if (device == null) {
+            return null;
+        }
+        DeviceAlarmBo bo = new DeviceAlarmBo();
+        bo.setDeviceId(device.getId());
+        bo.setDeviceImei(deviceImei);
+        bo.setDeviceAction(2); // 自动报警
+        bo.setStartTime(new Date());
+        bo.setTreatmentState(1); // 未处理
+        bo.setTenantId(device.getTenantId());
+
+        // 报警内容
+        bo.setContent("自动报警：" + type.getDesc());
+
+        // 位置
+        String location = RedisUtils.getCacheObject(
+                GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX);
+        if (StrUtil.isNotBlank(location)) {
+            bo.setLocation(JSONObject.parseObject(location).getString("address"));
+        }
+        return bo;
+    }
+
+    /**
+     * key 构建
+     */
+    private String buildAlarmRedisKey(String deviceImei, AlarmTypeEnum type) {
+        return StrUtil.format("{}{}{}{}:alarm_id",
+                GLOBAL_REDIS_KEY, DEVICE_KEY_PREFIX, deviceImei, type.getSuffix());
+    }
+
+    /**
+     * 异步发送位置信息到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/XinghanSendAlarmMessageRule.java

@@ -0,0 +1,125 @@
+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_ALARM_MESSAGE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 星汉设备发送紧急通知 下发规则：
+ * <p>
+ * 1. 设备上行 sta_BreakNews=cover!  => 仅标记成功<br>
+ * 2. 设备上行 sta_BreakNews=数字   => GBK编码，每行文字为一包，一共4包，第一字节为包序号
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class XinghanSendAlarmMessageRule implements MqttMessageRule {
+
+    private final MqttGateway mqttGateway;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_BREAK_NEWS;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        String functionAccess = FUNCTION_ACCESS_KEY + "ALARM:" + ctx.getDeviceImei();
+        try {
+            XinghanSendAlarmMessageRule.MqttXinghanAlarmMsgJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), XinghanSendAlarmMessageRule.MqttXinghanAlarmMsgJson.class);
+
+            String respText = payload.getStaBreakNews();
+            log.info("设备上报紧急通知握手： {} ", respText);
+            // --- 去重 START ---
+            String dedupKey = "xd:ALARM:dedup:" + ctx.getDeviceImei() + ":" + respText;
+            boolean first = RedisUtils.setObjectIfAbsent(dedupKey, "1", Duration.ofSeconds(3));
+            if (!first) {
+                log.warn("重复消息丢弃 {}", dedupKey);
+                return;
+            }
+
+            // 1. cover! —— 成功标记
+            if ("cover!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.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中
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + ctx.getDeviceImei() + DEVICE_ALARM_MESSAGE_KEY_PREFIX);
+            if (data == null || data.isEmpty()) {
+                return;
+            }
+            //
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(blockIndex);
+            // 获取块原内容 转成GBK  再转成无符号十进制整数
+            String blockTxt = data.split("\\|")[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_BreakNews", 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 MqttXinghanAlarmMsgJson {
+        /**
+         * 设备上行：
+         * 数字  -> 请求对应块号
+         * cover! -> 写入成功
+         */
+        @JsonProperty("sta_BreakNews")
+        private String staBreakNews;
+    }
+}

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

@@ -0,0 +1,129 @@
+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.*;
+
+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() {
+        List<Integer> list = Arrays.asList(1, 2, 3, 4, 5);
+
+        // 三种等价的写法
+        Integer[] array1 = list.toArray(new Integer[0]);
+        Integer[] array2 = list.toArray(size -> new Integer[size]);
+
+        return XingHanCommandTypeConstants.XingHan_ESEND_MSG;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        String functionAccess = FUNCTION_ACCESS_KEY + "MSG:" + ctx.getDeviceImei();
+        try {
+            XinghanSendMsgRule.MqttXinghanMsgJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), XinghanSendMsgRule.MqttXinghanMsgJson.class);
+
+            String respText = payload.getStaTexTrans();
+            log.info("设备上报人员信息： {} ", respText);
+
+            // --- 去重 START ---
+            String dedupKey = "xd:MSG:dedup:" + ctx.getDeviceImei() + ":" + respText;
+            boolean first = RedisUtils.setObjectIfAbsent(dedupKey, "1", Duration.ofSeconds(3));
+            if (!first) {
+                log.warn("重复消息丢弃 {}", dedupKey);
+                return;
+            }
+
+            // 1. genius! —— 成功标记
+            if ("genius!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.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);
+            log.warn("设备上报人员登记信息：{}", blockTxt);
+            // 再按 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,115 @@
+package com.fuyuanshen.global.queue;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.time.Duration;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+@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 imei) {
+        String threadName = Thread.currentThread().getName();
+        try {
+            // 执行业务逻辑
+            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("device_imei", imei)
+                    .in("online_status", 0,2)
+                    .set("online_status", 1);
+            int update = deviceMapper.update(updateWrapper);
+
+        } catch (Exception e) {
+            log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, imei, e);
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+package com.fuyuanshen.global.queue;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+
+public class MqttMessageQueueConstants {
+    public static final String MQTT_MESSAGE_QUEUE_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "mqtt:message:queue";
+    public static final String MQTT_MESSAGE_DEDUP_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "mqtt:message:dedup";
+}

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

@@ -0,0 +1,40 @@
+package com.fuyuanshen.global.queue;// ScheduledTasks.java
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.vo.OnlineStatusVo;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+@Component
+public class OnlineStatusTask {
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+    // 使用cron表达式，每分钟的第0秒执行
+    @Scheduled(cron = "0 */3 * * * ?")
+    public void cronTask() {
+        List<OnlineStatusVo> onlineStatusVos = deviceMapper.queryOnlineStatusList();
+        onlineStatusVos.forEach(item -> {
+            String onlineStatusKey = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
+            String status = RedisUtils.getCacheObject(onlineStatusKey);
+            if(StringUtils.isBlank(status) || "0".equals(status)){
+                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", item.getId());
+                updateWrapper.set("online_status", 0);
+                deviceMapper.update(updateWrapper);
+            }
+        });
+    }
+}

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

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

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

@@ -0,0 +1,142 @@
+package com.fuyuanshen.web.controller;
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.equipment.domain.vo.*;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.IWeatherService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 大屏数据
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-27 08:42
+ */
+@Tag(name = "大屏数据", description = "大屏数据")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/largeScreen")
+public class LargeScreenController {
+
+    private final IDeviceAlarmService deviceAlarmService;
+    private final DeviceService deviceService;
+    private final IWeatherService weatherService;
+
+
+    /**
+     * 获取设备总览信息
+     * 包含设备总数、在线设备数量、设备型号数量
+     */
+    @GetMapping("/getDeviceOverview")
+    public R<DeviceOverviewVo> getDeviceOverview() {
+        return R.ok(deviceService.getDeviceOverview());
+    }
+
+
+    /**
+     * 获取 实时报警信息
+     * RealtimeAlarm
+     */
+    @GetMapping("/getRealtimeAlarm")
+    public R<List<DeviceAlarmVo>> getRealtimeAlarm() {
+        return R.ok(deviceAlarmService.getRealtimeAlarm());
+    }
+
+
+    /**
+     * 获取报警统计数据
+     * 包括正在报警数量、报警总数、已处理报警数量
+     */
+    @GetMapping("/getAlarmStatistics")
+    public R<AlarmStatisticsVo> getAlarmStatistics() {
+        return R.ok(deviceAlarmService.getAlarmStatistics());
+    }
+
+
+    /**
+     * 获取最近一年每月告警统计数据
+     */
+    @GetMapping("/getMonthlyAlarmStatistics")
+    public R<MonthlyAlarmStatisticsVo> getMonthlyAlarmStatistics() {
+        return R.ok(deviceAlarmService.getMonthlyAlarmStatistics());
+    }
+
+
+    /**
+     * 获取设备通讯方式统计数据
+     * 包含通讯方式名称、设备总数、异常设备数
+     */
+    @GetMapping("/getDeviceCommunicationModeStatistics")
+    public R<List<DeviceCommunicationModeStatisticsVo>> getDeviceCommunicationModeStatistics() {
+        return R.ok(deviceService.getDeviceCommunicationModeStatistics());
+    }
+
+
+    /**
+     * 获取设备使用频次统计数据
+     *
+     * @param days 天数（近一个月传30，近半年传180）
+     */
+    @GetMapping("/getDeviceUsageFrequency")
+    public R<List<DeviceUsageFrequencyVo>> getDeviceUsageFrequency(@RequestParam int days) {
+        return R.ok(deviceService.getDeviceUsageFrequency(days));
+    }
+
+
+    /**
+     * 根据条件查询设备位置信息
+     *
+     * @param groupId    设备分组ID
+     * @param deviceType 设备类型
+     * @param deviceImei 设备IMEI
+     * @return 设备位置信息列表
+     */
+    @GetMapping("/getDeviceLocationInfo")
+    public R<List<DeviceLocationVo>> getDeviceLocationInfo(
+            @RequestParam(required = false) Long groupId,
+            @RequestParam(required = false) Long deviceType,
+            @RequestParam(required = false) String deviceImei) {
+        return R.ok(deviceService.getDeviceLocationInfo(groupId, deviceType, deviceImei));
+    }
+
+
+    /**
+     * 根据经纬度获取天气信息
+     *
+     * @param latitude  纬度
+     * @param longitude 经度
+     * @return 天气信息
+     */
+    @GetMapping("/weather")
+    public R<WeatherInfoVo> getWeatherInfo(
+            @RequestParam Double latitude,
+            @RequestParam Double longitude) {
+        if (latitude == null || longitude == null) {
+            return R.fail("经纬度参数不能为空");
+        }
+
+        // 简单的经纬度范围校验
+        if (latitude < -90 || latitude > 90 || longitude < -180 || longitude > 180) {
+            return R.fail("经纬度参数范围不正确");
+        }
+
+        WeatherInfoVo weatherInfo = weatherService.getWeatherByCoordinates(latitude, longitude);
+        if (weatherInfo != null) {
+            return R.ok(weatherInfo);
+        } else {
+            return R.fail("获取天气信息失败");
+        }
+    }
+
+
+}

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,135 @@
+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();
+    }
+
+    /**
+     * 批量上传设备logo图片
+     */
+    @PostMapping("/batchUploadLogo")
+    @FunctionAccessAnnotation("batchUploadLogo")
+    public R<Void> batchUploadLogo(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.batchUploadLogo(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,107 @@
+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/DeviceDebugController.java

@@ -0,0 +1,161 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.exception.ServiceException;
+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.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
+import com.fuyuanshen.web.domain.Dto.DeviceDebugEditDto;
+import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
+import com.fuyuanshen.web.domain.vo.DeviceInfoVo;
+import com.fuyuanshen.web.service.device.DeviceBizService;
+import com.fuyuanshen.web.service.device.DeviceDebugService;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 联调中心
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/device/debug")
+public class DeviceDebugController extends BaseController {
+
+    private final DeviceBizService appDeviceService;
+    private final DeviceXinghanBizService deviceXinghanBizService;
+    private final DeviceDebugService deviceDebugService;
+
+    /**
+     * 查询设备列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<WebDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        return appDeviceService.queryWebDeviceList(bo, pageQuery);
+    }
+
+    /**
+     * 上传文件
+     */
+    @Log(title = "批量上传文件")
+    @PostMapping("/addFile")
+    public R<Void> uploadFile(@Validated @ModelAttribute AppFileDto bo) throws IOException {
+        return toAjax(deviceDebugService.addFileHash(bo,true));
+    }
+
+    /**
+     * 操作视频添加
+     */
+    @Log(title = "批量添加操作视频")
+    @PostMapping("/addVideo")
+    public R<Void> addOperationVideo(@RequestBody AppOperationVideoBo bo) {
+        return toAjax(deviceDebugService.addVideoList(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @Log(title = "批量上传设备logo图片")
+    @PostMapping("/addLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> uploadLogo670(@Validated @ModelAttribute DeviceDebugLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        deviceXinghanBizService.uploadDeviceLogoBatch(bo);
+        return R.ok();
+    }
+
+    /**
+     * 设备详情
+     */
+    @Operation(summary = "设备详情")
+    @GetMapping(value = "/detail/{id}")
+    public R<DeviceInfoVo> getDeviceInfo(@PathVariable Long id) {
+        return R.ok(deviceDebugService.getDeviceInfo(id));
+    }
+
+    /**
+     * 修改设备联调信息
+     */
+    @Log(title = "修改设备联调信息")
+    @PostMapping("/editDebug")
+    public R<Void> editDeviceDebug(@Validated @ModelAttribute DeviceDebugEditDto bo) throws Exception {
+        // 1. 基础参数必填校验
+        validateDeviceDebugEdit(bo);
+
+        // 修改上传设备说明
+        if (bo.getExplanationFiles() != null) {
+            AppFileDto appFileDto = new AppFileDto();
+            appFileDto.setDeviceIds(new Long[]{ bo.getDeviceId() });
+            appFileDto.setFileType(1L);
+            appFileDto.setFiles(bo.getExplanationFiles());
+            deviceDebugService.addFileHash(appFileDto,false);
+        }
+        // 修改上传设备参数
+        if (bo.getParameterFiles() != null) {
+            AppFileDto appFileDto = new AppFileDto();
+            appFileDto.setDeviceIds(new Long[]{ bo.getDeviceId() });
+            appFileDto.setFileType(2L);
+            appFileDto.setFiles(bo.getParameterFiles());
+            deviceDebugService.addFileHash(appFileDto,false);
+        }
+        deviceDebugService.delFile(bo.getFileIds());
+        // 修改操作视频
+        if (bo.getVideoUrl().isEmpty()) {
+            AppOperationVideoBo appOperationVideoBo = new AppOperationVideoBo();
+            appOperationVideoBo.setDeviceIds(new Long[]{ bo.getDeviceId() });
+            appOperationVideoBo.setVideoUrl(bo.getVideoUrl());
+            deviceDebugService.addVideoList(appOperationVideoBo);
+        }
+        // 修改设备logo  每个型号设备走不同协议无法共用同一个上传
+//        if(bo.getLogoFile() != null){
+//            MultipartFile file = bo.getLogoFile();
+//            if(file.getSize()>1024*1024*2){
+//                return R.warn("图片不能大于2M");
+//            }
+//            AppDeviceLogoUploadDto bo1 = new AppDeviceLogoUploadDto();
+//            bo1.setDeviceId(bo.getDeviceId());
+//            bo1.setDeviceImei(bo.getDeviceImei());
+//            bo1.setFile(file);
+//            deviceXinghanBizService.uploadDeviceLogo(bo1);
+//        }
+
+        return R.ok();
+    }
+
+    /* ------------------ 私有复用 ------------------ */
+
+    private void validateDeviceDebugEdit(DeviceDebugEditDto bo) {
+        if (bo.getDeviceId() == null || bo.getDeviceId() == 0L) {
+            throw new ServiceException("请选择设备");
+        }
+//        if (bo.getDeviceImei().isEmpty()) {
+//            throw new ServiceException("设备 IMEI 不能为空");
+//        }
+    }
+
+}

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,105 @@
+package com.fuyuanshen.web.controller.device;
+
+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.AppDeviceShareVo;
+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 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;
+
+/**
+ * 设备分享管理
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/equipment/share")
+public class DeviceShareController extends BaseController {
+
+    private final DeviceShareService deviceShareService;
+
+
+    /**
+     * 分享管理列表
+     */
+    @GetMapping("/deviceShareList")
+    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return deviceShareService.queryWebPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 新增设备分享
+     */
+    @RepeatSubmit()
+    @PostMapping("/deviceShare")
+    public R<Void> deviceShare(@Validated(AddGroup.class) @RequestBody AppDeviceShareBo bo) {
+        return toAjax(deviceShareService.deviceShare(bo));
+    }
+
+    /**
+     * 权限管理
+     */
+    @RepeatSubmit()
+    @PostMapping("/permission")
+    public R<Void> permission(@Validated(AddGroup.class) @RequestBody AppDeviceShareBo bo) {
+        return toAjax(deviceShareService.permission(bo));
+    }
+
+    /**
+     * 移除分享用户
+     *
+     * @param ids 主键串
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceShareService.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/web/controller/device/DeviceXinghanController.java

@@ -0,0 +1,163 @@
+package com.fuyuanshen.web.controller.device;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.alibaba.fastjson.JSON;
+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.utils.StringUtils;
+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.redis.utils.RedisUtils;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
+import com.fuyuanshen.web.domain.Dto.SystemVersionDto;
+import com.fuyuanshen.web.domain.vo.DeviceXinghanDetailVo;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.Duration;
+import java.util.List;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_ALARM_MESSAGE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 设备控制类  HBY670
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/xinghan/device")
+public class DeviceXinghanController extends BaseController {
+
+    private final DeviceXinghanBizService deviceXinghanBizService;
+
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<DeviceXinghanDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                        @PathVariable Long id) {
+        return R.ok(deviceXinghanBizService.getInfo(id));
+    }
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(deviceXinghanBizService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送紧急通知
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(deviceXinghanBizService.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");
+        }
+        deviceXinghanBizService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 静电预警档位
+     * 3,2,1,0,分别表示高档/中档/低挡/关闭
+     */
+    @PostMapping("/DetectGradeSettings")
+    public R<Void> DetectGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upDetectGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @PostMapping("/LightGradeSettings")
+    public R<Void> LightGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upLightGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @PostMapping("/SOSGradeSettings")
+    public R<Void> SOSGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upSOSGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位 批量
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @PostMapping("/SOSGradeSettingsBatch")
+    public R<Void> SOSGradeSettingsBatch(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.sendCommandBatch(params,"ins_SOSGrade","SOS档位");
+        return R.ok();
+    }
+
+    /**
+     * 静止报警状态
+     * 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upShakeBitSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 版本更新
+     */
+    @SaCheckPermission("system:appVersion:up")
+    @PostMapping("/UpVersion")
+    public R<Void> VersionSettings(@RequestBody List<SystemVersionDto> params) {
+        // params 已经是 List<SystemVersionDto>
+        // 2. 转 JSON 并写 Redis，key 自己定，带个过期时间
+        String versionKey = GLOBAL_REDIS_KEY + "System:Version:Xinghan";
+        String json = JSON.toJSONString(params);          // fastjson
+        if (StringUtils.isBlank(json)) {   // hutool 工具，可用 StringUtils.isBlank 代替
+            return R.fail("信息无效");
+        }
+        // 缓存告警消息到Redis
+        RedisUtils.setCacheObject(versionKey, json, Duration.ofDays(30));
+        return R.ok();
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.equipment.domain.vo.AlarmInformationVo;
+import com.fuyuanshen.equipment.domain.vo.DataOverviewVo;
+import com.fuyuanshen.equipment.domain.vo.EquipmentClassificationVo;
+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.*;
+
+/**
+ * 首页数据
+ *
+ * @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());
+    }
+
+
+    /**
+     * 获取 设备分类
+     * DataOverview
+     */
+    @GetMapping("/getEquipmentClassification")
+    public R<EquipmentClassificationVo> getEquipmentClassification() {
+        return R.ok(deviceService.getEquipmentClassification());
+    }
+
+
+    /**
+     * 获取 报警信息
+     * DataOverview
+     */
+    @GetMapping("/getAlarmInformation")
+    public R<AlarmInformationVo> getAlarmInformation() {
+        return R.ok(deviceService.getAlarmInformation());
+    }
+
+
+    /**
+     * 获取设备使用数据
+     *
+     * @param deviceTypeId 设备ID (可选)
+     * @param range    时间范围 1:半年 2:一年
+     * @return 每月使用数据列表
+     */
+    @GetMapping("/getEquipmentUsageData/{range}")
+    public R<List<Map<String, Object>>> getEquipmentUsageData(@PathVariable Integer range,
+                                                              @RequestParam(required = false) Long deviceTypeId) {
+        return R.ok(deviceService.getEquipmentUsageData(deviceTypeId, range));
+    }
+
+
+}

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

@@ -0,0 +1,117 @@
+package com.fuyuanshen.web.controller.device;
+
+
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+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.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
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @Operation(summary = "设备操作记录")
+    @GetMapping(value = "/getOperationRecord/{deviceId}")
+    public TableDataInfo<DeviceLog> getOperationRecord(@PathVariable Long deviceId,
+                                                 @RequestParam(required = false) String startTime,
+                                                 @RequestParam(required = false) String endTime,
+                                                       PageQuery pageQuery) {
+        TableDataInfo<DeviceLog> device = deviceService.getOperationRecord(deviceId, startTime, endTime,pageQuery);
+        return device;
+    }
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @Operation(summary = "设备告警记录")
+    @GetMapping(value = "/getAlarmRecord/{deviceId}")
+    public TableDataInfo<DeviceAlarmVo> getAlarmRecord(@PathVariable Long deviceId,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime,
+                                                       PageQuery pageQuery) {
+        return deviceService.getAlarmRecord(deviceId, startTime, endTime, pageQuery);
+    }
+
+
+}
+
+

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

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

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

@@ -0,0 +1,132 @@
+package com.fuyuanshen.web.controller.device.fence;
+
+import java.util.List;
+
+import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
+import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
+import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
+import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
+import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.http.ResponseEntity;
+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.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 电子围栏
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/equipment/geoFence")
+public class DeviceGeoFenceController extends BaseController {
+
+    private final IDeviceGeoFenceService deviceGeoFenceService;
+
+
+    /**
+     * 查询电子围栏列表
+     */
+    @SaCheckPermission("fys-equipment:geoFence:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceGeoFenceVo> list(DeviceGeoFenceBo bo, PageQuery pageQuery) {
+        return deviceGeoFenceService.queryPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 导出电子围栏列表
+     */
+    @SaCheckPermission("fys-equipment:geoFence:export")
+    @Log(title = "导出电子围栏列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceGeoFenceBo bo, HttpServletResponse response) {
+        List<DeviceGeoFenceVo> list = deviceGeoFenceService.queryList(bo);
+        // 设置区域类型名称
+        list.forEach(item -> {
+            item.setAreaTypeNameByAreaType();
+            item.setIsActiveNameByIsActive(); // 添加这行来设置激活状态名称
+        });
+        ExcelUtil.exportExcel(list, "电子围栏", DeviceGeoFenceVo.class, response);
+    }
+
+
+    /**
+     * 获取电子围栏详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("fys-equipment:geoFence:query")
+    @GetMapping("/{id}")
+    public R<DeviceGeoFenceVo> getInfo(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(deviceGeoFenceService.queryById(id));
+    }
+
+    /**
+     * 新增电子围栏
+     */
+    @SaCheckPermission("fys-equipment:geoFence:add")
+    @Log(title = "电子围栏", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceGeoFenceBo bo) {
+        return toAjax(deviceGeoFenceService.insertByBo(bo));
+    }
+
+    /**
+     * 修改电子围栏
+     */
+    @SaCheckPermission("fys-equipment:geoFence:edit")
+    @Log(title = "电子围栏", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceGeoFenceBo bo) {
+        return toAjax(deviceGeoFenceService.updateByBo(bo));
+    }
+
+    /**
+     * 删除电子围栏
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("fys-equipment:geoFence:remove")
+    @Log(title = "电子围栏", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceGeoFenceService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+    /**
+     * 电子围栏-位置检查
+     *
+     * @param request
+     * @return
+     */
+    @PostMapping("/check")
+    public ResponseEntity<FenceCheckResponse> checkPosition(
+            @Valid @RequestBody FenceCheckRequest request) {
+        FenceCheckResponse response = deviceGeoFenceService.checkPosition(request);
+        return ResponseEntity.ok(response);
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/Dto/DeviceDebugEditDto.java

@@ -0,0 +1,36 @@
+package com.fuyuanshen.web.domain.Dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Data
+public class DeviceDebugEditDto {
+    /**
+     * 设备主键列表
+     */
+    private Long deviceId;
+    /**
+     * 设备 IMEI
+     */
+    //private String deviceImei;
+    /**
+     * 上传 logo 图片
+     */
+    //private MultipartFile LogoFile;        // 同一张图
+    /**
+     *  参数文件
+     */
+    private MultipartFile[] parameterFiles;
+    /**
+     *  说明文件
+     */
+    private MultipartFile[] explanationFiles;
+    /**
+     * 视频链接
+     */
+    private String videoUrl;
+
+    private List<Long> fileIds;
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/Dto/DeviceDebugLogoUploadDto.java

@@ -0,0 +1,18 @@
+package com.fuyuanshen.web.domain.Dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Data
+public class DeviceDebugLogoUploadDto {
+    /**
+     * 设备主键列表
+     */
+    private List<Long> deviceIds;      // 设备主键列表
+    /**
+     * 上传 图片
+     */
+    private MultipartFile file;        // 同一张图
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/Dto/DeviceXinghanInstructDto.java

@@ -0,0 +1,18 @@
+package com.fuyuanshen.web.domain.Dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DeviceXinghanInstructDto {
+    private Long deviceId;
+
+    private String deviceImei;
+    /**
+     *  下发指令
+     */
+    private String instructValue;
+    private Boolean isBluetooth = false;
+    private List<Long> deviceIds;
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/Dto/SystemVersionDto.java

@@ -0,0 +1,10 @@
+package com.fuyuanshen.web.domain.Dto;
+
+import lombok.Data;
+
+@Data
+public class SystemVersionDto {
+    private String dictValue;
+    private String dictLabel;
+    private String remark;
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceInfoVo.java

@@ -0,0 +1,27 @@
+package com.fuyuanshen.web.domain.vo;
+
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 设备信息 视图对象
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class DeviceInfoVo {
+    /**
+     * 设备业务文件
+     */
+    private List<AppFileVo> appBusinessFileVoList;
+    /**
+     * 设备操作视频
+     */
+    private List<AppOperationVideoVo> appOperationVideoVoList;
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceXinghanDetailVo.java

@@ -0,0 +1,103 @@
+package com.fuyuanshen.web.domain.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import lombok.Data;
+
+@Data
+public class DeviceXinghanDetailVo {
+    /**
+     * 设备ID
+     */
+    @ExcelProperty(value = "设备ID")
+    private Long deviceId;
+
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     */
+    private Integer communicationMode;
+
+    /**
+     * 设备图片
+     */
+    private String devicePic;
+
+    /**
+     * 设备类型
+     */
+    private String typeName;
+
+    /**
+     *  蓝牙名称
+     */
+    private String bluetoothName;
+
+    /**
+     * 设备状态
+     * 0 失效
+     * 1 正常
+     */
+    private Integer deviceStatus;
+
+
+    /**
+     * 人员信息
+     */
+    private AppPersonnelInfoVo personnelInfo;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    // 经度
+    private String longitude;
+
+    // 纬度
+    private String latitude;
+
+    // 逆解析地址
+    private String address;
+
+    /**
+     * 第一键值对，静电预警档位：3,2,1,0,分别表示高档/中档/低挡/关闭.
+     */
+    private Integer staDetectGrade;
+    /**
+     * 第二键值对，照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    private Integer staLightGrade;
+    /**
+     * 第三键值对，SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    public Integer staSOSGrade;
+    /**
+     * 第四键值对，剩余照明时间，0-5999，单位分钟。
+     */
+    public Integer staPowerTime;
+    /**
+     * 第五键值对，剩余电量百分比，0-100
+     */
+    public Integer staPowerPercent;
+    /**
+     * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
+     */
+    public Integer staDetectResult;
+}

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

@@ -0,0 +1,17 @@
+package com.fuyuanshen.web.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 报警类型枚举
+ */
+@AllArgsConstructor
+@Getter
+public enum AlarmTypeEnum {
+    SOS("_sos", "SOS报警"),
+    SHAKE("_shake", "静止报警");
+
+    private final String suffix;
+    private final String desc;
+}

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;
+    }
+
+}