feat(mqtt): 添加报警检查服务实现多阶段报警处理

- 实现 AlarmCheckService 提供延迟队列消费者功能
- 添加 AlarmDelayProvider 接口定义延迟检查任务
- 集成 AlarmStageConfig 支持租户配置报警阶段延迟时间
- 重构 AliyunVoiceUtil 返回完整响应对象而非字符串
- 在 AppDeviceController 中新增 AlarmList 接口查询设备告警列表
- 扩展设备相关控制器支持数据来源枚举参数传递
- 新增 Xinghan 指令控制器提供 HBY018A 设备专用接口
- 定义 DataSourceEnum 枚举区分 APP 和 Web 数据来源
- 扩展 Device 实体类增加紧急联系人和通知配置字段
- 添加 DeviceAlarm 实体类告警状态和等级属性
- 新增 DeviceContactPhoneBo 处理设备联系人信息
- 优化设备操作记录日志支持数据来源标识
- 实现设备自定义语音短信消息编辑功能
- 添加设备通知开关和紧急联系人设置接口

fys-admin/pom.xml

@@ -133,6 +133,19 @@
             <version>1.5.7</version>
             <scope>compile</scope>
         </dependency>
+        <!-- Java音频转换库 -->
+        <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-core</artifactId>
+            <version>3.3.1</version>
+        </dependency>
+
+ <!--       <dependency>
+            <groupId>ws.schild</groupId>
+            <artifactId>jave-nativebin-all</artifactId>
+            <version>3.3.1</version>
+        </dependency>-->
+
 
         <!-- skywalking 整合 logback -->
 <!--        <dependency>-->

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

@@ -0,0 +1,81 @@
+package com.fuyuanshen;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+public class SimpleQR {
+    public static void main(String[] args) throws Exception {
+        String text = "HELLO";
+        int size = 21; // 版本1的大小
+        boolean[][] qr = new boolean[size][size];
+
+        // 1. 三个定位标记
+        for (int i = 0; i < 7; i++)
+            for (int j = 0; j < 7; j++) {
+                boolean black = i == 0 || i == 6 || j == 0 || j == 6 || (i > 1 && i < 5 && j > 1 && j < 5);
+                qr[i][j] = qr[i][size - 1 - j] = qr[size - 1 - i][j] = black;
+            }
+
+        // 2. 定时图案（简化）
+        for (int i = 8; i < 13; i++) qr[i][6] = qr[6][i] = (i % 2 == 0);
+
+        // 3. 编码数据（极简编码）
+        byte[] data = text.getBytes();
+        int x = 20, y = 20, up = 1; // 从右下角开始
+        for (byte b : data)
+            for (int bit = 7; bit >= 0; bit--) {
+                while (qr[x][y] || (x == 6 && y < 9) || (y == 6 && x < 9) || (x < 9 && y < 9) ||
+                        (x < 9 && y > size - 10) || (y < 9 && x > size - 10)) {
+                    if (up > 0) {
+                        if (--y < 0) {
+                            y = 0;
+                            x -= 2;
+                            up = -1;
+                        }
+                    } else {
+                        if (++y >= size) {
+                            y = size - 1;
+                            x -= 2;
+                            up = 1;
+                        }
+                    }
+                    if (x == 6) x--;
+                }
+                qr[x][y] = ((b >> bit) & 1) == 1;
+                if (up > 0) {
+                    if (--y < 0) {
+                        y = 0;
+                        x -= 2;
+                        up = -1;
+                    }
+                } else {
+                    if (++y >= size) {
+                        y = size - 1;
+                        x -= 2;
+                        up = 1;
+                    }
+                }
+                if (x == 6) x--;
+            }
+
+        // 4. 保存图像
+        int scale = 10, margin = 4;
+        BufferedImage img = new BufferedImage(
+                size * scale + margin * 2, size * scale + margin * 2, BufferedImage.TYPE_INT_RGB);
+        for (int i = 0; i < img.getWidth(); i++)
+            for (int j = 0; j < img.getHeight(); j++)
+                img.setRGB(i, j, 0xFFFFFF); // 白色背景
+
+        for (int i = 0; i < size; i++)
+            for (int j = 0; j < size; j++)
+                if (qr[i][j])
+                    for (int di = 0; di < scale; di++)
+                        for (int dj = 0; dj < scale; dj++)
+                            img.setRGB(margin + i * scale + di, margin + j * scale + dj, 0x000000);
+
+        ImageIO.write(img, "PNG", new File("qr.png"));
+        System.out.println("二维码已生成");
+    }
+
+}

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

@@ -0,0 +1,64 @@
+package com.fuyuanshen;
+
+import com.fuyuanshen.equipment.utils.AlibabaTTSUtil;
+import com.fuyuanshen.equipment.utils.AudioProcessUtil;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-12-1518:51
+ */
+public class Text {
+    public static void main(String[] args) throws IOException {
+        String text = "简述人生观的主要内容。\n" +
+                "人生观的主要内容包括以下三个方面：\n" +
+                "1.人生目的：回答“人为什么活着”的根本问题。它规定了人生的方向，是人生观的核心。\n" +
+                "2.人生态度：回答“人应该怎样活着”的问题。它是指人们通过生活实践形成的对人生问题的一种稳定的心理倾向和基本意图。\n" +
+                "3.人生价值：回答“什么样的人生才有意义”的问题。它是指人的生命及其实践活动对于社会和个人所具有的作用和意义。\n" +
+                "人生目的、人生态度和人生价值相互联系、相辅相成，共同构成一个有机整体。\n" +
+                "人生目的是人生观的核心，它决定人生态度和人生价值的方向；人生态度影响人生目的的实现和人生价值的创造；人生价值是衡量人生观正确与否的尺度。";
+
+        AlibabaTTSUtil alibabaTTSUtil = new AlibabaTTSUtil();
+        AudioProcessUtil audioProcessUtil = new AudioProcessUtil();
+
+        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);
+//            }
+
+        // 保存WAV文件到本地
+        String savedPath = saveByteArrayToFile(pcmData, "人生观.wav");
+        if (savedPath != null) {
+            System.out.println("WAV文件已保存: " + savedPath);
+        }
+    }
+
+
+    private static String saveByteArrayToFile(byte[] data, String filename) throws IOException {
+        // 确定保存路径（可以是临时目录或指定目录）
+        String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
+        File dir = new File(directory);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+
+        // 创建完整文件路径
+        File file = new File(dir, filename);
+
+        // 写入文件
+        try (FileOutputStream fos = new FileOutputStream(file)) {
+            fos.write(data);
+        }
+
+        return file.getAbsolutePath();
+    }
+
+}

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

@@ -9,9 +9,12 @@ 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.bo.DeviceAlarmBo;
 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.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
 import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -30,8 +33,18 @@ import java.util.Map;
 public class AppDeviceController extends BaseController {
 
     private final DeviceBizService appDeviceService;
+    private final IDeviceAlarmService deviceAlarmService;
 
 
+    /**
+     * 查询设备告警列表
+     */
+    // @SaCheckPermission("equipment:alarm:list")
+    @GetMapping("/AlarmList")
+    public TableDataInfo<DeviceAlarmVo> AlarmList(DeviceAlarmBo bo, PageQuery pageQuery) {
+        return deviceAlarmService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 查询设备列表
      */

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

@@ -1,8 +1,8 @@
 package com.fuyuanshen.app.controller;
 
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
 import com.fuyuanshen.app.service.AppFileService;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.web.core.BaseController;
@@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -39,7 +40,7 @@ public class AppFileController extends BaseController {
      * 上传文件
      */
     @PostMapping("/upload")
-    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) {
+    public R<Void> upload(@Validated @ModelAttribute AppFileDto bo) throws IOException {
         return toAjax(appFileService.add(bo));
     }
 

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

@@ -1,8 +1,8 @@
 package com.fuyuanshen.app.controller;
 
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;

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

@@ -1,13 +1,20 @@
 package com.fuyuanshen.app.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.fuyuanshen.app.domain.dto.AppAudioFileDto;
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.app.domain.dto.AppFileRenameDto;
+import com.fuyuanshen.app.domain.dto.TextToSpeechRequest;
 import com.fuyuanshen.app.service.AudioProcessService;
 import com.fuyuanshen.app.service.VideoProcessService;
 import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
 import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -56,6 +63,7 @@ public class AppVideoController extends BaseController {
         return R.ok(audioProcessService.generateStandardPcmData(text));
     }
 
+
     /**
      * 提取文本内容（只支持txt/docx）
      */
@@ -64,4 +72,74 @@ public class AppVideoController extends BaseController {
     public R<String> extract(@RequestParam("file") MultipartFile file) throws Exception {
         return R.ok("Success",audioProcessService.extract(file));
     }
+
+
+    /**
+     * 上传音频文件进行处理
+     * 支持MP3、WAV、PCM格式
+     */
+    @PostMapping("/uploadAudioToOss")
+    public R<String> uploadAudioToOss(@ModelAttribute AppAudioFileDto bo) {
+        try {
+            bo.setSource("app");
+            String result = audioProcessService.uploadAudioToOss(bo);
+            return R.ok(result);
+        } catch (IllegalArgumentException e) {
+            return R.fail("文件格式错误: " + e.getMessage());
+        } catch (Exception e) {
+
+            return R.fail("上传处理失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 文本转语音
+     * 支持MP3、WAV、PCM格式
+     */
+    @PostMapping("/ttsToOss")
+    public R<String> textToSpeech(@RequestBody TextToSpeechRequest request) {
+        try {
+            if (request.getDeviceId() == null) {
+                return R.fail("设备ID不能为空");
+            }
+            if (StringUtils.isBlank(request.getText())) {
+                return R.fail("文本不能为空");
+            }
+
+            String result = audioProcessService.textToSpeech(
+                    request.getDeviceId(),
+                    request.getText(),
+                    request.getFileSuffix(),
+                    "app"
+            );
+            return R.ok(result);
+        } catch (Exception e) {
+            return R.fail("文本转语音失败: " + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 查询语音文件列表
+     */
+    @GetMapping("/queryAudioFileList")
+    public R<List<AppFileVo>> queryAudioFileList(Long deviceId) {
+        return R.ok(audioProcessService.queryAudioFileList(deviceId,"app"));
+    }
+
+    /**
+     * 删除语音文件
+     */
+    @GetMapping("/deleteAudioFile")
+    public R<Void> deleteAudioFile(Long id) {
+        return audioProcessService.deleteAudioFile(id);
+    }
+
+    /**
+     * 文件重命名
+     */
+    @PostMapping("/renameAudioFile")
+    public R<Void> renameAudioFile(@RequestBody AppFileRenameDto bo) {
+        return audioProcessService.renameAudioFile(bo);
+    }
 }

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

@@ -13,6 +13,7 @@ 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.enums.DataSourceEnum;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.equipment.service.DeviceTypeService;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * HBY670设备控制类
@@ -47,7 +49,7 @@ public class AppDeviceXinghanController extends BaseController {
     @PostMapping(value = "/registerPersonInfo")
 //    @FunctionAccessAnnotation("registerPersonInfo")
     public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(appDeviceService.registerPersonInfo(bo));
+        return toAjax(appDeviceService.registerPersonInfo(bo, DataSourceEnum.APP));
     }
 
     /**
@@ -57,7 +59,16 @@ public class AppDeviceXinghanController extends BaseController {
     @PostMapping(value = "/sendAlarmMessage")
     @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
     public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(appDeviceService.sendAlarmMessage(bo));
+        return toAjax(appDeviceService.sendAlarmMessage(bo, DataSourceEnum.APP));
+    }
+
+    /**
+     * 保存设备日志
+     */
+    @PostMapping(value = "/saveDeviceLog")
+    public R<Void> saveRecordDeviceLog(@RequestBody AppPersonnelInfoBo bo) {
+        appDeviceService.saveRecordDeviceLog(bo, DataSourceEnum.APP);
+        return R.ok();
     }
 
     /**
@@ -72,7 +83,7 @@ public class AppDeviceXinghanController extends BaseController {
         if (file.getSize() > 1024 * 1024 * 2) {
             return R.warn("图片不能大于2M");
         }
-        appDeviceService.uploadDeviceLogo(bo);
+        appDeviceService.uploadDeviceLogo(bo, DataSourceEnum.APP);
 
         return R.ok();
     }
@@ -85,7 +96,7 @@ public class AppDeviceXinghanController extends BaseController {
     @PostMapping("/DetectGradeSettings")
     public R<Void> DetectGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        appDeviceService.upDetectGradeSettings(params);
+        appDeviceService.upDetectGradeSettings(params, DataSourceEnum.APP);
         return R.ok();
     }
 
@@ -97,7 +108,7 @@ public class AppDeviceXinghanController extends BaseController {
     @PostMapping("/LightGradeSettings")
     public R<Void> LightGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        appDeviceService.upLightGradeSettings(params);
+        appDeviceService.upLightGradeSettings(params, DataSourceEnum.APP);
         return R.ok();
     }
 
@@ -109,7 +120,7 @@ public class AppDeviceXinghanController extends BaseController {
     @PostMapping("/SOSGradeSettings")
     public R<Void> SOSGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        appDeviceService.upSOSGradeSettings(params);
+        appDeviceService.upSOSGradeSettings(params, DataSourceEnum.APP);
         return R.ok();
     }
 
@@ -121,7 +132,7 @@ public class AppDeviceXinghanController extends BaseController {
     @PostMapping("/ShakeBitSettings")
     public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        appDeviceService.upShakeBitSettings(params);
+        appDeviceService.upShakeBitSettings(params, DataSourceEnum.APP);
         return R.ok();
     }
 
@@ -133,7 +144,7 @@ public class AppDeviceXinghanController extends BaseController {
     }
 
     // @Log("新增设备")
-    @Operation(summary = "新增设备")
+    @Log(title = "新增设备")
     @PostMapping(value = "/add")
     public R<Void> addDevice(@RequestBody DeviceForm deviceForm) {
         try {
@@ -144,4 +155,26 @@ public class AppDeviceXinghanController extends BaseController {
         return R.ok();
     }
 
+    @PostMapping(value = "/GetDeviceByName")
+    @Operation(summary = "通过蓝牙名/设备名称查询设备")
+    public R<Object> GetDeviceByName(@RequestBody DeviceForm deviceForm) {
+        Object device = appDeviceService.GetDeviceByName(deviceForm);
+        return R.ok(device);
+    }
+
+
+    @PostMapping(value = "/getEquipCountByType")
+    @Operation(summary = "查询某个类型下的设备总数量")
+    public R<Object> getEquipCountByType(@RequestBody DeviceForm deviceForm) {
+        Object device = appDeviceService.getEquipCountByType(deviceForm);
+        return R.ok(device);
+    }
+
+    @PostMapping(value = "/getEquipAllByType")
+    @Operation(summary = "查询某个类型下的设备")
+    public R<List<Map<String,Object>>> getEquipAllByType(@RequestBody DeviceForm deviceForm){
+        List<Map<String,Object>> list=appDeviceService.getEquipAllByType(deviceForm);
+        return R.ok(list);
+    }
+
 }

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

@@ -0,0 +1,86 @@
+package com.fuyuanshen.app.controller.device.Xinghan;
+
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+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.equipment.domain.bo.DeviceContactPhoneBo;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.DataSourceEnum;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/hby018a/device")
+public class AppHBY018AController extends BaseController {
+    private final DeviceXinghanBizService appDeviceService;
+    private final DeviceService deviceService;
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @Log(title = "xinghan指令-照明档位")
+    @PostMapping("/SideLightSettings")
+    public R<Void> SideLightSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upSideLightSettings(params, DataSourceEnum.APP);
+        return R.ok();
+    }
+
+    /**
+     * 强制报警状态
+     * 强制报警状态，0-未报警，1-正在报警。
+     */
+    @Log(title = "xinghan指令-强制报警状态")
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upShakeBitSettings(params, DataSourceEnum.APP);
+        return R.ok();
+    }
+
+    /**
+     * 自定义语音消息
+     */
+    @PostMapping("/SetVoiceMsg")
+    public R<Void> editSosVoiceMsg(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo, DataSourceEnum.APP));
+    }
+
+    /**
+     * 自定义短信消息
+     */
+    @PostMapping("/SetSmsMsg")
+    public R<Void> editSosSmsMsg(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.editSosSmsMsg(bo));
+    }
+
+    /**
+     * 设置消息通知开关
+     */
+    @PostMapping("/SetNotificationEnabled")
+    public R<Void> editNotificationEnabled(@RequestBody DeviceContactPhoneBo bo) {
+        return toAjax(appDeviceService.editNotificationEnabled(bo));
+    }
+
+    /**
+     * 添加设备紧急联系人
+     */
+    @PostMapping("/SetContactPhone")
+    public R<Void> editContactPhone(@RequestBody DeviceContactPhoneBo bo) {
+        return toAjax(appDeviceService.editContactPhone(bo));
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.fuyuanshen.app.controller.device.bjq;
+
+import com.fuyuanshen.app.domain.vo.AppDeviceHBY100JDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.controller.device.domain.dto.*;
+import com.fuyuanshen.web.service.device.DeviceHBY100JBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * HBY100J设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/hby100j/device")
+public class AppDeviceHBY100JController extends BaseController {
+
+    private final DeviceHBY100JBizService deviceHBY100JBizService;
+
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceHBY100JDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(deviceHBY100JBizService.getInfo(id));
+    }
+
+    /**
+     * 更新语音
+     */
+    @PostMapping("/updateVoice")
+    public R<Void> updateVoice(@RequestBody HBY100JUpdateVoiceDto dto) {
+        deviceHBY100JBizService.updateVoice(dto);
+        return R.ok();
+    }
+
+    /**
+     * 强制报警
+     *
+     */
+
+    @PostMapping("/forceAlarmActivation")
+    public R<Void> forceAlarmActivation(@RequestBody HBY100JForceAlarmActivationDto bo) {
+        deviceHBY100JBizService.forceAlarmActivation(bo);
+        return R.ok();
+    }
+
+    /**
+     * 语音播报
+     *
+     */
+    @PostMapping("/voiceBroadcast")
+    public R<Void> voiceBroadcast(@RequestBody HBY100JVoiceBroadcastDto params) {
+        deviceHBY100JBizService.voiceBroadcast(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 爆闪模式
+     */
+    @PostMapping("/strobeMode")
+    public R<Void> strobeMode(@RequestBody HBY100JStrobeModeDto params) {
+        deviceHBY100JBizService.strobeMode(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 灯光调节
+     */
+    @PostMapping("/lightAdjustment")
+    public R<Void> lightAdjustment(@RequestBody HBY100JLightAdjustmentDto params) {
+        deviceHBY100JBizService.lightAdjustment(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 爆闪频率
+     */
+    @PostMapping("/strobeFrequency")
+    public R<Void> strobeFrequency(@RequestBody HBY100JStrobeFrequencyDto params) {
+        deviceHBY100JBizService.strobeFrequency(params);
+        return R.ok();
+    }
+
+    /**
+     * 修改音量
+     */
+    @PostMapping("/updateVolume")
+    public R<Void> updateVolume(@RequestBody HBY100JUpdateVolumeDto params) {
+        deviceHBY100JBizService.updateVolume(params);
+        return R.ok();
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class AppAudioFileDto {
+
+    private Long deviceId;
+
+    /**
+     *  文件
+     */
+    private MultipartFile file;
+
+
+    /**
+     *  数据来源 1:app 2:web 3:其他
+     */
+    private String source;
+}

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

@@ -0,0 +1,26 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+@Data
+public class AppFileRenameDto {
+
+    private Long id;
+
+    /**
+     * 文件id
+     */
+    private Long fileId;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+}

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

@@ -0,0 +1,11 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+/**
+ * PCM生成请求实体
+ */
+@Data
+public class PcmGenerationRequest {
+    private String text;
+}

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

@@ -0,0 +1,19 @@
+package com.fuyuanshen.app.domain.dto;
+
+import lombok.Data;
+
+/**
+ * 文本转语音请求实体
+ */
+@Data
+public class TextToSpeechRequest {
+
+    private Long deviceId;
+
+    private String text;
+
+    /**
+     * 文件后缀格式
+     */
+    private String fileSuffix;
+}

fys-admin/src/main/java/com/fuyuanshen/app/http/HttpTtsClient.java

@@ -0,0 +1,133 @@
+package com.fuyuanshen.app.http;
+
+import com.alibaba.nls.client.AccessToken;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.time.Duration;
+import java.util.Base64;
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+import static cn.dev33.satoken.SaManager.log;
+
+public class HttpTtsClient {
+    
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String appKey;
+    /**
+     * 阿里云TTS服务基础URL
+     */
+    private static final String BASE_URL = "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts";
+
+    public HttpTtsClient(String accessKeyId, String accessKeySecret, String appKey) {
+        this.accessKeyId = accessKeyId;
+        this.accessKeySecret = accessKeySecret;
+        this.appKey = appKey;
+    }
+    private String refreshAccessToken() {
+        try {
+            // 调用阿里云API获取访问令牌
+            AccessToken accessToken = new AccessToken(accessKeyId, accessKeySecret);
+            accessToken.apply();
+            String token = accessToken.getToken();
+            log.info("访问令牌刷新成功");
+
+            return token;
+        } catch (Exception e) {
+            log.error("刷新访问令牌失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+    /**
+     * 使用HTTP POST方式调用阿里云TTS服务生成MP3格式语音
+     */
+    public byte[] synthesizeTextToMp3(String text,String fileSuffix) throws IOException {
+        String endpoint = "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts";
+        
+        // 构建请求体
+//        String requestBody = String.format(
+//            "{\"appkey\":\"%s\",\"text\":\"%s\",\"voice\":\"zhifeng\",\"format\":\"MP3\",\"sample_rate\":24000,\"volume\":50,\"speech_rate\":0,\"pitch_rate\":0}",
+//            appKey,
+//            text.replace("\"", "\\\"")zhide
+//        );
+
+        String token = refreshAccessToken();
+        String requestBody = "  {\n" +
+                "    \"appkey\":\""+appKey+"\",\n" +
+                "    \"voice\":\"zhide\",\n" +
+                "    \"text\":\""+text+"\",\n" +
+                "    \"token\":\""+token+"\",\n" +
+                "    \"volume\": 100,\n" +
+                "    \"pitch_rate\": 0,\n" +
+                "    \"format\":\""+fileSuffix+"\"\n" +
+                "  }";
+        
+        URL url = new URL(endpoint);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        
+        // 设置请求方法和头部
+        conn.setRequestMethod("POST");
+        conn.setRequestProperty("Content-Type", "application/json");
+        conn.setRequestProperty("Authorization", buildAuthorization());
+        conn.setRequestProperty("Content-Length", String.valueOf(requestBody.getBytes().length));
+        conn.setDoOutput(true);
+        
+        // 发送请求体
+        try (OutputStream os = conn.getOutputStream()) {
+            os.write(requestBody.getBytes("UTF-8"));
+        }
+        
+        // 读取响应
+        int responseCode = conn.getResponseCode();
+        if (responseCode == HttpURLConnection.HTTP_OK) {
+            // 读取音频数据
+            try (InputStream is = conn.getInputStream()) {
+                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+                int nRead;
+                byte[] data = new byte[1024];
+                while ((nRead = is.read(data, 0, data.length)) != -1) {
+                    buffer.write(data, 0, nRead);
+                }
+                return buffer.toByteArray();
+            }
+        } else {
+            throw new IOException("HTTP请求失败，状态码: " + responseCode);
+        }
+    }
+    
+    /**
+     * 构建授权头部
+     */
+    private String buildAuthorization() {
+        // 实际实现需要根据阿里云API规范构建签名
+        // 这里是简化示例
+        return "Bearer " + generateAccessToken();
+    }
+    
+    /**
+     * 生成访问令牌
+     */
+    private String generateAccessToken() {
+        // 实际实现需要调用阿里云获取token的API
+        return "your-access-token";
+    }
+    
+    /**
+     * 保存MP3到文件
+     */
+    public String saveMp3ToFile(String text, String outputPath) throws IOException {
+        byte[] mp3Data = synthesizeTextToMp3(text,"mp3");
+        
+        try (FileOutputStream fos = new FileOutputStream(outputPath)) {
+            fos.write(mp3Data);
+        }
+        
+        return outputPath;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/http/HttpTtsExample.java

@@ -0,0 +1,32 @@
+package com.fuyuanshen.app.http;
+
+import java.io.IOException;
+
+public class HttpTtsExample {
+
+    /**
+     *     appKey: lbGuq5K5bEH4uxmT
+     *     akId: LTAI5t66moCkhNC32TDJ5ReP
+     *     akSecret: 2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH
+     * @param args
+     */
+    public static void main(String[] args) {
+        String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
+        String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
+        String appKey = "lbGuq5K5bEH4uxmT";
+        
+        try {
+            // 使用HTTP方式调用
+            HttpTtsClient httpClient = new HttpTtsClient(accessKeyId, accessKeySecret, appKey);
+            
+            String text = "前方拥堵，请绕道而行。";
+            String outputPath = "D:\\http_output11.mp3";
+            
+            String resultFile = httpClient.saveMp3ToFile(text, outputPath);
+            System.out.println("MP3音频已保存至: " + resultFile);
+            
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/http/OkHttpTtsClient.java

@@ -0,0 +1,58 @@
+package com.fuyuanshen.app.http;
+
+import okhttp3.*;
+
+import java.io.IOException;
+
+public class OkHttpTtsClient {
+    
+    private OkHttpClient client = new OkHttpClient();
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String appKey;
+    
+    public OkHttpTtsClient(String accessKeyId, String accessKeySecret, String appKey) {
+        this.accessKeyId = accessKeyId;
+        this.accessKeySecret = accessKeySecret;
+        this.appKey = appKey;
+    }
+    
+    /**
+     * 使用OkHttp调用TTS服务
+     */
+    public byte[] synthesizeTextToMp3(String text) throws IOException {
+        MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+        
+        String jsonPayload = String.format(
+            "{\"appkey\":\"%s\",\"text\":\"%s\",\"voice\":\"zhifeng\",\"format\":\"MP3\",\"sample_rate\":24000,\"volume\":50,\"speech_rate\":0,\"pitch_rate\":0}",
+            appKey,
+            text.replace("\"", "\\\"")
+        );
+        
+        RequestBody body = RequestBody.create(JSON,jsonPayload);
+        Request request = new Request.Builder()
+            .url("https://nls-gateway.cn-shanghai.aliyuncs.com/v1/tts")
+            .post(body)
+            .addHeader("Content-Type", "application/json")
+            .addHeader("Authorization", "Bearer " + getAccessToken())
+            .build();
+        
+        try (Response response = client.newCall(request).execute()) {
+            if (!response.isSuccessful()) {
+                throw new IOException("HTTP请求失败: " + response.code());
+            }
+            
+            ResponseBody responseBody = response.body();
+            if (responseBody != null) {
+                return responseBody.bytes();
+            } else {
+                throw new IOException("响应体为空");
+            }
+        }
+    }
+    
+    private String getAccessToken() {
+        // 实现获取访问令牌的逻辑
+        return "your-access-token";
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/app/http/TokenClient.java

@@ -0,0 +1,48 @@
+package com.fuyuanshen.app.http;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * 获取阿里云TTS服务访问令牌
+ */
+public class TokenClient {
+    
+    public static String getAccessToken(String accessKeyId, String accessKeySecret) throws IOException {
+        String endpoint = "https://nls-meta.cn-shanghai.aliyuncs.com/v1/token";
+        
+        URL url = new URL(endpoint);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        
+        conn.setRequestMethod("POST");
+        conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+        conn.setDoOutput(true);
+        
+        // 发送认证信息
+        String params = String.format("grant_type=client_credentials&client_id=%s&client_secret=%s", 
+                                     accessKeyId, accessKeySecret);
+        
+        try (OutputStream os = conn.getOutputStream()) {
+            os.write(params.getBytes("UTF-8"));
+        }
+        
+        int responseCode = conn.getResponseCode();
+        if (responseCode == HttpURLConnection.HTTP_OK) {
+            try (InputStream is = conn.getInputStream();
+                 BufferedReader reader = new BufferedReader(new InputStreamReader(is))) {
+                
+                StringBuilder response = new StringBuilder();
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    response.append(line);
+                }
+                
+                // 解析响应获取token（实际需要使用JSON解析库）
+                return response.toString().replaceAll(".*\"access_token\":\"([^\"]+)\".*", "$1");
+            }
+        } else {
+            throw new IOException("获取令牌失败，状态码: " + responseCode);
+        }
+    }
+}

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

@@ -227,7 +227,7 @@ public class AppDeviceShareService {
             appDeviceShare.setPermission(bo.getPermission());
             appDeviceShare.setCreateBy(userId);
             return appDeviceShareMapper.insert(appDeviceShare);
-        }
+}
     }
 
     public int remove(Long[] ids) {

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

@@ -1,13 +1,15 @@
 package com.fuyuanshen.app.service;
 
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.oss.core.OssClient;
 import com.fuyuanshen.common.oss.factory.OssFactory;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +17,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -31,24 +34,38 @@ public class AppFileService {
 
     private final IAppBusinessFileService appBusinessFileService;
 
+    private final FileHashUtil fileHashUtil;
+    private final ISysOssService ossService;
+
+
     public List<AppFileVo> list(AppBusinessFileBo bo) {
 //        bo.setCreateBy(AppLoginHelper.getUserId());
         return appBusinessFileService.queryAppFileList(bo);
     }
 
-    public Boolean add(AppFileDto bo) {
+
+    /**
+     * APP文件上传
+     */
+    public Boolean add(AppFileDto bo) throws IOException {
 
         MultipartFile[] files = bo.getFiles();
-        if(files == null || files.length == 0){
+        if (files == null || files.length == 0) {
             throw new ServiceException("请选择要上传的文件");
         }
-        if(files.length > 5){
+        if (files.length > 5) {
             throw new ServiceException("最多只能上传5个文件");
         }
         for (int i = 0; i < files.length; i++) {
             MultipartFile file = files[i];
             // 上传文件
-            SysOssVo upload = sysOssService.upload(file);
+            // SysOssVo upload = sysOssService.upload(file);
+            String fileHash = fileHashUtil.hash(file);
+            SysOssVo upload = ossService.updateHash(file, fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
 
             if (upload == null) {
                 return false;
@@ -66,6 +83,7 @@ public class AppFileService {
         return true;
     }
 
+
     public Boolean delete(Long[] ids) {
         AppBusinessFileBo bo = new AppBusinessFileBo();
 //        bo.setCreateBy(AppLoginHelper.getUserId());

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

@@ -4,6 +4,11 @@ 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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
 import com.fuyuanshen.app.domain.vo.AppRoleVo;
 import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.common.core.constant.Constants;
@@ -23,6 +28,8 @@ import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.common.tenant.exception.TenantException;
 import com.fuyuanshen.common.tenant.helper.TenantHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.system.domain.vo.SysTenantVo;
 import com.fuyuanshen.system.service.ISysTenantService;
 import lombok.RequiredArgsConstructor;
@@ -33,6 +40,7 @@ import org.springframework.stereotype.Service;
 import java.time.Duration;
 import java.util.*;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * 登录校验方法
@@ -52,6 +60,9 @@ public class AppLoginService {
 
     private final ISysTenantService tenantService;
     private final IAppUserService appUserService;
+    private final IAppDeviceShareService appDeviceShareService;
+    private final IAppDeviceBindRecordService appDeviceBindRecordService;
+    private final DeviceService deviceService;
 
 
     /**
@@ -188,10 +199,46 @@ public class AppLoginService {
     public void cancelAccount() {
         try {
             AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+//            AppLoginUser loginUser = new AppLoginUser();
+//            loginUser.setUserId(1988398584423133187L);
+//            loginUser.setUsername("19022528079");
             if (ObjectUtil.isNull(loginUser)) {
                 return;
             }
             appUserService.deleteWithValidByIds(Collections.singletonList(loginUser.getUserId()),true);
+
+            AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo();
+            appDeviceBindRecordBo.setBindingUserId(loginUser.getUserId());
+            List<AppDeviceBindRecordVo> appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo);
+            if(ObjectUtil.length(appDeviceBindRecordVos)>0){
+
+
+                Set<Long> deviceIds = appDeviceBindRecordVos.stream().map(AppDeviceBindRecordVo::getDeviceId).collect(Collectors.toSet());
+                appDeviceShareService.deleteByDeviceIds(deviceIds);
+
+
+                List<Long> ids = appDeviceBindRecordVos.stream()
+                        .map(AppDeviceBindRecordVo::getId)
+                        .collect(Collectors.toList());
+                appDeviceBindRecordService.deleteWithValidByIds(ids, true);
+                log.info("删除绑定关系表数据：ids={}",ids);
+
+
+                // 检查设备id是否存在绑定关系
+                for (Long deviceId : deviceIds){
+                    // 根据设备id查询是否存在绑定关系
+                    Long count = appDeviceBindRecordService.checkDeviceExistBindRecord(deviceId);
+                    UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                    updateWrapper.eq("id",deviceId);
+                    if(count>0){
+                        updateWrapper.set("binding_status",1);
+                    }else{
+                        updateWrapper.set("binding_status",0);
+                    }
+                    deviceService.update(updateWrapper);
+                }
+            }
+
             if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
                 // 超级管理员 登出清除动态租户
                 TenantHelper.clearDynamic();

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

@@ -1,9 +1,30 @@
 package com.fuyuanshen.app.service;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
+import com.fuyuanshen.app.domain.dto.AppAudioFileDto;
+import com.fuyuanshen.app.domain.dto.AppFileRenameDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
+import com.fuyuanshen.app.http.HttpTtsClient;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.mapper.AppBusinessFileMapper;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
 import com.fuyuanshen.equipment.utils.AlibabaTTSUtil;
 import com.fuyuanshen.equipment.utils.AudioProcessUtil;
+import com.fuyuanshen.equipment.utils.FileHashUtil;
+import com.fuyuanshen.equipment.utils.Mp3Duration;
+import com.fuyuanshen.global.mqtt.utils.FfmpegVolumeUtil;
+import com.fuyuanshen.global.mqtt.utils.FfmpegVolumeUtil3;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -16,9 +37,12 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
+import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -39,6 +63,22 @@ public class AudioProcessService {
     private final AudioProcessUtil audioProcessUtil;
     private final AlibabaTTSUtil alibabaTTSUtil;
 
+    private final FileHashUtil fileHashUtil;
+    private final ISysOssService ossService;
+    private final IAppBusinessFileService appBusinessFileService;
+    private final AppBusinessFileMapper appBusinessFileMapper;
+    private final IAppDeviceBindRecordService appDeviceBindRecordService;
+
+//    String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
+//    String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
+//    String appKey = "lbGuq5K5bEH4uxmT";
+    @Value("${alibaba.tts.appKey}")
+    private String appKey;
+    @Value("${alibaba.tts.akId}")
+    private String accessKeyId;
+    @Value("${alibaba.tts.akSecret}")
+    private String accessKeySecret;
+
     /**
      * 处理上传的音频文件
      */
@@ -158,7 +198,7 @@ public class AudioProcessService {
 
     private String saveByteArrayToFile(byte[] data, String filename) throws IOException {
         // 确定保存路径（可以是临时目录或指定目录）
-        String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
+        String directory = System.getProperty("java.io.tmpdir");// 使用系统临时目录
         File dir = new File(directory);
         if (!dir.exists()) {
             dir.mkdirs();
@@ -172,9 +212,32 @@ public class AudioProcessService {
             fos.write(data);
         }
 
+
         return file.getAbsolutePath();
     }
 
+    private String saveByteArrayToFile(InputStream inputStream, String filename) throws IOException {
+        // 确定保存路径（可以是临时目录或指定目录）
+        String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
+        File dir = new File(directory);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+
+        // 创建完整文件路径
+        File file = new File(dir, filename);
+
+        // 从输入流读取数据并写入文件
+        try (FileOutputStream fos = new FileOutputStream(file);
+             InputStream is = inputStream) {
+            byte[] buffer = new byte[8192]; // 8KB缓冲区
+            int bytesRead;
+            while ((bytesRead = is.read(buffer)) != -1) {
+                fos.write(buffer, 0, bytesRead);
+            }
+        }
+        return file.getAbsolutePath();
+    }
 
 
     /**
@@ -305,4 +368,234 @@ public class AudioProcessService {
     }
 
 
+    public String uploadAudioToOss(AppAudioFileDto bo) {
+        MultipartFile file = bo.getFile();
+        // 校验文件格式和大小
+        validateAudioFileForRestful(file);
+        // 上传文件
+        // SysOssVo upload = sysOssService.upload(file);
+        String filename = file.getOriginalFilename();
+        String savedPath = null;
+        try {
+            String fileHash = fileHashUtil.hash(file);
+            SysOssVo upload = ossService.updateHash(file, fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            String fileSuffix = filename.substring(filename.lastIndexOf('.')).toLowerCase();
+            AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
+            appBusinessFileBo.setFileId(upload.getOssId());
+            appBusinessFileBo.setBusinessId(bo.getDeviceId());
+            appBusinessFileBo.setFileType(3L);
+            Long userId = getUserId(bo.getSource(), bo.getDeviceId());
+            appBusinessFileBo.setCreateBy(userId);
+            savedPath = saveByteArrayToFile(file.getInputStream(), generateRandomFileName(fileSuffix));
+            if (savedPath != null) {
+                log.info("MP3文件已保存: {}", savedPath);
+                Integer mp3Duration = Mp3Duration.getMp3Duration(savedPath);
+                log.info("MP3文件时长: {} 秒", mp3Duration);
+                appBusinessFileBo.setDuration(mp3Duration);
+            }
+            appBusinessFileService.insertByBo(appBusinessFileBo);
+            if (upload != null) {
+                return upload.getUrl();
+            }
+        } catch (Exception e){
+            log.error("上传音频文件失败", e);
+        }finally {
+            log.info("删除临时文件: {}", savedPath);
+            if(savedPath != null){
+                deleteTempFile(new File(savedPath));
+            }
+        }
+
+        return null;
+    }
+
+    private Long getUserId(String source,Long deviceId){
+        if("app".equals( source)){
+            return AppLoginHelper.getUserId();
+        } else if ("web".equals( source)){
+//            AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo();
+//            appDeviceBindRecordBo.setDeviceId(deviceId);
+////            appDeviceBindRecordBo.setCommunicationMode(0);
+//            List<AppDeviceBindRecordVo> appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo);
+//            if (appDeviceBindRecordVos != null && !appDeviceBindRecordVos.isEmpty()){
+//                userId = appDeviceBindRecordVos.get(0).getBindingUserId();
+//            }
+        }
+        return 0L;
+    }
+    /**
+     * 校验音频文件格式
+     */
+    private void validateAudioFileForRestful(MultipartFile file) {
+        if (file == null || file.isEmpty()) {
+            throw new IllegalArgumentException("上传文件不能为空");
+        }
+
+        String originalFilename = file.getOriginalFilename();
+        if (originalFilename == null) {
+            throw new IllegalArgumentException("文件名不能为空");
+        }
+        List<String> SUPPORTED_FORMATS = Arrays.asList(
+                ".wav", ".mp3", ".pcm"
+        );
+
+        String ext = originalFilename.substring(originalFilename.lastIndexOf('.')).toLowerCase();
+        // 检查文件扩展名
+        if (!SUPPORTED_FORMATS.contains(ext)) {
+            throw new IllegalArgumentException("只允许上传MP3、WAV、PCM格式的音频文件");
+        }
+
+        long fileSize = 256 * 1024;
+        // 检查文件大小
+        if (file.getSize() > fileSize) {
+            throw new IllegalArgumentException("音频大小不能超过256kb");
+        }
+    }
+
+    /**
+     * 判断文件是否为支持的音频格式
+     */
+    private boolean isSupportedFormat(String filename) {
+        if (filename == null || filename.lastIndexOf('.') == -1) {
+            return false;
+        }
+        String ext = filename.substring(filename.lastIndexOf('.')).toLowerCase();
+        return SUPPORTED_FORMATS.contains(ext);
+    }
+
+    public String textToSpeech(Long deviceId,String text, String fileSuffix,String source) {
+        //支持PCM/WAV/MP3格式
+        if (fileSuffix == null || fileSuffix.isEmpty()) {
+            fileSuffix = "mp3";
+        }
+        fileSuffix = fileSuffix.toLowerCase();
+        List<String> SUPPORTED_FORMATS = Arrays.asList(
+                "wav", "mp3", "pcm"
+        );
+        boolean contains = SUPPORTED_FORMATS.contains(fileSuffix);
+        if (!contains) {
+            throw new IllegalArgumentException("不支持的音频格式");
+        }
+//        String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
+//        String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
+//        String appKey = "lbGuq5K5bEH4uxmT";
+        String savedPath = null;
+        String savedMp3VolumePath = null;
+        try {
+            // 使用HTTP方式调用
+            HttpTtsClient httpClient = new HttpTtsClient(accessKeyId, accessKeySecret, appKey);
+//
+            byte[] mp3Data = httpClient.synthesizeTextToMp3(text,fileSuffix);
+//            byte[] mp3Data = alibabaTTSUtil.synthesizeTextToMp3(text,fileSuffix);
+
+
+            AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
+
+            savedPath = saveByteArrayToFile(mp3Data, generateRandomFileName(fileSuffix));
+
+            Integer mp3Duration = getMp3Duration2(savedPath);
+            appBusinessFileBo.setDuration(mp3Duration);
+
+            String directory = System.getProperty("java.io.tmpdir"); // 使用系统临时目录
+            String fileName = generateRandomFileName(fileSuffix);
+            savedMp3VolumePath = directory + "/" + fileName;
+            log.info("保存MP3文件: {}", savedMp3VolumePath);
+            FfmpegVolumeUtil.increaseMp3Volume(savedPath, savedMp3VolumePath, 8);
+
+            File file = new File(savedMp3VolumePath);
+            String fileHash = fileHashUtil.getFileHash(file,"SHA-256");
+            SysOssVo upload = ossService.updateHash(file, fileHash);
+
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+
+            appBusinessFileBo.setFileId(upload.getOssId());
+            appBusinessFileBo.setBusinessId(deviceId);
+            appBusinessFileBo.setFileType(3L);
+            Long userId = getUserId(source, deviceId);
+            appBusinessFileBo.setCreateBy(userId);
+            appBusinessFileService.insertByBo(appBusinessFileBo);
+            if (upload != null) {
+                return upload.getUrl();
+            }
+        } catch (Exception e){
+            log.error("上传音频文件失败", e);
+        } finally {
+            log.info("删除savedPath临时文件: {}", savedPath);
+            if(savedPath != null){
+                deleteTempFile(new File(savedPath));
+            }
+            if(savedMp3VolumePath != null){
+                log.info("删除savedMp3VolumePath临时文件: {}", savedMp3VolumePath);
+                deleteTempFile(new File(savedMp3VolumePath));
+            }
+        }
+        return null;
+    }
+
+    private Integer getMp3Duration2(String savedPath) {
+        if (savedPath != null) {
+            log.info("MP3文件已保存: {}", savedPath);
+            Integer mp3Duration = Mp3Duration.getMp3Duration(savedPath);
+            log.info("MP3文件时长: {} 秒", mp3Duration);
+            return  mp3Duration;
+        }
+        return 0;
+    }
+
+    private static final Random random = new Random();
+    private static final DateTimeFormatter formatter =
+            DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+    /**
+     * 生成纯随机文件名（无原文件名依赖）
+     */
+    public static String generateRandomFileName(String extension) {
+        String timestamp = LocalDateTime.now().format(formatter);
+        int randomNum = random.nextInt(10000);
+        String uuidPart = UUID.randomUUID().toString().substring(0, 8);
+
+        if (!extension.startsWith(".")) {
+            extension = "." + extension;
+        }
+
+        return timestamp+extension;
+    }
+
+    public List<AppFileVo> queryAudioFileList(Long deviceId,String source) {
+        if(deviceId == null){
+            return null;
+        }
+
+        Long userId = getUserId(source, deviceId);
+        AppBusinessFileBo bo = new AppBusinessFileBo();
+        bo.setBusinessId(deviceId);
+        bo.setFileType(3L);
+        if("web".equals(source)){
+            bo.setCreateBy(null);
+        }else{
+            bo.setCreateBy(userId);
+        }
+        return appBusinessFileService.queryAppFileList(bo);
+    }
+
+    public R<Void> deleteAudioFile(Long id) {
+        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",id);
+        appBusinessFileMapper.delete(updateWrapper);
+        return R.ok();
+    }
+
+    public R<Void> renameAudioFile(AppFileRenameDto bo) {
+        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id",bo.getId());
+        updateWrapper.set("re_name",bo.getFileName());
+        appBusinessFileMapper.update(updateWrapper);
+        return R.ok();
+    }
 }

fys-admin/src/main/java/com/fuyuanshen/global/Provider/AlarmDelayProvider.java

@@ -0,0 +1,10 @@
+package com.fuyuanshen.global.Provider;
+
+public interface AlarmDelayProvider {
+    /**
+     * 发送延迟检查任务
+     * @param alarmId 报警表主键ID
+     * @param delayInSeconds 延迟秒数（如 180）
+     */
+    void sendDelayCheck(Long alarmId, long delayInSeconds);
+}

fys-admin/src/main/java/com/fuyuanshen/global/Provider/RedissonAlarmDelayProvider.java

@@ -0,0 +1,47 @@
+package com.fuyuanshen.global.Provider;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBlockingQueue;
+import org.redisson.api.RDelayedQueue;
+import org.redisson.api.RedissonClient;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Primary
+@RequiredArgsConstructor
+@Slf4j
+public class RedissonAlarmDelayProvider implements AlarmDelayProvider {
+
+    private final RedissonClient redissonClient;
+    public static final String QUEUE_NAME = "PROD:ALARM:DELAY:CHECK";
+
+    private RDelayedQueue<Long> delayedQueue;
+
+    @PostConstruct
+    public void init() {
+        // 初始化一次，内部转移任务会持续运行
+        RBlockingQueue<Long> blockingQueue = redissonClient.getBlockingQueue(QUEUE_NAME);
+        delayedQueue = redissonClient.getDelayedQueue(blockingQueue);
+        log.info("Redisson 延迟报警队列初始化完成：{}", QUEUE_NAME);
+    }
+
+    @Override
+    public void sendDelayCheck(Long alarmId, long delayInSeconds) {
+        // 复用已初始化的实例，避免创建多余对象
+        delayedQueue.offer(alarmId, delayInSeconds, TimeUnit.SECONDS);
+    }
+
+    @PreDestroy
+    public void destroy() {
+        log.info("正在销毁 Redisson 延迟报警队列...");
+        if (delayedQueue != null) {
+            delayedQueue.destroy();   // 释放后台任务和资源
+        }
+    }
+}

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

@@ -1,9 +1,5 @@
 package com.fuyuanshen.global.mqtt.base;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import java.util.Comparator;
@@ -16,9 +12,9 @@ import java.util.List;
 @Component
 public class MqttRuleEngine {
 
-    @Autowired
-    @Qualifier("threadPoolTaskExecutor")
-    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+//    @Autowired
+//    @Qualifier("threadPoolTaskExecutor")
+//    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     private final LinkedHashMap<String, MqttMessageRule> rulesMap = new LinkedHashMap<>();
 
@@ -41,7 +37,8 @@ public class MqttRuleEngine {
         int commandType = context.getCommandType();
         MqttMessageRule mqttMessageRule = rulesMap.get("Light_" + commandType);
         if (mqttMessageRule != null) {
-            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
+//            threadPoolTaskExecutor.execute(() -> mqttMessageRule.execute(context));
+            mqttMessageRule.execute(context);
             return true;
         }
 

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

@@ -0,0 +1,56 @@
+package com.fuyuanshen.global.mqtt.config;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fuyuanshen.common.mybatis.helper.DataBaseHelper;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.system.domain.SysDictData;
+import com.fuyuanshen.system.mapper.SysDictDataMapper;
+import jakarta.annotation.PostConstruct;
+import lombok.Getter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.annotation.SessionScope;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Component
+public class AlarmStageConfig {
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
+
+    // 租户ID -> (阶段编号 -> 延迟秒数)
+    private final Map<String, Map<Integer, Long>> tenantConfigCache = new ConcurrentHashMap<>();
+
+    public int getTotalStages(String tenantId) {
+        return getConfig(tenantId).size();
+    }
+
+    public long getDelayByStage(String tenantId, int stage) {
+        return getConfig(tenantId).getOrDefault(stage, 5 * 60L);
+    }
+
+    private Map<Integer, Long> getConfig(String tenantId) {
+        if (tenantId == null || tenantId.isBlank()) {
+            throw new IllegalArgumentException("租户ID不能为空");
+        }
+        return tenantConfigCache.computeIfAbsent(tenantId, this::loadConfigForTenant);
+    }
+
+    private Map<Integer, Long> loadConfigForTenant(String tenantId) {
+        // 显式使用租户ID作为查询条件，不依赖任何 ThreadLocal
+        List<SysDictData> delays = dictDataMapper.selectList(
+                new LambdaQueryWrapper<SysDictData>()
+                        .eq(SysDictData::getDictType, "alarm_stage_delay")
+                        .eq(SysDictData::getTenantId, tenantId)   // 假设实体有 getTenantId 字段
+                        .orderByAsc(SysDictData::getDictSort)
+        );
+        Map<Integer, Long> config = new HashMap<>();
+        for (SysDictData d : delays) {
+            config.put(d.getDictSort(), Long.parseLong(d.getDictValue()));
+        }
+        return config;
+    }
+}

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

@@ -10,17 +10,38 @@ import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 
 @Configuration
 public class MqttConfiguration {
+
     @Autowired
     private MqttPropertiesConfig mqttPropertiesConfig;
-    /**  创建连接工厂 **/
+
+
+    /**
+     * 创建连接工厂
+     **/
     @Bean
-    public MqttPahoClientFactory mqttPahoClientFactory(){
+    public MqttPahoClientFactory mqttPahoClientFactory() {
         DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
         MqttConnectOptions options = new MqttConnectOptions();
-        options.setCleanSession(true); //设置新会话
-        options.setUserName(mqttPropertiesConfig.getUsername());
-        options.setPassword(mqttPropertiesConfig.getPassword().toCharArray());
-        options.setServerURIs(new String[]{mqttPropertiesConfig.getUrl()});
+        options.setCleanSession(true); // 设置新会话
+
+        // 修复用户名为null时的空指针异常
+        String username = mqttPropertiesConfig.getUsername();
+        if (username != null) {
+            options.setUserName(username);
+        }
+
+        // 修复密码为null时的空指针异常
+        String password = mqttPropertiesConfig.getPassword();
+        if (password != null) {
+            options.setPassword(password.toCharArray());
+        }
+
+        // 修复URL为null时的空指针异常
+        String url = mqttPropertiesConfig.getUrl();
+        if (url != null) {
+            options.setServerURIs(new String[]{url});
+        }
+
         options.setAutomaticReconnect(true); // 启用自动重连
         options.setConnectionTimeout(10); // 设置连接超时时间
         options.setKeepAliveInterval(60); // 设置心跳间隔

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

@@ -39,11 +39,17 @@ public class MqttInboundConfiguration {
     public MessageProducer messageProducer(){
         // 生成一个不重复的随机数
         String clientId = mqttPropertiesConfig.getSubClientId() + "_" + UUID.fastUUID();
+        // 修复URL为null时的空指针异常
+        String url = mqttPropertiesConfig.getUrl();
+        if (url == null) {
+            throw new IllegalStateException("MQTT服务器URL未配置");
+        }
+        String subTopic = mqttPropertiesConfig.getSubTopic();
         MqttPahoMessageDrivenChannelAdapter mqttPahoMessageDrivenChannelAdapter = new MqttPahoMessageDrivenChannelAdapter(
-                mqttPropertiesConfig.getUrl(),
+                url,
                 clientId,
                 mqttPahoClientFactory,
-                mqttPropertiesConfig.getSubTopic().split(",")
+                subTopic.split(",")
         );
         mqttPahoMessageDrivenChannelAdapter.setQos(1);
         mqttPahoMessageDrivenChannelAdapter.setConverter(new DefaultPahoMessageConverter());

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

@@ -15,11 +15,14 @@ import org.springframework.messaging.MessageHandler;
 @Configuration
 @Slf4j
 public class MqttOutboundConfiguration {
+
     @Autowired
     private MqttPropertiesConfig mqttPropertiesConfig;
+
     @Autowired
     private MqttPahoClientFactory mqttPahoClientFactory;
 
+
     // 消息通道
     @Bean
     public MessageChannel mqttOutboundChannel(){
@@ -32,13 +35,19 @@ public class MqttOutboundConfiguration {
     @ServiceActivator(inputChannel = "mqttOutboundChannel")  // 指定处理器针对哪个通道的消息进行处理
     public MessageHandler mqttOutboundMessageHandler(){
         String clientId = mqttPropertiesConfig.getPubClientId() + "_" + UUID.fastUUID();
+        // 修复URL为null时的空指针异常
+        String url = mqttPropertiesConfig.getUrl();
+        if (url == null) {
+            throw new IllegalStateException("MQTT服务器URL未配置");
+        }
+        
         MqttPahoMessageHandler mqttPahoMessageHandler = new MqttPahoMessageHandler(
-                mqttPropertiesConfig.getUrl(),
+                url,
                 clientId,
                 mqttPahoClientFactory
         );
         mqttPahoMessageHandler.setDefaultQos(1);
-        mqttPahoMessageHandler.setDefaultTopic("B/#");
+        mqttPahoMessageHandler.setDefaultTopic(mqttPropertiesConfig.getPubTopic());
         mqttPahoMessageHandler.setAsync(true);
         return mqttPahoMessageHandler;
     }

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

@@ -14,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/config/RegisEquipMqttInboundConfiguration.java

@@ -0,0 +1,69 @@
+package com.fuyuanshen.global.mqtt.config;
+
+
+import cn.hutool.core.lang.UUID;
+//import com.fuyuanshen.global.mqtt.receiver.NewReceiverMessageHandler;
+import com.fuyuanshen.global.mqtt.receiver.RegisEquipReceiverMessageHandler;
+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 RegisEquipMqttInboundConfiguration {
+    @Autowired
+    private MqttPropertiesConfig mqttPropertiesConfig;
+    @Autowired
+    private MqttPahoClientFactory mqttPahoClientFactory;
+    @Autowired
+    private RegisEquipReceiverMessageHandler receiverMessageHandler3;
+    //消息通道
+    @Bean
+    public MessageChannel messageInboundChannel3(){
+        return new DirectChannel();
+    }
+ 
+    /**
+     * 配置入站适配器
+     * 作用： 设置订阅主题，以及指定消息的通道 等相关属性
+     * */
+    @Bean
+    public MessageProducer messageProducer3(){
+        // 生成一个不重复的随机数
+        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(messageInboundChannel3());
+        return mqttPahoMessageDrivenChannelAdapter;
+    }
+    /**  指定处理消息来自哪个通道 */
+    @Bean
+    @ServiceActivator(inputChannel = "messageInboundChannel3")
+    public MessageHandler messageHandler3(){
+        return receiverMessageHandler3;
+    }
+
+    // @Bean
+    // @ServiceActivator(inputChannel = "messageInboundChannel") // 确保通道名称正确
+    // public MessageHandler deviceAlarmMessageHandler() {
+    //     return new DeviceAlrmMessageHandler();
+    // }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/RegisEquipMqttOutboundConfiguration.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 RegisEquipMqttOutboundConfiguration {
+    @Autowired
+    private MqttPropertiesConfig mqttPropertiesConfig;
+    @Autowired
+    private MqttPahoClientFactory mqttPahoClientFactory;
+ 
+    // 消息通道
+    @Bean
+    public MessageChannel mqttOutboundChannel3(){
+        return new DirectChannel();
+    }
+
+
+    /** 配置出站消息处理器 */
+    @Bean
+    @ServiceActivator(inputChannel = "mqttOutboundChannel3")  // 指定处理器针对哪个通道的消息进行处理
+    public MessageHandler mqttOutboundMessageHandler3(){
+        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

@@ -1,6 +1,7 @@
 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";
@@ -52,4 +53,5 @@ public class DeviceRedisKeyConstants {
      * 告警信息
      */
     public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
+
 }

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

@@ -36,7 +36,6 @@ public class LightingCommandTypeConstants {
      */
     public static final String SEND_MESSAGE = "Light_6";
 
-
     /**
      * 报警模式
      */

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

@@ -13,4 +13,5 @@ public interface MqttConstants {
      */
     String GLOBAL_SUB_KEY = "A/";
 
+    String GLOBAL_PUB_KEY2 = "command/";
 }

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

@@ -1,20 +1,22 @@
 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

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

@@ -0,0 +1,125 @@
+//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");
+//        // 执行业务逻辑
+//        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);
+//        }
+////        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

@@ -6,12 +6,12 @@ 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.*;
 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;
@@ -21,6 +21,7 @@ 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;
 
@@ -31,6 +32,9 @@ public class ReceiverMessageHandler implements MessageHandler {
     @Autowired
     private MqttRuleEngine ruleEngine;
 
+    @Autowired
+    private NewMqttRuleEngine newRuleEngine;
+
     @Override
     public void handleMessage(Message<?> message) throws MessagingException {
         Object payload = message.getPayload();
@@ -46,49 +50,110 @@ public class ReceiverMessageHandler implements MessageHandler {
         if (receivedTopic == null || payloadDict == null) {
             return;
         }
+
+        // 模版格式匹配
+        boolean flag = checkTemplateFormatMatching(payloadDict);
+
+
         String[] subStr = receivedTopic.split("/");
-        String deviceImei = subStr[1];
-        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));
+        String deviceImei = null;
+        if(flag){
+            deviceImei = payloadDict.getStr("imei");
+        } else {
+            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);
+                // 新的通信协议
+                if(flag){
+                    String[] topicArr = receivedTopic.split("/");
+                    String funcType = payloadDict.getStr("funcType");
+                    NewMqttRuleContext context = new NewMqttRuleContext();
+                    context.setCommandType(topicArr[2]+"_"+funcType);
+                    context.setDeviceImei(deviceImei);
+                    context.setPayloadDict(payloadDict);
 
-            boolean ruleExecuted = ruleEngine.executeRule(context);
+                    boolean ruleExecuted = newRuleEngine.executeRule(context);
 
-            if (!ruleExecuted) {
-                log.warn("未找到匹配的规则来处理命令类型: {}", val1);
+                    if (!ruleExecuted) {
+                        log.warn("未找到匹配的规则来处理命令类型: {}", topicArr[2] + " : " +funcType);
+                    }
+                    return;
+                }
+
+                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);
+                    }
+                    return;
+                }
+
+                /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
+                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获取锁失败，请稍后再试");
             }
-        }
-
-        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
-        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);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        } finally {
+            // 释放锁
+            if (lock.isHeldByCurrentThread()) {
+                lock.unlock();
             }
         }
     }
 
+    private boolean checkTemplateFormatMatching(Dict payloadDict) {
+        // 检查是否包含指定的 key
+        boolean hasImei = payloadDict.containsKey("imei");
+        boolean hasFuncType = payloadDict.containsKey("funcType");
+        boolean hasStatus = payloadDict.containsKey("status");
+        boolean hasTimestamp = payloadDict.containsKey("timestamp");
+        boolean hasData = payloadDict.containsKey("data");
+
+        // 输出检查结果
+        log.info("包含 imei: {}, funcType: {}, status: {}, timestamp: {}, data: {}",
+                hasImei, hasFuncType, hasStatus, hasTimestamp, hasData);
+        return hasImei && hasFuncType && hasStatus && hasTimestamp && hasData;
+    }
+
 }

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

@@ -0,0 +1,156 @@
+package com.fuyuanshen.global.mqtt.receiver;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.json.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.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleEngine;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageHandler;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.messaging.MessagingException;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.Objects;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 注册设备消息接收处理
+ */
+@Service
+@Slf4j
+public class RegisEquipReceiverMessageHandler implements MessageHandler {
+
+    @Autowired
+    private NewMqttRuleEngine newRuleEngine;
+
+    @Autowired
+    private MqttGateway mqttGateway;
+
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+    @Autowired
+    private DeviceService deviceService;
+
+    @Autowired
+    private DeviceTypeMapper deviceTypeMapper;
+
+
+    @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();
+
+        // 只处理 regis/equip/# 主题的消息
+        if (!receivedTopic.startsWith("regis/equip/")) {
+            return;
+        }
+
+        // 从主题中提取设备ID
+        String[] topicParts = receivedTopic.split("/");
+        if (topicParts.length < 3) {
+            log.warn("Invalid topic format: {}", receivedTopic);
+            return;
+        }
+        String deviceTypeName = topicParts[2]; // HBY100-J
+
+        String receivedQos = Objects.requireNonNull(headers.get("mqtt_receivedQos")).toString();
+        String timestamp = Objects.requireNonNull(headers.get("timestamp")).toString();
+
+        log.info("MQTT3 payload= {} \n receivedTopic = {} \n receivedQos = {} \n timestamp = {}",
+                payload, receivedTopic, receivedQos, timestamp);
+
+        // 解析JSON payload获取imei和mac
+        Dict payloadDict = JsonUtils.parseMap(payload.toString());
+        if (payloadDict == null) {
+            log.warn("Failed to parse payload JSON");
+            return;
+        }
+
+        String imei = payloadDict.getStr("imei");
+        String mac = payloadDict.getStr("mac");
+
+        log.info("Extracted IMEI: {}, MAC: {}", imei, mac);
+
+        // 验证必要字段
+        if (StringUtils.isEmpty(imei) || StringUtils.isEmpty(mac)) {
+            log.warn("Missing required fields - IMEI: {}, MAC: {}", imei, mac);
+            return;
+        }
+
+        DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria();
+        criteria.setTypeName(deviceTypeName);
+        DeviceType deviceType = deviceTypeMapper.queryByName(criteria);
+        if (deviceType == null) {
+            log.warn("Device type not found for name: {}", deviceTypeName);
+            return;
+        }
+
+        Device device = deviceMapper.selectDeviceByImei(imei);
+        if (device != null) {
+            log.warn("Device already exists for IMEI: {}", imei);
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                    imei + ":regis";
+            Object value = RedisUtils.getCacheObject(redisKey);
+            if (value != null) {
+                log.warn("regis/imei发送次数频率过快: {}", imei);
+                return;
+            }
+//            sendSuccessMessage(imei);
+            RedisUtils.setCacheObject(redisKey, payload.toString(), Duration.ofSeconds(10));
+            return;
+        }
+
+        // 提取MAC地址后6位
+        String macSuffix = mac.replaceAll(":", "").substring(6); // 43:73:43:33:53:33 -> 335333
+        // 构建设备名称和蓝牙名称：设备类型+MAC后6位
+        String deviceName = deviceTypeName + "-" + macSuffix; // HBY100-335333
+
+        DeviceForm deviceForm = new DeviceForm();
+        deviceForm.setDeviceImei(imei);
+        deviceForm.setDeviceMac(mac);
+        deviceForm.setDeviceName(deviceName);
+        deviceForm.setBluetoothName(deviceName);
+        deviceForm.setDeviceType(deviceType.getId());
+
+        try {
+            deviceService.addDevice(deviceForm);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        sendSuccessMessage(imei);
+
+    }
+
+    private void sendSuccessMessage(String imei) {
+        // 解析原始JSON数据
+        JSONObject originalData = new JSONObject();
+        originalData.put("code", 200);
+        // 发送到MQTT
+        String topic = "regis/" + imei;
+        mqttGateway.sendMsgToMqtt(topic, originalData.toString());
+    }
+
+
+}

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

@@ -67,31 +67,29 @@ public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
      */
     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());
+        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中
+            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);
+            // 存储到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);
-            }
-        });
+            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

@@ -57,12 +57,12 @@ public class BjqAlarmRule implements MqttMessageRule {
             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";
+                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)){
+                } else if ("0".equals(convertValue)) {
                     RedisUtils.deleteObject(sendMessageIng);
                     RedisUtils.deleteObject(deviceRedisKey);
                 }

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

@@ -71,5 +71,4 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
     }
 
 
-
 }

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

@@ -121,16 +121,15 @@ public class BjqLocationDataRule implements MqttMessageRule {
      * @param longitude  经度
      */
     public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
-        CompletableFuture.runAsync(() -> {
-            try {
-                if (StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)) {
-                    return;
-                }
+        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 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){
@@ -150,34 +149,33 @@ public class BjqLocationDataRule implements MqttMessageRule {
 //                    }
 //                }
 
-                // 构造位置信息对象
-                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());
+            // 构造位置信息对象
+            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);
+            String locationJson = JsonUtils.toJsonString(locationInfo);
 
-                // 存储到Redis
-                RedisUtils.setCacheObject(redisKey, locationJson);
+            // 存储到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);
-            }
-        });
+            storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+            log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+        } catch (Exception e) {
+            log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
     }
 
 
@@ -189,20 +187,18 @@ public class BjqLocationDataRule implements MqttMessageRule {
      * @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);
+        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);
+        }
     }
 
 

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

@@ -45,10 +45,13 @@ public class BjqModeRule implements MqttMessageRule {
         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();

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

@@ -1,32 +1,18 @@
 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.*;
 
 /**
  * 定位数据命令处理
@@ -48,11 +34,12 @@ public class BjqPersonnelInfoDataRule implements MqttMessageRule {
     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));
+//            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/hby100j/FuncType10StrobeMode.java

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 爆闪模式开启/关闭
+ */
+@Slf4j
+@Component
+public class FuncType10StrobeMode implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_10";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J爆闪模式开启/关闭，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":strobeMode";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J爆闪模式开启/关闭失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 修改警示灯爆闪频率
+ */
+@Slf4j
+@Component
+public class FuncType11Frequency implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_11";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J修改警示灯爆闪频率，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":frequency";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J修改警示灯爆闪频率失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 强制声光报警开启/关闭
+ */
+@Slf4j
+@Component
+public class FuncType12ForceAudio implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_12";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J强制声光报警开启/关闭，消息负载：{}", context.getPayloadDict());
+
+        try {
+            // 构建强制声光报警开关的Redis键
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":forceAudio";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                // 存储强制声光报警开关状态到Redis
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J强制声光报警开启/关闭失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 警示灯LED亮度调节
+ */
+@Slf4j
+@Component
+public class FuncType13Brightness implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_13";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J警示灯LED亮度调节，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":brightness";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J警示灯LED亮度调节失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 获取警示灯的当前工作方式（设备下发返回响应数据、设备定时主动上报）
+ */
+@Slf4j
+@Component
+public class FuncType14Report implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_14";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J设备定时主动上报，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + 
+                             context.getDeviceImei() + ":report";
+            
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J设备定时主动上报失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 设备复位
+ */
+@Slf4j
+@Component
+public class FuncType1Rest implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_1";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("开始处理设备复位，消息负载：{}", context.getPayloadDict());
+
+        try {
+            // 构建强制声光报警开关的Redis键
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":rest";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                // 存储强制声光报警开关状态到Redis
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+            log.info("设备复位，设备ID：{}", context.getDeviceImei());
+        } catch (Exception e) {
+            log.error("处理设备复位失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 获取设备基础信息
+ */
+@Slf4j
+@Component
+public class FuncType2BaseInfo implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_2";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("开始处理强制声光报警开关，消息负载：{}", context.getPayloadDict());
+
+        try {
+            // 构建强制声光报警开关的Redis键
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":force_audio_visual_alarm_switch";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                // 存储强制声光报警开关状态到Redis
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+            log.info("强制声光报警开关处理完成，设备ID：{}", context.getDeviceImei());
+        } catch (Exception e) {
+            log.error("处理强制声光报警开关失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,208 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+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.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.rule.hby100j.domin.FunctionType3LocationReport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+
+/**
+ * 获取设备位置信息（设备下发返回响应数据、设备定时主动上报）
+ */
+@Slf4j
+@Component
+public class FuncType3Location implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_3";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J获取设备位置信息，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + 
+                             context.getDeviceImei() + ":location";
+            
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+                String jsonString = JSONObject.toJSONString(payloadDict);
+                FunctionType3LocationReport data = JSONObject.parseObject(jsonString, FunctionType3LocationReport.class);
+                FunctionType3LocationReport.Data data1 = data.getData();
+                if (data1 != null) {
+                    Double latitude = data1.getLatitude();
+                    Double longitude = data1.getLongitude();
+                    asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude.toString(), longitude.toString());
+                }
+            }
+        } catch (Exception e) {
+            log.error("HBY100J获取设备位置信息失败", e);
+        }
+    }
+
+    /** 位置未发生明显变化的距离阈值（米），可通过配置中心动态调整 */
+    private final double MOVEMENT_THRESHOLD_METER = 10.0;
+
+    /**
+     * 异步发送位置信息到Redis（使用CompletableFuture）
+     *
+     * @param deviceImei 设备IMEI
+     * @param latitude   纬度
+     * @param longitude  经度
+     */
+    public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
+        try {
+            if (latitude == null || longitude == null) {
+                return;
+            }
+            if (StringUtils.isAnyBlank(deviceImei, latitude, longitude)) {
+                log.warn("位置上报参数为空，deviceImei={}", deviceImei);
+                return;
+            }
+            //log.info("位置上报，deviceImei={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            // 1. 解析当前上报的经纬度
+            Double curLat = parseDoubleSafe(latitude.trim());
+            Double curLon = parseDoubleSafe(longitude.trim());
+            if (curLat == null || curLon == null) {
+                log.warn("经纬度格式错误，直接更新，deviceImei={}, lat={}, lon={}", deviceImei, latitude, longitude);
+//                doSaveLocation(deviceImei, latitude, longitude);
+                return;
+            }
+
+            // 2. 读取 Redis 中缓存的上一次位置
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+            String cachedJson = RedisUtils.getCacheObject(redisKey);
+
+            if (StringUtils.isNotBlank(cachedJson)) {
+                com.alibaba.fastjson2.JSONObject cachedObj = com.alibaba.fastjson2.JSONObject.parseObject(cachedJson);
+                String cachedWgs84Lat = cachedObj.getString("wgs84_latitude");
+                String cachedWgs84Lon = cachedObj.getString("wgs84_longitude");
+
+                Double oldLat = parseDoubleSafe(cachedWgs84Lat);
+                Double oldLon = parseDoubleSafe(cachedWgs84Lon);
+
+                if (oldLat != null && oldLon != null) {
+                    double distance = haversine(oldLat, oldLon, curLat, curLon);
+                    if (distance <= MOVEMENT_THRESHOLD_METER) {
+                        log.info("位置未发生明显变化（{}米 <= {}米），不更新 Redis，deviceImei={}, lat={}, lon={}",
+                                distance, MOVEMENT_THRESHOLD_METER, deviceImei, latitude, 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);
+        }
+    }
+    /** 安全解析 double，解析失败返回 null */
+    private Double parseDoubleSafe(String str) {
+        if (StringUtils.isBlank(str)) return null;
+        try {
+            return Double.parseDouble(str.trim());
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+    /** Haversine 公式计算两点球面距离（米） */
+    private double haversine(double lat1, double lon1, double lat2, double lon2) {
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) *
+                        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        /** 地球平均半径（米） */
+        double EARTH_RADIUS = 6371_393.0;
+        return EARTH_RADIUS * c;
+    }
+
+    /**
+     * 存储设备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);
+        }
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+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.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.rule.hby100j.domin.FunctionType4PowerStatusReport;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX;
+
+/**
+ * 获取设备电源状态（设备下发返回响应数据、设备定时主动上报）
+ */
+@Slf4j
+@Component
+public class FuncType4PowerStatus implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_4";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J获取设备电源状态，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+//                             context.getDeviceImei() + ":powerStatus";
+            
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+
+                String str = JSONObject.toJSONString(payloadDict);
+                FunctionType4PowerStatusReport powerStatusReport =JSONObject.parseObject(str,FunctionType4PowerStatusReport.class);
+
+                FunctionType4PowerStatusReport.Data data = powerStatusReport.getData();
+                if(data != null){
+                    // 构造设备状态信息对象
+                    Map<String, Object> deviceInfo = new LinkedHashMap<>();
+                    deviceInfo.put("batteryPercentage", data.getLevel());
+                    deviceInfo.put("chargeState", data.getCharge());
+                    deviceInfo.put("batteryRemainingTime", data.getBatteryRemainingTime());
+
+                    // 将设备状态信息存储到Redis中
+                    String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX;
+                    String deviceInfoJson = JsonUtils.toJsonString(deviceInfo);
+
+                    // 存储到Redis
+                    RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
+                }
+
+            }
+        } catch (Exception e) {
+            log.error("HBY100J获取设备电源状态失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 更新语音
+ */
+@Slf4j
+@Component
+public class FuncType5UpdateVoice implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_5";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J更新语音，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":updateVoice";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J更新语音失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 语音播报开启/关闭
+ */
+@Slf4j
+@Component
+public class FuncType6VoicePlay implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_6";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J语音播报开启/关闭，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":voicePlay";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J语音播报开启/关闭失败", e);
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.NewMqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 修改音量
+ */
+@Slf4j
+@Component
+public class FuncType9UpdateVolume implements NewMqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return "HBY100_9";
+    }
+
+    @Override
+    public void execute(NewMqttRuleContext context) {
+        log.info("HBY100J修改音量，消息负载：{}", context.getPayloadDict());
+
+        try {
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                             context.getDeviceImei() + ":updateVolume";
+
+            Map<String, Object> payloadDict = context.getPayloadDict();
+            if (payloadDict != null) {
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+            }
+        } catch (Exception e) {
+            log.error("HBY100J修改音量失败", e);
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType10StrobeModeRequest.java

@@ -0,0 +1,58 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 爆闪模式开启/关闭
+ * 对应 funcType="10"
+ * mode:
+ * 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
+ */
+@Data
+public class FuncType10StrobeModeRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+
+        /**
+         * 爆闪模式是否启用
+         * 0 - 禁用
+         * 1 - 启用
+         */
+        private Integer enable;
+        /**
+         * 爆闪模式类型 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
+         **/
+        private Integer mode;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType11FrequencyRequest.java

@@ -0,0 +1,47 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 修改警示灯爆闪频率
+ * 对应 funcType="11"
+ */
+@Data
+public class FuncType11FrequencyRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+        //"frequency": 1-12
+        private Integer frequency;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType12ForceAudioRequest.java

@@ -0,0 +1,52 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 强制声光报警开启/关闭
+ * 对应 funcType="12"
+ */
+@Data
+public class FuncType12ForceAudioRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+        /**
+         * 语音报警0关闭,1开启
+         */
+        @JsonProperty("voice_strobe_alarm")
+        private Integer voiceStrobeAlarm;
+        //语音模式0公安,1消防,2应急,3交警，4市政，5铁路，6医疗，7部队，8水利
+        private Integer mode;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType13BrightnessRequest.java

@@ -0,0 +1,59 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 警示灯LED亮度调节
+ * 对应 funcType="13"
+ */
+@Data
+public class FuncType13BrightnessRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+        /**
+         * 红色LED亮度值0-100
+         */
+        private Integer red;
+
+        /**
+         * 蓝色LED亮度值0-100
+         */
+        private Integer blue;
+
+        /**
+         * 黄色LED亮度值0-100
+         */
+        private Integer yellow;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType14StatusReport.java

@@ -0,0 +1,143 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 设备状态上报数据DTO
+ * 对应MQTT消息中设备上报的完整状态数据结构
+ */
+@Data
+public class FuncType14StatusReport {
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码（如"14"表示特定功能指令）
+     */
+    private String funcType;
+
+    /**
+     * 响应状态码（如"200"表示成功）
+     */
+    private String status;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 设备详细状态数据
+     */
+    private Data data;
+
+    /**
+     * 设备详细状态数据内部类
+     */
+    @lombok.Data
+    public static class Data {
+        
+        /**
+         * 语音播报开关：0-关闭，1-开启
+         */
+        @JsonProperty("voice_broadcast")
+        private Integer voiceBroadcast;
+
+        /**
+         * 警报器（警笛）设置
+         */
+        @JsonProperty("siren_alarm")
+        private SirenAlarm sirenAlarm;
+
+        /**
+         * LED爆闪设置
+         */
+        @JsonProperty("led_strobe")
+        private LedStrobe ledStrobe;
+
+        /**
+         * 音量设置（0-100范围）
+         */
+        @JsonProperty("volume")
+        private Integer volume;
+
+        /**
+         * 亮度设置（RGB三色亮度值）
+         */
+        @JsonProperty("brightness")
+        private Brightness brightness;
+    }
+
+    /**
+     * 警报器（警笛）设置
+     */
+    @lombok.Data
+    public static class SirenAlarm {
+        
+        /**
+         * 是否启用：0-禁用，1-启用
+         */
+        @JsonProperty("enable")
+        private Integer enable;
+
+        /**
+         * 工作模式：0-默认模式，其他值表示不同报警模式
+         */
+        @JsonProperty("mode")
+        private Integer mode;
+    }
+
+    /**
+     * LED爆闪设置
+     */
+    @lombok.Data
+    public static class LedStrobe {
+        
+        /**
+         * 是否启用：0-禁用，1-启用
+         */
+        @JsonProperty("enable")
+        private Integer enable;
+
+        /**
+         * 工作模式：0-默认模式，其他值表示不同爆闪模式
+         */
+        @JsonProperty("mode")
+        private Integer mode;
+
+        /**
+         * 爆闪频率（单位：Hz或自定义单位）
+         */
+        @JsonProperty("frequency")
+        private Integer frequency;
+    }
+
+    /**
+     * 亮度设置（RGB三色）
+     */
+    @lombok.Data
+    public static class Brightness {
+        
+        /**
+         * 红色通道亮度值（0-255或百分比）
+         */
+        @JsonProperty("red")
+        private Integer red;
+
+        /**
+         * 绿色通道亮度值（0-255或百分比）
+         */
+        @JsonProperty("green")
+        private Integer green;
+
+        /**
+         * 蓝色通道亮度值（0-255或百分比）
+         */
+        @JsonProperty("blue")
+        private Integer blue;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType5UpdateVoiceReport.java

@@ -0,0 +1,59 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 更新设备语音
+ */
+@Data
+public class FuncType5UpdateVoiceReport {
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码（"5" 表示操作状态上报）
+     */
+    private String funcType;
+
+    /**
+     * 响应状态码（"200" 表示请求成功）
+     */
+    private String status;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 操作详细状态数据
+     */
+    private Data data;
+
+    /**
+     * 操作状态数据内部类
+     */
+    @lombok.Data
+    public static class Data {
+        
+        /**
+         * 操作执行状态：
+         * 0 - 未开始 / 失败
+         * 1 - 执行中
+         * 2 - 成功完成
+         * （具体含义需结合业务协议定义）
+         */
+        @JsonProperty("status")
+        private Integer status;
+
+        /**
+         * 操作进度百分比（0-100），仅在 status=1（执行中）时有效
+         */
+        @JsonProperty("progress")
+        private Integer progress;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType5UpdateVoiceRequest.java

@@ -0,0 +1,62 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 语音资源配置请求DTO
+ * 对应 funcType="5" 的语音资源下发指令（如语音播报文件配置）
+ */
+@Data
+public class FuncType5UpdateVoiceRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码（"5" 表示语音资源配置）
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+        
+        /**
+         * 语音类型：
+         * 0 - 默认语音（如标准提示音）
+         * 1 - 自定义语音
+         * 2 - 紧急语音
+         * （具体含义需依据设备协议定义）
+         */
+        @JsonProperty("voice_type")
+        private Integer voiceType;
+
+        /**
+         * 语音资源URL（MP3等音频文件地址）
+         * 示例：http://8.129.5.250:10001/voice/01.mp3
+         */
+        @JsonProperty("voice_resource")
+        private String voiceResource;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType6VoicePlayRequest.java

@@ -0,0 +1,50 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 语音播报开启/关闭
+ * 对应 funcType="6"
+ */
+@Data
+public class FuncType6VoicePlayRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+        /**
+         * 语音报警0关闭,1开启
+         */
+        @JsonProperty("voice_broadcast")
+        private Integer voiceBroadcast;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FuncType9UpdateVolumeRequest.java

@@ -0,0 +1,47 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 修改音量
+ * 对应 funcType="9"
+ */
+@Data
+public class FuncType9UpdateVolumeRequest {
+
+    /**
+     * 请求唯一标识符（用于链路追踪或幂等处理）
+     */
+    @JsonProperty("requestId")
+    private String requestId;
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码
+     */
+    private String funcType;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 语音配置数据
+     */
+    private Data data;
+
+    /**
+     * 语音配置详情内部类
+     */
+    @lombok.Data
+    public static class Data {
+        //"volume": 1-100(app端可根据需求把40作为低音量, 70作为中音量，100作为高音量)
+        private Integer volume;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FunctionType3LocationReport.java

@@ -0,0 +1,56 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 设备位置上报DTO
+ * 对应MQTT消息中设备上报的地理位置数据
+ */
+@Data
+public class FunctionType3LocationReport {
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码（如"3"表示位置上报）
+     */
+    private String funcType;
+
+    /**
+     * 响应状态码（如"200"表示成功）
+     */
+    private String status;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 位置详细数据
+     */
+    private Data data;
+
+    /**
+     * 位置详细数据内部类
+     */
+    @lombok.Data
+    public static class Data {
+        
+        /**
+         * 经度（WGS-84坐标系，如22.543100）
+         */
+        @JsonProperty("longitude")
+        private Double longitude;
+
+        /**
+         * 纬度（WGS-84坐标系，如114.057900）
+         */
+        @JsonProperty("latitude")
+        private Double latitude;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/domin/FunctionType4PowerStatusReport.java

@@ -0,0 +1,77 @@
+package com.fuyuanshen.global.mqtt.rule.hby100j.domin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 设备电源状态上报DTO
+ * 对应MQTT消息中设备上报的电源相关状态数据
+ */
+@Data
+public class FunctionType4PowerStatusReport {
+
+    /**
+     * 设备IMEI号（国际移动设备识别码）
+     */
+    private String imei;
+
+    /**
+     * 功能类型编码（如"4"表示电源状态上报）
+     */
+    private String funcType;
+
+    /**
+     * 响应状态码（如"200"表示成功）
+     */
+    private String status;
+
+    /**
+     * 时间戳（毫秒级Unix时间戳）
+     */
+    private Long timestamp;
+
+    /**
+     * 电源详细状态数据
+     */
+    private Data data;
+
+    /**
+     * 电源详细状态数据内部类
+     */
+    @lombok.Data
+    public static class Data {
+        
+        /**
+         * 电池容量（如"5000mAh"）
+         */
+        @JsonProperty("capacity")
+        private String capacity;
+
+        /**
+         * 电压值（单位：V，0表示未检测或无电）
+         */
+        @JsonProperty("voltage")
+        private Integer voltage;
+
+        /**
+         * 电量百分比（0-100，0表示低电量或未检测）
+         */
+        @JsonProperty("level")
+        private Integer level;
+
+        /**
+         * 充电状态：0-未充电，1-正在充电
+         */
+        @JsonProperty("charge")
+        private Integer charge;
+
+        /**
+         * 12V电源状态：0-关闭/无输出，1-开启/有输出
+         */
+        @JsonProperty("12v_power")
+        private Integer twelveVPower;
+
+        @JsonProperty("battery_remaining_time")
+        private Integer batteryRemainingTime;
+    }
+}

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

@@ -1,8 +1,13 @@
 package com.fuyuanshen.global.mqtt.rule.xinghan;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONObject;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson2.JSONWriter;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.utils.StringUtils;
@@ -10,13 +15,23 @@ 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.DeviceFenceAccessRecord;
+import com.fuyuanshen.equipment.domain.DeviceGeoFence;
 import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.bo.DeviceFenceAccessRecordBo;
 import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
 import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper;
+import com.fuyuanshen.equipment.mapper.DeviceFenceAccessRecordMapper;
+import com.fuyuanshen.equipment.mapper.DeviceGeoFenceMapper;
 import com.fuyuanshen.equipment.service.DeviceService;
 import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+import com.fuyuanshen.equipment.service.IDeviceFenceAccessRecordService;
+import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
+import com.fuyuanshen.equipment.utils.map.AmapTrackUtil;
 import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
 import com.fuyuanshen.equipment.utils.map.LngLonUtil;
+import com.fuyuanshen.global.Provider.AlarmDelayProvider;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.base.MqttXinghanJson;
@@ -30,13 +45,16 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.text.DecimalFormat;
 import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
@@ -72,6 +90,14 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
     private final IDeviceAlarmService deviceAlarmService;
     private final DeviceService deviceService;
     private final DeviceAlarmMapper deviceAlarmMapper;
+    private final AmapTrackUtil amapTrackUtil;
+    private final IDeviceFenceAccessRecordService deviceFenceAccessRecordService;
+    private final DeviceFenceAccessRecordMapper deviceFenceAccessRecordMapper;
+    private final DeviceGeoFenceMapper deviceGeoFenceMapper;
+    private final RedissonClient redissonClient;
+    private final AlarmDelayProvider alarmDelayProvider; // 注入你实现的延迟提供者接口
+    /** 位置未发生明显变化的距离阈值（米），可通过配置中心动态调整 */
+    private final double MOVEMENT_THRESHOLD_METER = 10.0;
 
     @Override
     public void execute(MqttRuleContext context) {
@@ -80,7 +106,9 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
             // Latitude, longitude
             //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
             MqttXinghanJson deviceStatus = objectMapper.convertValue(context.getPayloadDict(), MqttXinghanJson.class);
-            deviceStatus.setBatteryPercentage(deviceStatus.getStaPowerPercent().toString());
+            if (deviceStatus.getStaPowerPercent() != null) {
+                deviceStatus.setBatteryPercentage(deviceStatus.getStaPowerPercent().toString());
+            }
             // 发送设备状态和位置信息到Redis
             asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),deviceStatus);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
@@ -127,16 +155,20 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
      * 入口：保存报警（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);
+        try {
+            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);
+        } catch (Exception e) {
+            log.error("异步保存报警（SOS 与 Shake 完全独立）报错: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
     }
 
     /**
@@ -144,44 +176,46 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
      */
     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;
             }
-            // 需要新建，抢锁
+
+            String lockKey = redisKey + ":lock";
+            RedissonClient client = RedisUtils.getClient();
+            RLock lock = client.getLock(lockKey);
             boolean locked = false;
             try {
-                locked = lock.tryLock(3, TimeUnit.SECONDS);   // 最多等 3 s
-                if (!locked) {                                // 抢不到直接放弃
+                locked = lock.tryLock(3, TimeUnit.SECONDS);
+                if (!locked) {
+                    log.warn("抢锁失败，放弃创建报警 device={}, type={}", deviceImei, type.getDesc());
                     return;
                 }
-                // 锁内二次校验（double-check）
+
+                // 二次校验
                 alarmId = RedisUtils.getCacheObject(redisKey);
                 if (alarmId != null) {
-                    return;           // 并发线程已建好
+                    return;
                 }
 
-                // 不存在 -> 新建
                 DeviceAlarmBo bo = createAlarmBo(deviceImei, type);
-                if (bo == null){
+                if (bo == null) {
                     return;
                 }
                 deviceAlarmService.insertByBo(bo);
-                RedisUtils.setCacheObject(redisKey, bo.getId(), Duration.ofMinutes(10)); // 5分钟后结束过期
-            }catch (InterruptedException ignore) {
-                // 立即中断并退出，禁止继续往下走
+
+                // 初始化阶段并投递第一个3分钟检查
+                redissonClient.getBucket("alarm:stage:" + bo.getId()).set(0L, Duration.ofMinutes(10));
+                alarmDelayProvider.sendDelayCheck(bo.getId(), 180);  // 3分钟
+                RedisUtils.setCacheObject(redisKey, bo.getId(), Duration.ofMinutes(10));
+
+            } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
+                log.warn("线程中断，放弃创建报警 device={}, type={}", deviceImei, type.getDesc());
+                return;  // 明确返回
             } finally {
                 if (locked && lock.isHeldByCurrentThread()) {
                     lock.unlock();
@@ -190,11 +224,11 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
             return;
         }
 
-        // ---------- 情况 2：当前不报警 ----------
+        // 不报警
         if (alarmId != null) {
-            // 结束它
             finishAlarm(alarmId);
             RedisUtils.deleteObject(redisKey);
+            log.info("设备[{}] {}警报已解除", deviceImei, type.getDesc());
         }
     }
 
@@ -210,6 +244,7 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
         bo.setFinishTime(new Date());
         bo.setDurationTime(DurationUtils.getDurationBetween(vo.getStartTime(), bo.getFinishTime()));
         bo.setTreatmentState(0); // 已处理
+        bo.setAlarmState(1);
         deviceAlarmService.updateByBo(bo);
     }
 
@@ -223,10 +258,12 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
         }
         DeviceAlarmBo bo = new DeviceAlarmBo();
         bo.setDeviceId(device.getId());
+        bo.setDeviceName(device.getDeviceName());
         bo.setDeviceImei(deviceImei);
         bo.setDeviceAction(2); // 自动报警
         bo.setStartTime(new Date());
         bo.setTreatmentState(1); // 未处理
+        bo.setAlarmState(0);
         bo.setTenantId(device.getTenantId());
 
         // 报警内容
@@ -236,7 +273,7 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
         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"));
+            bo.setLocation(com.alibaba.fastjson2.JSONObject.parseObject(location).getString("address"));
         }
         return bo;
     }
@@ -259,63 +296,312 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
     public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
         CompletableFuture.runAsync(() -> {
             try {
-                if(StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)){
+                if (StringUtils.isAnyBlank(deviceImei, latitude, longitude)) {
+                    log.warn("位置上报参数为空，deviceImei={}", deviceImei);
+                    return;
+                }
+                //log.info("位置上报，deviceImei={}, lat={}, lon={}", deviceImei, latitude, longitude);
+                // 1. 解析当前上报的经纬度
+                Double curLat = parseDoubleSafe(latitude.trim());
+                Double curLon = parseDoubleSafe(longitude.trim());
+                if (curLat == null || curLon == null) {
+                    log.warn("经纬度格式错误，直接更新，deviceImei={}, lat={}, lon={}", deviceImei, latitude, longitude);
+                    doSaveLocation(deviceImei, latitude, 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("\\.");
+                // 2. 读取 Redis 中缓存的上一次位置
+                String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+                String cachedJson = RedisUtils.getCacheObject(redisKey);
 
-                    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;
+                if (StringUtils.isNotBlank(cachedJson)) {
+                    com.alibaba.fastjson2.JSONObject cachedObj = com.alibaba.fastjson2.JSONObject.parseObject(cachedJson);
+                    String cachedWgs84Lat = cachedObj.getString("wgs84_latitude");
+                    String cachedWgs84Lon = cachedObj.getString("wgs84_longitude");
+
+                    Double oldLat = parseDoubleSafe(cachedWgs84Lat);
+                    Double oldLon = parseDoubleSafe(cachedWgs84Lon);
+
+                    if (oldLat != null && oldLon != null) {
+                        double distance = haversine(oldLat, oldLon, curLat, curLon);
+                        if (distance <= MOVEMENT_THRESHOLD_METER) {
+                            log.info("位置未发生明显变化（{}米 <= {}米），不更新 Redis，deviceImei={}, lat={}, lon={}",
+                                    distance, MOVEMENT_THRESHOLD_METER, 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());
+                // 3. 位置有明显变化，执行保存
+                doSaveLocation(deviceImei, latitude, longitude);
 
-
-
-                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);
+                log.error("异步发送位置信息到 Redis 失败，deviceImei={}", deviceImei, e);
             }
         });
     }
 
+    /** 真正执行保存逻辑（抽取出来便于测试和阅读） */
+    private void doSaveLocation(String deviceImei, String wgs84Lat, String wgs84Lon) {
+
+//        Map<String, Object> locationInfo = new LinkedHashMap<>();
+//        locationInfo.put("deviceImei", deviceImei);
+//        locationInfo.put("latitude", gcj02[0]);      // GCJ02 纬度
+//        locationInfo.put("longitude", gcj02[1]);     // GCJ02 经度
+//        locationInfo.put("wgs84_latitude", wgs84Lat);
+//        locationInfo.put("wgs84_longitude", wgs84Lon);
+//
+//
+//        locationInfo.put("address", StringUtils.defaultIfBlank(address, "未知"));
+//        locationInfo.put("timestamp", System.currentTimeMillis());
+//
+//        String locationJson = JsonUtils.toJsonString(locationInfo);
+        //  使用 fastjson2 零 GC 序列化
+        //  WGS84 → GCJ02（火星坐标）
+        double[] gcj02 = LngLonUtil.gps84_To_Gcj02(
+                Double.parseDouble(wgs84Lat),
+                Double.parseDouble(wgs84Lon)
+        );
+
+        String gcj02Lat = String.format("%.6f", gcj02[0]);
+        String gcj02Lon = String.format("%.6f", gcj02[1]);
+
+        // 逆地理编码（可自行决定是否异步）
+        String address = GetAddressFromLatUtil.getAdd(gcj02Lon, gcj02Lat);
+
+        String locationJson = buildLocationJsonFastJSON2(deviceImei, wgs84Lat, wgs84Lon, gcj02Lon, gcj02Lat,address);
+
+        // 主位置信息（最新一条）
+        String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_LOCATION_KEY_PREFIX;
+        RedisUtils.setCacheObject(redisKey, locationJson);
+
+        // 轨迹存储（SortedSet，按时间戳排序）
+        storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+        // 轨迹上传 查询检测对象与围栏关系  记录设备进出围栏事件
+        uploadTrackPointAsync(deviceImei, gcj02Lat, gcj02Lon, address);
+
+        log.info("位置信息已更新 Redis，deviceImei={}, wgs84=({},{})", deviceImei, wgs84Lat, wgs84Lon);
+    }
+
+    private String buildLocationJsonFastJSON2(
+            String deviceImei,
+            String wgs84Lat, String wgs84Lon,
+            String gcj02Lon, String gcj02Lat,String address) {
+        long timestamp = System.currentTimeMillis();
+
+
+        // 直接用默认 writer，零配置，自动零 GC
+        try (JSONWriter w = JSONWriter.of()) {
+            w.startObject();
+            w.writeString("deviceImei"); w.writeColon(); w.writeString(deviceImei); w.writeComma();
+            w.writeString("latitude");   w.writeColon(); w.writeString(gcj02Lat); w.writeComma();
+            w.writeString("longitude");  w.writeColon(); w.writeString(gcj02Lon); w.writeComma();
+            w.writeString("wgs84_latitude"); w.writeColon(); w.writeString(wgs84Lat); w.writeComma();
+            w.writeString("wgs84_longitude"); w.writeColon(); w.writeString(wgs84Lon); w.writeComma();
+            w.writeString("address");    w.writeColon(); w.writeString(StringUtils.defaultIfBlank(address, "未知")); w.writeComma();
+            w.writeString("timestamp");  w.writeColon(); w.writeInt64(timestamp);
+            w.endObject();
+            return w.toString();
+        }
+    }
+
+    /**
+     * 上传轨迹点并处理电子围栏出入事件（高德猎鹰服务）
+     * 优化点：
+     * 1. 避免重复查询数据库（围栏信息批量缓存）
+     * 2. 防御性编程：全面空指针防护
+     * 3. Redis 操作原子性 + 合理 TTL
+     * 4. 减少不必要的对象创建和流操作
+     * 5. 精确的事件时间使用 locationTime
+     * 6. 失败不阻塞主流程，记录关键错误
+     */
+    private void uploadTrackPointAsync(String deviceImei,
+                                       String gcj02Lat,
+                                       String gcj02Lon,String address) {
+
+        if (StrUtil.hasBlank(deviceImei, gcj02Lat, gcj02Lon)) {
+            log.warn("上传轨迹点参数非法，deviceImei={}, lat={}, lon={}", deviceImei, gcj02Lat, gcj02Lon);
+            return;
+        }
+        long locationTime = System.currentTimeMillis();
+        String fenceStatusKey = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + ":terminal:status";
+
+        try {
+            // 1. 查询设备信息（建议加缓存，热点设备可大幅降低DB压力）
+            Device device = deviceService.selectDeviceByImei(deviceImei);
+            if (device == null || device.getSid() == null || device.getTid() == null) {
+                log.warn("设备不存在或未完成高德终端创建，imei={}", deviceImei);
+                return;
+            }
+
+            Long trid = ObjectUtil.defaultIfNull(device.getTrid(), 0L); // trid 可能为空
+
+            // 2. 上传轨迹点
+            JSONObject point = new JSONObject();
+            point.set("location", String.format("%s,%s", gcj02Lon, gcj02Lat));
+            point.set("locatetime", locationTime);
+
+            JSONArray pointsArray = new JSONArray();
+            pointsArray.add(point);
+            log.info("上传轨迹点开始，deviceImei={}, point={}", deviceImei, point);
+            JSONObject uploadResult = amapTrackUtil.uploadPoints(device.getSid(), device.getTid(), trid, pointsArray);
+            if (uploadResult == null || uploadResult.getInt("errcode", -1) != 10000) {
+                return;
+            }
+            log.info("上传轨迹点成功，deviceImei={}, result={}", deviceImei, uploadResult);
+            // 3. 查询当前围栏状态
+            JSONObject fenceResult = amapTrackUtil.queryTerminalFenceStatus(device.getSid(), null, device.getTid());
+            if (fenceResult == null || fenceResult.getInt("errcode", -1) != 10000) {
+                log.warn("查询设备围栏状态失败，imei={}, result={}", deviceImei, fenceResult);
+                return;
+            }
+            log.info("查询设备围栏状态成功，imei={}, result={}", deviceImei, fenceResult);
+            JSONArray results = fenceResult.getByPath("data.results", JSONArray.class);
+            if (results == null || results.isEmpty()) {
+                // 没有任何围栏关系，清空旧状态
+                RedisUtils.deleteObject(fenceStatusKey);
+                return;
+            }
+
+            // 4. 当前在围栏内的 gfid 集合
+            Set<Long> newInFenceGfids = new HashSet<>();
+            List<JSONObject> currentInList = new ArrayList<>();
+
+            for (Object obj : results) {
+                JSONObject item = (JSONObject) obj;
+                if (item.getInt("in", 0) == 1) {
+                    Long gfid = item.getLong("gfid");
+                    if (gfid != null) {
+                        newInFenceGfids.add(gfid);
+                        currentInList.add(item);
+                    }
+                }
+            }
+
+            // 5. 获取上一次的围栏状态
+            List<JSONObject> oldInList = RedisUtils.getCacheObject(fenceStatusKey);
+            Set<Long> oldInFenceGfids = (oldInList == null || oldInList.isEmpty())
+                    ? Collections.emptySet()
+                    : oldInList.stream()
+                    .map(o -> o.getLong("gfid"))
+                    .collect(Collectors.toSet());
+
+            // 6. 计算出入事件（使用高效的 Set 操作）
+            Set<Long> enteredGfids = new HashSet<>(newInFenceGfids);
+            enteredGfids.removeAll(oldInFenceGfids);// 进入：这次有，上次没有
+
+            Set<Long> exitedGfids = new HashSet<>(oldInFenceGfids);
+            exitedGfids.removeAll(newInFenceGfids);// 离开：上次有，这次没有
+
+            Date eventTime = new Date(locationTime);
+            Double latitude = Double.valueOf(gcj02Lat);
+            Double longitude = Double.valueOf(gcj02Lon);
+
+            // 批量查询围栏信息（关键优化：避免 N+1 查询）
+            Set<Long> allChangedGfids = new HashSet<>();
+            allChangedGfids.addAll(enteredGfids);
+            allChangedGfids.addAll(exitedGfids);
+
+            Map<Long, DeviceGeoFenceVo> fenceMap = new HashMap<>();
+            if (CollUtil.isNotEmpty(allChangedGfids)) {
+                List<DeviceGeoFenceVo> fenceList = deviceGeoFenceMapper.selectVoList(
+                        new LambdaQueryWrapper<DeviceGeoFence>().in(DeviceGeoFence::getGfid, allChangedGfids));
+                fenceMap = fenceList.stream()
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toMap(DeviceGeoFenceVo::getGfid, v -> v, (a, b) -> a));
+            }
+
+            // 7. 记录进入事件
+            if (CollUtil.isNotEmpty(enteredGfids)) {
+                List<DeviceFenceAccessRecord> enterRecords = new ArrayList<>();
+                for (Long gfid : enteredGfids) {
+                    DeviceFenceAccessRecord record = buildFenceRecord(device, fenceMap.get(gfid), 1L, latitude, longitude, eventTime, address);
+                    if (record != null) {
+                        enterRecords.add(record);
+                    }
+                }
+                deviceFenceAccessRecordMapper.insertBatch(enterRecords);
+                log.info("设备进入围栏，imei={}, gfids={}", deviceImei, enteredGfids);
+            }
+
+            // 8. 记录离开事件
+            if (CollUtil.isNotEmpty(exitedGfids)) {
+                List<DeviceFenceAccessRecord> exitRecords = new ArrayList<>();
+                for (Long gfid : exitedGfids) {
+                    DeviceFenceAccessRecord record = buildFenceRecord(device, fenceMap.get(gfid), 2L, latitude, longitude, eventTime, address);
+                    if (record != null) {
+                        exitRecords.add(record);
+                    }
+                }
+                deviceFenceAccessRecordMapper.insertBatch(exitRecords);
+                log.info("设备离开围栏，imei={}, gfids={}", deviceImei, exitedGfids);
+            }
+
+            // 9. 更新 Redis 状态（TTL 5分钟，防止频繁查询）
+            if (CollUtil.isNotEmpty(currentInList)) {
+                RedisUtils.setCacheObject(fenceStatusKey, currentInList, Duration.ofMinutes(5));
+            } else {
+                RedisUtils.deleteObject(fenceStatusKey);
+            }
+
+        } catch (Exception e) {
+            log.error("上传轨迹点并处理围栏事件异常，imei={}, lat={}, lon={}, time={}",
+                    deviceImei, gcj02Lat, gcj02Lon, locationTime, e);
+            // 可落库待重试或发告警，此处不抛异常影响定位主流程
+        }
+    }
+
+    /**
+     * 构建围栏出入记录（提取公共逻辑，避免重复代码）
+     */
+    private DeviceFenceAccessRecord buildFenceRecord(Device device,
+                                                       DeviceGeoFenceVo fence,
+                                                       Long eventType,
+                                                       Double latitude,
+                                                       Double longitude,
+                                                       Date eventTime,String address) {
+        if (fence == null || fence.getId() == null) {
+            log.warn("围栏信息不存在，gfid 可能已被删除或未绑定");
+            return null;
+        }
+        DeviceFenceAccessRecord bo = new DeviceFenceAccessRecord();
+        bo.setDeviceId(device.getId().toString());
+        bo.setFenceId(fence.getId());
+        bo.setEventType(eventType);        // 1=进入, 2=离开
+        bo.setAccuracy(20L);
+        bo.setLatitude(latitude);
+        bo.setLongitude(longitude);
+        bo.setEventTime(eventTime);
+        bo.setTenantId(device.getTenantId());
+        bo.setCreateBy(device.getCreateBy());
+        bo.setCreateDept(device.getCreateDept());
+        bo.setEventAddress(address);
+        return bo;
+    }
+
+    /** 安全解析 double，解析失败返回 null */
+    private Double parseDoubleSafe(String str) {
+        if (StringUtils.isBlank(str)) return null;
+        try {
+            return Double.parseDouble(str.trim());
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    /** Haversine 公式计算两点球面距离（米） */
+    private double haversine(double lat1, double lon1, double lat2, double lon2) {
+        double dLat = Math.toRadians(lat2 - lat1);
+        double dLon = Math.toRadians(lon2 - lon1);
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) *
+                        Math.sin(dLon / 2) * Math.sin(dLon / 2);
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        /** 地球平均半径（米） */
+        double EARTH_RADIUS = 6371_393.0;
+        return EARTH_RADIUS * c;
+    }
+
     /**
      * 存储设备30天历史轨迹到Redis (使用Sorted Set)
      */
@@ -358,4 +644,6 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
         return map;
     }
 
+
+
 }

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

@@ -110,7 +110,7 @@ public class XinghanSendAlarmMessageRule implements MqttMessageRule {
                     dto.setMessage(String.format("%s设备已收到通知！", latestLog.getDeviceName()));
                     dto.setUserIds(List.of(latestLog.getCreateBy()));
                     SseMessageUtils.publishMessage(dto);
-                }, 5, TimeUnit.SECONDS);
+                }, 2, TimeUnit.SECONDS);
                 return;
             }
             // 1. cover! —— 成功标记

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/service/AlarmCheckService.java

@@ -0,0 +1,318 @@
+package com.fuyuanshen.global.mqtt.service;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.aliyun.dyvmsapi20170525.models.SingleCallByTtsResponse;
+import com.fuyuanshen.common.core.utils.date.DurationUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.SmsSendRecord;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.mapper.SmsSendRecordMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+import com.fuyuanshen.global.Provider.AlarmDelayProvider;
+import com.fuyuanshen.global.mqtt.config.AlarmStageConfig;
+import com.fuyuanshen.web.enums.NotificationSwitchEnum;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import com.fuyuanshen.web.util.AliyunVoiceUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.redisson.api.RAtomicLong;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class AlarmCheckService {
+
+    private final IDeviceAlarmService deviceAlarmService;
+    private final DeviceXinghanBizService appDeviceService;
+    private final RedissonClient redissonClient;
+    private final AlarmDelayProvider alarmDelayProvider;
+    private final SmsSendRecordMapper smsSendRecordMapper;
+    private final DeviceService deviceService;
+    private final AlarmStageConfig stageConfig;
+    private final AliyunVoiceUtil voiceUtil;
+
+    private static final String STAGE_KEY_PREFIX = "alarm:stage:";
+    private static final String SMS_SENT_PREFIX = "alarm:sms:sent:";
+    private static final String SMS_TEMPLATE_ID = "SMS_506445365";
+    private static final String TTS_TEMPLATE_ID = "TTS_328730104";
+    /**
+     * 延迟队列消费者入口
+     */
+    public void executeCheck(Long alarmId) {
+        // 1. 加载报警记录，判断是否仍有效
+        DeviceAlarmVo alarm = deviceAlarmService.queryById(alarmId);
+        if (alarm == null || alarm.getTreatmentState() != 1 || alarm.getFinishTime() != null) {
+            cleanStage(alarmId);
+            log.info("报警[{}]已失效或已处理，流程终止", alarmId);
+            return;
+        }
+
+        // 2. 设备离线 → 自动结束报警
+        if (appDeviceService.isDeviceOffline(alarm.getDeviceImei())) {
+            finishAlarm(alarm);
+            cleanStage(alarmId);
+            log.info("设备[{}]离线，报警[{}]自动结束", alarm.getDeviceImei(), alarmId);
+            return;
+        }
+
+        // 3. 原子推进阶段
+        int currentStage = advanceStage(alarmId);
+        int totalStages = stageConfig.getTotalStages(alarm.getTenantId());
+        log.info("报警[{}]进入第{}/{}阶段", alarmId, currentStage, totalStages);
+
+        // 超出总阶段数 → 清理并结束
+        if (currentStage > totalStages) {
+            cleanStage(alarmId);
+            log.info("报警[{}]已完成全部{}个阶段", alarmId, totalStages);
+            return;
+        }
+
+        // 4. 执行当前阶段的动作
+        executeStageAction(currentStage, totalStages, alarm);
+
+        // 5. 如果不是最后一个阶段，则投递下一阶段延迟任务
+        if (currentStage < totalStages) {
+            long delaySeconds = stageConfig.getDelayByStage(alarm.getTenantId(), currentStage);
+            scheduleNext(alarmId, currentStage + 1, delaySeconds);
+        } else {
+            // 最后一个阶段执行完毕，清理 Redis 标记
+            cleanStage(alarmId);
+        }
+    }
+
+    // ---------- 通用阶段动作：阶段1固定，中间阶段统一，最后阶段固定 ----------
+    /**
+     * 阶段动作规则：
+     * - 阶段1：仅升级报警等级（如升至2）
+     * - 中间阶段（2 <= stage < totalStages）：升级等级 + 发送短信
+     * - 最后阶段（stage == totalStages）：仅发送短信（不再升级，并结束流程）
+     */
+    private void executeStageAction(int stage, int totalStages, DeviceAlarmVo alarm) {
+        boolean isFirst = (stage == 1);
+        boolean isLast = (stage == totalStages);
+        boolean isMiddle = (!isFirst && !isLast);
+
+        // 升级等级（阶段1和中间阶段升级）
+        if (isFirst || isMiddle) {
+            // 等级递增：阶段1升到2，阶段2升到3，阶段3升到4...
+            int newLevel = stage + 1;  // 因为 stage 从1开始，newLevel = stage+1
+            updateAlarmLevel(alarm, newLevel);
+            log.info("报警[{}]等级上升至{}", alarm.getId(), newLevel);
+        }
+
+        // 发送短信（中间阶段和最后阶段发短信）
+        if (isMiddle || isLast) {
+            if (sendSmsIfNeeded(alarm, stage)) {
+                log.info("报警[{}]第{}阶段短信已发送", alarm.getId(), stage);
+            }
+        }
+
+        if (isLast) {
+            log.info("报警[{}]最后阶段执行完毕", alarm.getId());
+        }
+    }
+    // ---------- 辅助方法 ----------
+
+    /**
+     * 原子推进阶段：Redis 中 key = alarm:stage:{alarmId} 的值 +1，返回新值。
+     * 如果 key 不存在则初始化为 1。使用 Lua 保证原子并返回推进后的值。
+     */
+    private int advanceStage(Long alarmId) {
+        String key = STAGE_KEY_PREFIX + alarmId;
+        RAtomicLong stageCounter = redissonClient.getAtomicLong(key);
+        // 第一次调用：key 不存在 -> 视为0，incrementAndGet 返回 1
+        // 后续调用：依次返回 2, 3, 4...
+        long newStage = stageCounter.incrementAndGet();
+        return (int) newStage;
+    }
+
+    /**
+     * 仅当该阶段未发送过短信时执行发送，并记录已发送标记。
+     */
+    private boolean sendSmsIfNeeded(DeviceAlarmVo alarm, int stage) {
+        String sentKey = SMS_SENT_PREFIX + alarm.getId() + ":stage" + stage;
+        boolean success = redissonClient.getBucket(sentKey).setIfAbsent("1", java.time.Duration.ofHours(2));
+        if (!success) {
+            log.debug("报警[{}]阶段{}短信已发送过，跳过", alarm.getId(), stage);
+            return false;
+        }
+        sendTemplateSms(alarm, stage);
+        return true;
+    }
+
+    /**
+     * 投递下一个延迟检查任务
+     */
+    private void scheduleNext(Long alarmId, int nextStage, long delaySeconds) {
+        // 投递下一个延迟检查任务（队列中依旧是 alarmId）
+        alarmDelayProvider.sendDelayCheck(alarmId, delaySeconds);
+        log.debug("报警[{}]已投递阶段{}延时{}秒", alarmId, nextStage, delaySeconds);
+    }
+
+    /**
+     * 发送模板短信（自动重试到备用联系人）
+     */
+    private void sendTemplateSms(DeviceAlarmVo alarm, int stage) {
+        Device device = deviceService.selectDeviceByImei(alarm.getDeviceImei());
+        if (device == null) return;
+
+        // 把数据库的数字转成枚举
+        NotificationSwitchEnum notifyStatus = NotificationSwitchEnum.getByCode(device.getNotificationEnabled());
+        // 判断是否关闭（0=关闭）
+        if (notifyStatus.isClosed()) {
+            log.info("设备{}已关闭通知，跳过发送", device.getId());
+            return;
+        }
+
+        String primaryPhone = device.getContact1Phone();
+        String backupPhone = device.getContact2Phone();
+
+        // 下面你可以分别判断短信/语音
+        if (notifyStatus.hasSms()) {
+            // 先尝试发送给主联系人
+            boolean primarySuccess = sendSmsToPhone(primaryPhone, device, alarm, stage);
+            if (!primarySuccess && backupPhone != null && !backupPhone.isEmpty()) {
+                // 主联系人失败且有备用联系人，则发送给备用联系人
+                sendSmsToPhone(backupPhone, device, alarm, stage);
+            }
+        }
+
+        if (notifyStatus.hasVoice()) {
+            // 发送语音逻辑
+        }
+
+
+    }
+
+    /**
+     * 向指定手机号发送短信并记录发送结果
+     * @return true-发送成功，false-发送失败
+     */
+    private boolean sendSmsToPhone(String phone, Device device, DeviceAlarmVo alarm, int stage) {
+        if (phone == null || phone.isEmpty()) {
+            log.warn("手机号为空，无法发送报警[{}]的短信", alarm.getId());
+            return false;
+        }
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        // 预创建待发送记录
+        SmsSendRecord record = new SmsSendRecord();
+        record.setAlarmId(alarm.getId());
+        record.setDeviceImei(alarm.getDeviceImei());
+        record.setNotifyType("SMS");
+        record.setPhone(phone);
+        record.setContent("报警阶段" + stage);
+        record.setTemplateId(SMS_TEMPLATE_ID);
+        record.setStatus(0L); // 待发送
+        record.setCreateTime(new Date());
+        record.setTenantId(alarm.getTenantId());
+        record.setCreateTime(new Date());
+        smsSendRecordMapper.insert(record);
+
+        boolean success = false;
+        String responseMsg = null;
+        try {
+            String location = alarm.getLocation() != null ? alarm.getLocation() : "";
+            LinkedHashMap<String, String> vars = new LinkedHashMap<>();
+            vars.put("name", device.getDeviceName());
+            vars.put("address", String.format("%tT开始持续报警（第%d阶段）%s", alarm.getStartTime(), stage, location));
+            vars.put("msg", device.getSosSmsMsg());
+            SmsResponse response = smsBlend.sendMessage(phone, SMS_TEMPLATE_ID, vars);
+            success = response.isSuccess();
+            responseMsg = success ? "成功" : "失败" + response.getData();
+        } catch (Exception e) {
+            responseMsg = "异常：" + e.getMessage();
+            log.error("短信发送异常，手机号：{}", phone, e);
+        }
+
+        // 更新发送记录
+        record.setStatus(success ? 1L : 2L);
+        record.setResponseMsg(responseMsg);
+        record.setSendTime(new Date());
+        smsSendRecordMapper.updateById(record);
+
+        return success;
+    }
+
+    /**
+     * 向指定手机号发送语音并记录发送结果
+     * @return true-发送成功，false-发送失败
+     */
+    private boolean sendVoiceToPhone(String phone, Device device, DeviceAlarmVo alarm, int stage) {
+        if (phone == null || phone.isEmpty()) {
+            log.warn("手机号为空，无法发送报警[{}]的语音", alarm.getId());
+            return false;
+        }
+        // 预创建待发送记录
+        SmsSendRecord record = new SmsSendRecord();
+        record.setAlarmId(alarm.getId());
+        record.setDeviceImei(alarm.getDeviceImei());
+        record.setNotifyType("VOICE");
+        record.setPhone(phone);
+        record.setContent("报警阶段" + stage);
+        record.setTemplateId(TTS_TEMPLATE_ID);
+        record.setStatus(0L); // 待发送
+        record.setCreateTime(new Date());
+        record.setTenantId(alarm.getTenantId());
+        record.setCreateTime(new Date());
+        smsSendRecordMapper.insert(record);
+
+        boolean success = false;
+        String responseMsg = null;
+        try {
+            Map<String, String> params = Map.of("device", alarm.getDeviceName());
+            SingleCallByTtsResponse response = voiceUtil.sendTtsSync(phone, TTS_TEMPLATE_ID, params);
+            success = "OK".equalsIgnoreCase(response.getBody().getCode());
+            responseMsg = success ? "成功" : "失败" + response.getBody().getMessage();
+        } catch (Exception e) {
+            responseMsg = "异常：" + e.getMessage();
+            log.error("语音发送异常，手机号：{}", phone, e);
+        }
+
+        // 更新发送记录
+        record.setStatus(success ? 1L : 2L);
+        record.setResponseMsg(responseMsg);
+        record.setSendTime(new Date());
+        smsSendRecordMapper.updateById(record);
+
+        return success;
+    }
+
+    /**
+     * 更新报警等级
+     */
+    private void updateAlarmLevel(DeviceAlarmVo alarm, int level) {
+        // 调用 deviceAlarmService 更新等级字段
+        log.info("报警[{}]等级已更新为{}", alarm.getId(), level);
+        if (alarm == null || alarm.getTreatmentState() == 0) return;
+        DeviceAlarmBo bo = BeanUtil.toBean(alarm, DeviceAlarmBo.class);
+        bo.setAlarmLevel(level);
+        deviceAlarmService.updateByBo(bo);
+    }
+
+    private void cleanStage(Long alarmId) {
+        redissonClient.getBucket(STAGE_KEY_PREFIX + alarmId).deleteAsync();
+    }
+
+    private void finishAlarm(DeviceAlarmVo alarm) {
+        if (alarm == null || alarm.getTreatmentState() == 0) return;
+        DeviceAlarmBo bo = BeanUtil.toBean(alarm, DeviceAlarmBo.class);
+        bo.setFinishTime(new Date());
+        bo.setDurationTime(DurationUtils.getDurationBetween(alarm.getStartTime(), bo.getFinishTime()));
+        bo.setTreatmentState(0); // 已处理
+        bo.setAlarmState(1);
+        deviceAlarmService.updateByBo(bo);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/utils/FfmpegVolumeUtil.java

@@ -0,0 +1,139 @@
+package com.fuyuanshen.global.mqtt.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class FfmpegVolumeUtil {
+
+    /**
+     * 使用FFmpeg增加MP3文件的音量
+     *
+     * @param inputFilePath  输入MP3文件路径
+     * @param outputFilePath 输出MP3文件路径
+     * @param volumeGain     音量增益（例如：1.5表示增加50%音量，2.0表示翻倍）
+     */
+    public static void increaseMp3Volume(String inputFilePath, String outputFilePath, int volumeGain) {
+        boolean ffmpegAvailable = isFfmpegAvailable();
+        if (!ffmpegAvailable) {
+            System.err.println("FFmpeg未安装或未找到！请安装FFmpeg并确保在系统路径中。");
+            return;
+        }
+
+        // 检查输入文件
+        File inputFile = new File(inputFilePath);
+        if (!inputFile.exists()) {
+            System.err.println("输入文件不存在：" + inputFilePath);
+            return;
+        }
+        if (!inputFile.canRead()) {
+            System.err.println("输入文件不可读：" + inputFilePath);
+            return;
+        }
+
+        // 创建输出目录
+        File outputFile = new File(outputFilePath);
+        File parentDir = outputFile.getParentFile();
+        if (parentDir != null) {
+            parentDir.mkdirs();
+            if (!parentDir.canWrite()) {
+                System.err.println("输出目录不可写：" + parentDir.getAbsolutePath());
+                return;
+            }
+        }
+
+        Process process = null;
+        try {
+            String command = String.format(
+                    "ffmpeg -y -i \"%s\" -af \"volume=%sdB\" \"%s\"",
+                    inputFilePath,
+                    volumeGain,
+                    outputFilePath
+            );
+
+            System.out.println("执行命令: " + command);
+
+            // 使用 ProcessBuilder 提供更好的控制
+            ProcessBuilder processBuilder = new ProcessBuilder("ffmpeg", "-y",
+                    "-i", inputFilePath, "-af", "volume=" + volumeGain + "dB", outputFilePath);
+            processBuilder.redirectErrorStream(false);
+            process = processBuilder.start();
+
+            // 同时读取标准输出和错误输出
+            Process finalProcess = process;
+            Thread stdOutThread = new Thread(() -> {
+                try (BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(finalProcess.getInputStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.out.println("[FFmpeg STDOUT] " + line);
+                    }
+                } catch (IOException e) {
+                    System.err.println("读取标准输出时出错: " + e.getMessage());
+                }finally {
+                    finalProcess.destroy();
+                }
+            });
+
+            Process finalProcess1 = process;
+            Thread stdErrThread = new Thread(() -> {
+                try (BufferedReader reader = new BufferedReader(
+                        new InputStreamReader(finalProcess1.getErrorStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.err.println("[FFmpeg STDERR] " + line);
+                    }
+                } catch (IOException e) {
+                    System.err.println("读取错误输出时出错: " + e.getMessage());
+                }finally {
+                    finalProcess1.destroy();
+                }
+            });
+
+            stdOutThread.start();
+            stdErrThread.start();
+
+            int exitCode = process.waitFor();
+            stdOutThread.join();
+            stdErrThread.join();
+
+            if (exitCode == 0) {
+                System.out.println("音量调整成功！输出文件：" + outputFilePath);
+            } else {
+                System.err.println("FFmpeg命令执行失败，退出码：" + exitCode);
+            }
+        } catch (IOException | InterruptedException e) {
+            System.err.println("执行FFmpeg命令时发生错误: " + e.getMessage());
+            e.printStackTrace();
+        } finally {
+            if (process != null) {
+                System.out.println("已销毁进程");
+                process.destroy();
+            }
+        }
+    }
+
+
+    public static void main(String[] args) {
+
+        // 示例用法
+        String inputPath = "/app/input.mp3";
+        String outputPath = "/app/output17.mp3";
+        int volumeGain = 12;
+
+        increaseMp3Volume(inputPath, outputPath, volumeGain);
+    }
+
+    private static boolean isFfmpegAvailable() {
+        try {
+            Process process = Runtime.getRuntime().exec("ffmpeg -version");
+            int exitCode = process.waitFor();
+            return exitCode == 0;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+}
+

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/utils/FfmpegVolumeUtil3.java

@@ -0,0 +1,92 @@
+package com.fuyuanshen.global.mqtt.utils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class FfmpegVolumeUtil3 {
+
+    /**
+     * 使用FFmpeg增加MP3文件的音量
+     *
+     * @param inputFilePath  输入MP3文件路径
+     * @param outputFilePath 输出MP3文件路径
+     * @param volumeGain     音量增益（例如：1.5表示增加50%音量，2.0表示翻倍）
+     */
+    public static void increaseMp3Volume(String inputFilePath, String outputFilePath, int volumeGain) {
+        boolean ffmpegAvailable = isFfmpegAvailable();
+        if (!ffmpegAvailable) {
+            System.err.println("FFmpeg未安装或未找到！请安装FFmpeg并确保在系统路径中。");
+            return;
+        }
+        // 创建输出文件的父目录
+        File outputFile = new File(outputFilePath);
+        File parentDir = outputFile.getParentFile();
+        if (parentDir != null && !parentDir.exists()) {
+            boolean created = parentDir.mkdirs();
+            if (!created) {
+                System.err.println("无法创建输出目录：" + parentDir.getAbsolutePath());
+                return;
+            }
+        }
+        Process process = null;
+        try {
+            // 构建FFmpeg命令
+            String command = String.format(
+                    "ffmpeg -y -i \"%s\" -af \"volume=%sdB\" \"%s\"",
+                    inputFilePath,
+                    volumeGain,
+                    outputFilePath
+            );
+
+            System.out.println("执行命令: " + command);
+
+            // 执行FFmpeg命令
+            process = Runtime.getRuntime().exec(command);
+
+            // 读取命令执行结果
+            BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                System.out.println(line);
+            }
+
+            // 等待命令执行完成
+            int exitCode = process.waitFor();
+            if (exitCode == 0) {
+                System.out.println("音量调整成功！输出文件：" + outputFilePath);
+            } else {
+                System.err.println("FFmpeg命令执行失败，退出码：" + exitCode);
+            }
+        } catch (IOException | InterruptedException e) {
+            e.printStackTrace();
+        } finally {
+            if (process != null) {
+                process.destroy();
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+
+        // 示例用法
+        String inputPath = "/app/input.mp3";
+        String outputPath = "/app/output18.mp3";
+        int volumeGain = 12;
+
+        increaseMp3Volume(inputPath, outputPath, volumeGain);
+    }
+
+    private static boolean isFfmpegAvailable() {
+        try {
+            Process process = Runtime.getRuntime().exec("ffmpeg -version");
+            int exitCode = process.waitFor();
+            return exitCode == 0;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+}
+

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/utils/FloorCalculateUtil.java

@@ -0,0 +1,262 @@
+package com.fuyuanshen.global.mqtt.utils;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 生产环境 - 楼层计算工具（优化版）
+ * 核心改进：直接使用Open-Meteo返回的surface_pressure地面气压
+ * 无需再用海拔反推，简化计算且精度更高
+ */
+public class FloorCalculateUtil {
+
+    private static final double FLOOR_HEIGHT = 3.0;
+    private static final int HTTP_TIMEOUT = 3000;
+
+    // API地址：同时获取地面气压和海平面气压
+    private static final String WEATHER_API =
+            "https://api.open-meteo.com/v1/forecast?current=pressure_msl,surface_pressure&latitude=%s&longitude=%s";
+
+    private static final Map<String, LocationBaseline> BASELINE_CACHE = new ConcurrentHashMap<>();
+    private static final long CACHE_EXPIRE_TIME_MS = 30 * 60 * 1000;
+
+    /**
+     * 内部类：存储位置的基准数据
+     */
+    private static class LocationBaseline {
+        double groundPressure;      // 地面真实气压(hPa) - 直接来自API的surface_pressure
+        double seaPressure;         // 海平面气压(hPa) - 保留备用
+        double elevation;           // 海拔高度(米) - 新增
+        long updateTime;
+
+        LocationBaseline(double groundPressure, double seaPressure, double elevation) {
+            this.groundPressure = groundPressure;
+            this.seaPressure = seaPressure;
+            this.elevation = elevation;
+            this.updateTime = System.currentTimeMillis();
+        }
+
+        boolean isExpired() {
+            return (System.currentTimeMillis() - this.updateTime) > CACHE_EXPIRE_TIME_MS;
+        }
+    }
+
+    /**
+     * 楼层计算结果类（包含海拔信息）
+     */
+    public static class FloorResult {
+        public final int floor;           // 楼层号
+        public final double elevation;    // 海拔高度(米)
+        public final double relativeHeight; // 相对地面高度(米)
+
+        public FloorResult(int floor, double elevation, double relativeHeight) {
+            this.floor = floor;
+            this.elevation = elevation;
+            this.relativeHeight = relativeHeight;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("楼层=%d, 海拔=%.1f米, 相对高度=%.1f米",
+                    floor, elevation, relativeHeight);
+        }
+    }
+
+    /**
+     * 计算当前楼层（带海拔输出）
+     * @param pressureList 设备采集的气压值列表（单位：hPa）
+     * @param latitude 纬度
+     * @param longitude 经度
+     * @return FloorResult 包含楼层、海拔、相对高度的结果对象
+     */
+    public static FloorResult getCurrentFloorWithElevation(List<Double> pressureList, double latitude, double longitude) {
+        try {
+            // 1. 计算设备采集的实时平均气压
+            double avgPressure = getAndCheckAveragePressure(pressureList);
+
+            // 2. 硬件校准：扣除设备固有的硬件正偏差
+            double calibratedPressure = avgPressure - 2.1;
+
+            // 3. 从API获取该位置的地面真实气压和海拔
+            LocationBaseline baseline = getBaselineWithCache(latitude, longitude);
+            double groundPressure = baseline.groundPressure;
+            double elevation = baseline.elevation;  // 获取海拔
+
+            System.out.printf("设备气压: %.2f hPa | 校准后: %.2f hPa | 地面气压: %.2f hPa | 海拔: %.1f米%n",
+                    avgPressure, calibratedPressure, groundPressure, elevation);
+
+            // 4. 核心计算：根据气压差计算相对高度
+            double relativeHeight = 19411.7 * Math.log10(groundPressure / calibratedPressure);
+
+            System.out.printf("相对高度：%.2f 米%n", relativeHeight);
+
+            // 5. 将相对高度转换为楼层
+            int floor = convertHeightToFloor(relativeHeight);
+
+            // 6. 返回包含海拔的结果
+            return new FloorResult(floor, elevation, relativeHeight);
+
+        } catch (Exception e) {
+            System.err.println(String.format("楼层计算异常，坐标：%.4f,%.4f，错误：%s",
+                    latitude, longitude, e.getMessage()));
+            return new FloorResult(0, 0, 0);
+        }
+    }
+
+    /**
+     * 兼容旧版本：只返回楼层号
+     */
+    public static int getCurrentFloor(List<Double> pressureList, double latitude, double longitude) {
+        return getCurrentFloorWithElevation(pressureList, latitude, longitude).floor;
+    }
+
+    private static double getAndCheckAveragePressure(List<Double> pressureList) {
+        if (pressureList == null || pressureList.isEmpty()) {
+            throw new IllegalArgumentException("气压采样数据不能为空");
+        }
+        return pressureList.stream()
+                .filter(p -> p > 800 && p < 1100)
+                .mapToDouble(Double::doubleValue)
+                .average()
+                .orElseThrow(() -> new IllegalArgumentException("气压数据无效"));
+    }
+
+    /**
+     * 获取基准数据（带本地缓存）- 现在包含海拔
+     */
+    private static LocationBaseline getBaselineWithCache(double lat, double lng) throws Exception {
+        String cacheKey = String.format("%.6f,%.6f", lat, lng);
+        LocationBaseline cached = BASELINE_CACHE.get(cacheKey);
+
+        if (cached != null && !cached.isExpired()) {
+            return cached;
+        }
+
+        // 请求API获取数据
+        WeatherData weatherData = requestWeatherData(lat, lng);
+
+        LocationBaseline newBaseline = new LocationBaseline(
+                weatherData.surfacePressure,
+                weatherData.pressureMsl,
+                weatherData.elevation      // 新增海拔参数
+        );
+        BASELINE_CACHE.put(cacheKey, newBaseline);
+        return newBaseline;
+    }
+
+    /**
+     * 请求 Open-Meteo API
+     */
+    private static WeatherData requestWeatherData(double lat, double lng) throws Exception {
+        String apiUrl = String.format(WEATHER_API, lat, lng);
+        String json = executeHttpGet(apiUrl);
+
+        // 解析JSON - elevation 在根对象，不在 current 块内
+        double elevation = parseJsonValue(json, "\"elevation\":", null);
+        double pressureMsl = parseJsonValue(json, "\"pressure_msl\":", "\"current\":");
+        double surfacePressure = parseJsonValue(json, "\"surface_pressure\":", "\"current\":");
+
+        System.out.printf("API返回: 海拔=%.1f米, 海平面气压=%.1f hPa, 地面气压=%.1f hPa%n",
+                elevation, pressureMsl, surfacePressure);
+
+        return new WeatherData(pressureMsl, surfacePressure, elevation);
+    }
+
+    private static double parseJsonValue(String json, String targetKey, String blockStartKey) {
+        int start;
+
+        if (blockStartKey != null && json.contains(blockStartKey)) {
+            int blockStart = json.indexOf(blockStartKey);
+            start = json.indexOf(targetKey, blockStart);
+        } else {
+            start = json.indexOf(targetKey);
+        }
+
+        if (start == -1) {
+            throw new RuntimeException("解析JSON失败，未找到键: " + targetKey);
+        }
+
+        start += targetKey.length();
+        int end = json.indexOf(",", start);
+        if (end == -1) end = json.indexOf("}", start);
+        if (end == -1) end = json.indexOf("]", start);
+
+        String rawVal = json.substring(start, end);
+        String cleanVal = rawVal.replaceAll("[^0-9.\\-]", "").trim();
+
+        if (cleanVal.isEmpty()) {
+            throw new RuntimeException("清洗JSON数值后结果为空，原始片段: " + rawVal);
+        }
+
+        return Double.parseDouble(cleanVal);
+    }
+
+    private static String executeHttpGet(String apiUrl) throws Exception {
+        HttpURLConnection conn = null;
+        BufferedReader reader = null;
+        try {
+            URL url = new URL(apiUrl);
+            conn = (HttpURLConnection) url.openConnection();
+            conn.setRequestMethod("GET");
+            conn.setConnectTimeout(HTTP_TIMEOUT);
+            conn.setReadTimeout(HTTP_TIMEOUT);
+            conn.setRequestProperty("User-Agent", "FloorCalculateUtil/1.0");
+
+            reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            StringBuilder response = new StringBuilder();
+            String line;
+            while ((line = reader.readLine()) != null) {
+                response.append(line);
+            }
+            return response.toString();
+        } finally {
+            if (reader != null) reader.close();
+            if (conn != null) conn.disconnect();
+        }
+    }
+
+    private static int convertHeightToFloor(double realHeight) {
+        if (realHeight < -0.5) {
+            return (int) Math.floor(realHeight / FLOOR_HEIGHT);
+        }
+        int floor = (int) Math.round(realHeight / FLOOR_HEIGHT);
+        return Math.max(floor, 1);
+    }
+
+    /**
+     * 内部数据类 - 新增 elevation 字段
+     */
+    private static class WeatherData {
+        double pressureMsl;
+        double surfacePressure;
+        double elevation;    // 新增
+
+        WeatherData(double pressureMsl, double surfacePressure, double elevation) {
+            this.pressureMsl = pressureMsl;
+            this.surfacePressure = surfacePressure;
+            this.elevation = elevation;
+        }
+    }
+
+    // ====================== 测试验证 ======================
+    public static void main(String[] args) {
+        // 测试数据
+        List<Double> pressureList = List.of(1001.591, 1001.593, 1001.584, 1001.589, 1001.591);
+        double lat = 30.490020;
+        double lng = 114.415369;
+
+        // 新方法：获取包含海拔的完整结果
+        FloorResult result = getCurrentFloorWithElevation(pressureList, lat, lng);
+        System.out.println("【优化版】计算结果：" + result);
+
+        // 也可以单独获取海拔
+        System.out.println("海拔高度：" + result.elevation + " 米");
+        System.out.println("相对高度：" + result.relativeHeight + " 米");
+        System.out.println("楼层：" + result.floor);
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/utils/GenerateIdUtil.java

@@ -0,0 +1,24 @@
+package com.fuyuanshen.global.mqtt.utils;
+
+import java.util.Random;
+import java.util.UUID;
+
+public class GenerateIdUtil {
+    /**
+     * 生成数字唯一ID - 基于UUID
+     */
+    public static String generateNumericId() {
+        UUID uuid = UUID.randomUUID();
+        return Math.abs(uuid.toString().hashCode()) + "";
+    }
+
+    /**
+     * 生成数字唯一ID - 基于时间戳+随机数
+     */
+    public static long generateTimestampBasedId() {
+        long timestamp = System.currentTimeMillis();
+        int random = new Random().nextInt(1000); // 0-999随机数
+        return timestamp * 1000 + random;
+    }
+
+}

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

@@ -7,14 +7,18 @@ 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;
@@ -32,6 +36,7 @@ public class MqttMessageConsumer {
     private ExecutorService messageConsumerPool = Executors.newFixedThreadPool(3);
     private ExecutorService messageProcessorPool = Executors.newFixedThreadPool(10);
 
+
     // 初始化方法，启动消息监听
     @PostConstruct
     public void start() {
@@ -94,40 +99,19 @@ public class MqttMessageConsumer {
     }
 
     // 处理具体业务逻辑的方法
-    private void processMessage(String message) {
+    private void processMessage(String imei) {
         String threadName = Thread.currentThread().getName();
         try {
-            log.info("业务处理线程 {} 开始处理消息: {}", threadName, message);
-//            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> updateWrapper = new UpdateWrapper<>();
-//                updateWrapper.eq("device_imei", message)
-//                        .set("online_status", 1);
-//                deviceMapper.update(updateWrapper);
-//            }
-//            QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
-//            queryWrapper.eq("device_imei", message);
-//            queryWrapper.eq("online_status", 1);
-//            Long count = deviceMapper.selectCount(queryWrapper);
-//            if(count == 0){
-//                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-//                updateWrapper.eq("device_imei", message)
-//                        .eq("online_status", 0)
-//                        .set("online_status", 1);
-//                deviceMapper.update(updateWrapper);
-//            }
+            // 执行业务逻辑
             UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-            updateWrapper.eq("device_imei", message)
+            updateWrapper.eq("device_imei", imei)
                     .in("online_status", 0,2)
                     .set("online_status", 1);
             int update = deviceMapper.update(updateWrapper);
-            // 模拟业务处理耗时
-//            Thread.sleep(200);
 
-            log.info("业务处理线程 {} 完成消息处理: {}", threadName, message);
         } catch (Exception e) {
-            log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, message, e);
+            log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, imei, e);
         }
     }
+
 }

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

@@ -22,6 +22,8 @@ public class OnlineStatusTask {
 
     @Autowired
     private DeviceMapper deviceMapper;
+
+
     // 使用cron表达式，每分钟的第0秒执行
     @Scheduled(cron = "0 */3 * * * ?")
     public void cronTask() {
@@ -37,4 +39,5 @@ public class OnlineStatusTask {
             }
         });
     }
+
 }

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

@@ -0,0 +1,110 @@
+package com.fuyuanshen.global.queue;
+
+import com.fuyuanshen.global.Provider.RedissonAlarmDelayProvider;
+import com.fuyuanshen.global.mqtt.service.AlarmCheckService;
+import jakarta.annotation.PreDestroy;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBlockingQueue;
+import org.redisson.api.RedissonClient;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class RedissonAlarmConsumer implements CommandLineRunner {
+
+    private final RedissonClient redissonClient;
+    private final AlarmCheckService alarmCheckService;
+
+    private volatile boolean running = true;
+    private Thread consumerThread;
+    private ExecutorService bizExecutor;
+    private static final int BIZ_THREADS = 4;          // 业务处理线程数
+    private static final int BIZ_QUEUE_CAPACITY = 200; // 有界队列容量
+
+    @Override
+    public void run(String... args) {
+        // 初始化业务处理线程池（有界队列 + 调用者运行拒绝策略，避免 OOM）
+        bizExecutor = Executors.newFixedThreadPool(
+                BIZ_THREADS,
+                new ThreadFactory() {
+                    private final AtomicInteger counter = new AtomicInteger(1);
+                    @Override
+                    public Thread newThread(Runnable r) {
+                        Thread t = new Thread(r, "Alarm-Biz-" + counter.getAndIncrement());
+                        t.setDaemon(false);
+                        return t;
+                    }
+                }
+        );
+
+        // 启动消费线程
+        consumerThread = new Thread(() -> {
+            RBlockingQueue<Long> blockingQueue = redissonClient.getBlockingQueue(RedissonAlarmDelayProvider.QUEUE_NAME);
+            log.info("Redisson 延迟报警监听线程已启动...");
+            while (running && !Thread.currentThread().isInterrupted()) {
+                try {
+                    Long alarmId = blockingQueue.poll(1, TimeUnit.SECONDS); // 改用带超时的 poll，可响应中断
+                    if (alarmId != null) {
+                        // 提交到业务线程池异步处理，避免阻塞队列拉取
+                        bizExecutor.submit(() -> processAlarm(alarmId));
+                    }
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    log.info("Redisson 消费线程被中断，退出循环");
+                    break;
+                } catch (Exception e) {
+                    log.error("Redisson 延迟队列消费异常", e);
+                    // 发生非中断异常时短暂休眠，避免日志风暴
+                    try {
+                        TimeUnit.SECONDS.sleep(1);
+                    } catch (InterruptedException interrupted) {
+                        Thread.currentThread().interrupt();
+                        break;
+                    }
+                }
+            }
+            log.info("Redisson 延迟报警消费线程结束");
+        }, "Alarm-Consumer-Thread");
+        consumerThread.setDaemon(false);
+        consumerThread.start();
+    }
+
+    private void processAlarm(Long alarmId) {
+        try {
+            alarmCheckService.executeCheck(alarmId);
+        } catch (Exception e) {
+            log.error("处理报警 ID [{}] 时发生异常", alarmId, e);
+            // 可在此补充重试或死信逻辑
+        }
+    }
+
+    @PreDestroy
+    public void destroy() {
+        log.info("开始关闭 Redisson 报警消费者...");
+        running = false;
+        if (consumerThread != null) {
+            consumerThread.interrupt();   // 中断阻塞在 poll 上的线程
+        }
+        if (bizExecutor != null) {
+            bizExecutor.shutdown();
+            try {
+                if (!bizExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
+                    bizExecutor.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                bizExecutor.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+        log.info("Redisson 报警消费者已关闭");
+    }
+}

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

@@ -101,13 +101,13 @@ public class AuthController {
         // 登录
         LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
 
-        Long userId = LoginHelper.getUserId();
-        scheduledExecutorService.schedule(() -> {
-            SseMessageDto dto = new SseMessageDto();
-            dto.setMessage("欢迎登录fys-Vue-Plus后台管理系统");
-            dto.setUserIds(List.of(userId));
-            SseMessageUtils.publishMessage(dto);
-        }, 5, TimeUnit.SECONDS);
+//        Long userId = LoginHelper.getUserId();
+//        scheduledExecutorService.schedule(() -> {
+//            SseMessageDto dto = new SseMessageDto();
+//            dto.setMessage("欢迎登录fys-Vue-Plus后台管理系统");
+//            dto.setUserIds(List.of(userId));
+//            SseMessageUtils.publishMessage(dto);
+//        }, 5, TimeUnit.SECONDS);
         return R.ok(loginVo);
     }
 

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

@@ -98,6 +98,7 @@ public class DeviceControlCenterController extends BaseController {
         return R.ok(appDeviceService.getDeviceInfo(deviceMac));
     }
 
+
     /**
      * 指令下发记录
      */
@@ -106,6 +107,7 @@ public class DeviceControlCenterController extends BaseController {
         return appDeviceService.getInstructionRecord(dto, pageQuery);
     }
 
+
     /**
      * 导出
      */

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

@@ -1,20 +1,17 @@
 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.equipment.domain.bo.AppOperationVideoBo;
 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.equipment.enums.DataSourceEnum;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugEditDto;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
 import com.fuyuanshen.web.domain.vo.DeviceInfoVo;
@@ -28,8 +25,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * 联调中心
@@ -85,7 +80,7 @@ public class DeviceDebugController extends BaseController {
         if(file.getSize()>1024*1024*2){
             return R.warn("图片不能大于2M");
         }
-        deviceXinghanBizService.uploadDeviceLogoBatch(bo);
+        deviceXinghanBizService.uploadDeviceLogoBatch(bo, DataSourceEnum.Web);
         return R.ok();
     }
 
@@ -125,7 +120,7 @@ public class DeviceDebugController extends BaseController {
         }
         deviceDebugService.delFile(bo.getFileIds());
         // 修改操作视频
-        if (bo.getVideoUrl().isEmpty()) {
+        if (!bo.getVideoUrl().isEmpty()) {
             AppOperationVideoBo appOperationVideoBo = new AppOperationVideoBo();
             appOperationVideoBo.setDeviceIds(new Long[]{ bo.getDeviceId() });
             appOperationVideoBo.setVideoUrl(bo.getVideoUrl());

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

@@ -14,6 +14,7 @@ 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.equipment.enums.DataSourceEnum;
 import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
 import com.fuyuanshen.web.domain.Dto.SystemVersionDto;
 import com.fuyuanshen.web.domain.vo.DeviceXinghanDetailVo;
@@ -60,7 +61,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping(value = "/registerPersonInfo")
 //    @FunctionAccessAnnotation("registerPersonInfo")
     public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
-        return toAjax(deviceXinghanBizService.registerPersonInfo(bo));
+        return toAjax(deviceXinghanBizService.registerPersonInfo(bo, DataSourceEnum.Web));
     }
 
     /**
@@ -69,7 +70,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping(value = "/sendAlarmMessage")
     @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
     public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
-        return toAjax(deviceXinghanBizService.sendAlarmMessage(bo));
+        return toAjax(deviceXinghanBizService.sendAlarmMessage(bo, DataSourceEnum.Web));
     }
 
     /**
@@ -83,7 +84,7 @@ public class DeviceXinghanController extends BaseController {
         if(file.getSize()>1024*1024*2){
             return R.warn("图片不能大于2M");
         }
-        deviceXinghanBizService.uploadDeviceLogo(bo);
+        deviceXinghanBizService.uploadDeviceLogo(bo, DataSourceEnum.Web);
 
         return R.ok();
     }
@@ -95,7 +96,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping("/DetectGradeSettings")
     public R<Void> DetectGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        deviceXinghanBizService.upDetectGradeSettings(params);
+        deviceXinghanBizService.upDetectGradeSettings(params, DataSourceEnum.Web);
         return R.ok();
     }
 
@@ -106,7 +107,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping("/LightGradeSettings")
     public R<Void> LightGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        deviceXinghanBizService.upLightGradeSettings(params);
+        deviceXinghanBizService.upLightGradeSettings(params, DataSourceEnum.Web);
         return R.ok();
     }
 
@@ -117,7 +118,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping("/SOSGradeSettings")
     public R<Void> SOSGradeSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        deviceXinghanBizService.upSOSGradeSettings(params);
+        deviceXinghanBizService.upSOSGradeSettings(params, DataSourceEnum.Web);
         return R.ok();
     }
 
@@ -128,7 +129,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping("/SOSGradeSettingsBatch")
     public R<Void> SOSGradeSettingsBatch(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        deviceXinghanBizService.sendCommandBatch(params,"ins_SOSGrade","SOS档位");
+        deviceXinghanBizService.sendCommandBatch(params,"ins_SOSGrade","SOS档位", DataSourceEnum.Web);
         return R.ok();
     }
 
@@ -139,7 +140,7 @@ public class DeviceXinghanController extends BaseController {
     @PostMapping("/ShakeBitSettings")
     public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
         // params 转 JSONObject
-        deviceXinghanBizService.upShakeBitSettings(params);
+        deviceXinghanBizService.upShakeBitSettings(params, DataSourceEnum.Web);
         return R.ok();
     }
 

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

@@ -0,0 +1,137 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.dto.AppAudioFileDto;
+import com.fuyuanshen.app.domain.dto.AppFileRenameDto;
+import com.fuyuanshen.app.domain.dto.TextToSpeechRequest;
+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 com.fuyuanshen.equipment.domain.vo.AppFileVo;
+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.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * APP 视频处理控制器
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/video")
+public class WebVideoController extends BaseController {
+
+    private final VideoProcessService videoProcessService;
+    private final AudioProcessService audioProcessService;
+
+    /**
+     * 上传视频转码code默认1：RGB565 2：BGR565
+     */
+    @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, @RequestParam(defaultValue = "1") int code) {
+        return R.ok(videoProcessService.processVideo(file, code));
+    }
+
+    /**
+     * 上传音频文件并转码
+     */
+    @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));
+    }
+
+
+    /**
+     * 提取文本内容（只支持txt/docx）
+     */
+    @PostMapping(value = "/extract", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @RepeatSubmit(interval = 2, timeUnit = TimeUnit.SECONDS,message = "请勿重复提交！")
+    public R<String> extract(@RequestParam("file") MultipartFile file) throws Exception {
+        return R.ok("Success",audioProcessService.extract(file));
+    }
+
+
+    /**
+     * 上传音频文件进行处理
+     * 支持MP3、WAV、PCM格式
+     */
+    @PostMapping("/uploadAudioToOss")
+    public R<String> uploadAudioToOss(@ModelAttribute AppAudioFileDto bo) {
+        try {
+            bo.setSource("web");
+            String result = audioProcessService.uploadAudioToOss(bo);
+            return R.ok(result);
+        } catch (IllegalArgumentException e) {
+            return R.fail("文件格式错误: " + e.getMessage());
+        } catch (Exception e) {
+
+            return R.fail("上传处理失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 文本转语音
+     * 支持MP3、WAV、PCM格式
+     */
+    @PostMapping("/ttsToOss")
+    public R<String> textToSpeech(@RequestBody TextToSpeechRequest request) {
+        try {
+            if (request.getDeviceId() == null) {
+                return R.fail("设备ID不能为空");
+            }
+
+            String result = audioProcessService.textToSpeech(
+                    request.getDeviceId(),
+                    request.getText(),
+                    request.getFileSuffix(),
+                    "web"
+            );
+            return R.ok(result);
+        } catch (Exception e) {
+            return R.fail("文本转语音失败: " + e.getMessage());
+        }
+    }
+
+
+    /**
+     * 查询语音文件列表
+     */
+    @GetMapping("/queryAudioFileList")
+    public R<List<AppFileVo>> queryAudioFileList(Long deviceId) {
+        return R.ok(audioProcessService.queryAudioFileList(deviceId,"web"));
+    }
+
+    /**
+     * 删除语音文件
+     */
+    @GetMapping("/deleteAudioFile")
+    public R<Void> deleteAudioFile(Long id) {
+        return audioProcessService.deleteAudioFile(id);
+    }
+
+    /**
+     * 文件重命名
+     */
+    @PostMapping("/renameAudioFile")
+    public R<Void> renameAudioFile(@RequestBody AppFileRenameDto bo) {
+        return audioProcessService.renameAudioFile(bo);
+    }
+}

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

@@ -0,0 +1,107 @@
+package com.fuyuanshen.web.controller.device.bjq;
+
+import com.fuyuanshen.app.domain.vo.AppDeviceHBY100JDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.controller.device.domain.dto.*;
+import com.fuyuanshen.web.service.device.DeviceHBY100JBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * HBY100J设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/hby100j/device")
+public class WebDeviceHBY100JController extends BaseController {
+
+    private final DeviceHBY100JBizService deviceHBY100JBizService;
+
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceHBY100JDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(deviceHBY100JBizService.getInfo(id));
+    }
+
+    /**
+     * 更新语音
+     */
+    @PostMapping("/updateVoice")
+    public R<Void> updateVoice(@RequestBody HBY100JUpdateVoiceDto dto) {
+        dto.setCommunicationMode(0);
+        deviceHBY100JBizService.updateVoice(dto);
+        return R.ok();
+    }
+
+    /**
+     * 强制报警
+     *
+     */
+
+    @PostMapping("/forceAlarmActivation")
+    public R<Void> forceAlarmActivation(@RequestBody HBY100JForceAlarmActivationDto bo) {
+        deviceHBY100JBizService.forceAlarmActivation(bo);
+        return R.ok();
+    }
+
+    /**
+     * 语音播报
+     *
+     */
+    @PostMapping("/voiceBroadcast")
+    public R<Void> voiceBroadcast(@RequestBody HBY100JVoiceBroadcastDto params) {
+        deviceHBY100JBizService.voiceBroadcast(params);
+        return R.ok();
+    }
+
+
+
+
+    /**
+     * 爆闪模式
+     */
+    @PostMapping("/strobeMode")
+    public R<Void> strobeMode(@RequestBody HBY100JStrobeModeDto params) {
+        deviceHBY100JBizService.strobeMode(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 灯光调节
+     */
+    @PostMapping("/lightAdjustment")
+    public R<Void> lightAdjustment(@RequestBody HBY100JLightAdjustmentDto params) {
+        deviceHBY100JBizService.lightAdjustment(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 爆闪频率
+     */
+    @PostMapping("/strobeFrequency")
+    public R<Void> strobeFrequency(@RequestBody HBY100JStrobeFrequencyDto params) {
+        deviceHBY100JBizService.strobeFrequency(params);
+        return R.ok();
+    }
+
+    /**
+     * 修改音量
+     */
+    @PostMapping("/updateVolume")
+    public R<Void> updateVolume(@RequestBody HBY100JUpdateVolumeDto params) {
+        deviceHBY100JBizService.updateVolume(params);
+        return R.ok();
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JForceAlarmActivationDto.java

@@ -0,0 +1,23 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HBY100JForceAlarmActivationDto {
+
+    /**
+     * 设备ID
+     */
+    List<Long> deviceIds;
+    /**
+     * 0 关闭, 1开启
+     */
+    private Integer voiceStrobeAlarm;
+    /**
+     * 0 公安,1消防,2应急,3交警，4 市政，5 铁路，6 医疗，7语音
+     */
+    private Integer mode;
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JLightAdjustmentDto.java

@@ -0,0 +1,31 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class HBY100JLightAdjustmentDto{
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
+    /**
+     * 亮度值0-100
+     */
+    private Integer brightness;
+//        /**
+//         * 红色LED亮度值0-100
+//         */
+//        private Integer red;
+//
+//        /**
+//         * 蓝色LED亮度值0-100
+//         */
+//        private Integer blue;
+//
+//        /**
+//         * 黄色LED亮度值0-100
+//         */
+//        private Integer yellow;
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JStrobeFrequencyDto.java

@@ -0,0 +1,16 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public  class HBY100JStrobeFrequencyDto{
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+    /**
+     * "frequency": 1-12
+     */
+    private Integer frequency;
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JStrobeModeDto.java

@@ -0,0 +1,21 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public  class HBY100JStrobeModeDto{
+
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+    /**
+     * 0 关闭 1 开启
+     */
+    private Integer enable;
+
+    /**
+     * 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
+     */
+    private Integer mode;
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JUpdateVoiceDto.java

@@ -0,0 +1,14 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class HBY100JUpdateVoiceDto {
+
+    private Long id;
+
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     */
+    private Integer communicationMode;
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JUpdateVolumeDto.java

@@ -0,0 +1,16 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public  class HBY100JUpdateVolumeDto{
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+    /**
+     * "volume": 1-100(app端可根据需求把40作为低音量, 70作为中音量，100作为高音量)
+     */
+    private Integer volume;
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JVoiceBroadcastDto.java

@@ -0,0 +1,17 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public  class HBY100JVoiceBroadcastDto {
+
+    /**
+     * 设备ID
+     */
+    Long deviceId;
+    /**
+     * 0 关闭, 1开启
+     */
+    private Integer voiceBroadcast;
+
+}

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

@@ -59,6 +59,7 @@ public class DeviceFenceAccessRecordController extends BaseController {
         ExcelUtil.exportExcel(list, "围栏进出记录", DeviceFenceAccessRecordVo.class, response);
     }
 
+
     /**
      * 获取围栏进出记录详细信息
      *

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

@@ -3,6 +3,7 @@ package com.fuyuanshen.web.controller.device.fence;
 import java.util.List;
 
 import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
+import com.fuyuanshen.equipment.domain.bo.FenceTerminalBo;
 import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
 import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
 import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
@@ -102,6 +103,7 @@ public class DeviceGeoFenceController extends BaseController {
         return toAjax(deviceGeoFenceService.updateByBo(bo));
     }
 
+
     /**
      * 删除电子围栏
      *
@@ -129,4 +131,26 @@ public class DeviceGeoFenceController extends BaseController {
         return ResponseEntity.ok(response);
     }
 
+
+    /**
+     * 添加电子围栏终端
+     *
+     * @param bo
+     * @return
+     */
+    @PostMapping("/addTerminal")
+    public R<Void> addFenceTerminal(@RequestBody FenceTerminalBo bo) {
+        return toAjax(deviceGeoFenceService.addFenceTerminal(bo));
+    }
+    /**
+     * 删除电子围栏终端
+     *
+     * @param bo
+     * @return
+     */
+    @PostMapping("/delTerminal")
+    public R<Void> delFenceTerminal(@RequestBody FenceTerminalBo bo) {
+        return toAjax(deviceGeoFenceService.delFenceTerminal(bo));
+    }
+
 }

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

@@ -0,0 +1,95 @@
+package com.fuyuanshen.web.controller.device.xinghan;
+
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.bo.DeviceContactPhoneBo;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.DataSourceEnum;
+import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
+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.*;
+
+/**
+ * 设备控制类  HBY018A
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/hby018a/device")
+public class WebHBY018AController 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));
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @PostMapping("/SideLightSettings")
+    public R<Void> SideLightSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upSideLightSettings(params, DataSourceEnum.Web);
+        return R.ok();
+    }
+
+    /**
+     * 强制报警状态
+     * 强制报警状态，0-未报警，1-正在报警。
+     */
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceXinghanInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upShakeBitSettings(params, DataSourceEnum.Web);
+        return R.ok();
+    }
+
+    /**
+     * 自定义语音消息
+     */
+    @PostMapping("/SetVoiceMsg")
+    public R<Void> editSosVoiceMsg(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(deviceXinghanBizService.sendAlarmMessage(bo, DataSourceEnum.Web));
+    }
+
+    /**
+     * 自定义短信消息
+     */
+    @PostMapping("/SetSmsMsg")
+    public R<Void> editSosSmsMsg(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(deviceXinghanBizService.editSosSmsMsg(bo));
+    }
+
+    /**
+     * 设置消息通知开关
+     */
+    @PostMapping("/SetNotificationEnabled")
+    public R<Void> editNotificationEnabled(@RequestBody DeviceContactPhoneBo bo) {
+        return toAjax(deviceXinghanBizService.editNotificationEnabled(bo));
+    }
+
+    /**
+     * 添加设备紧急联系人
+     */
+    @PostMapping("/SetContactPhone")
+    public R<Void> editContactPhone(@RequestBody DeviceContactPhoneBo bo) {
+        return toAjax(deviceXinghanBizService.editContactPhone(bo));
+    }
+
+
+}