修复bug3

修复bug2
修复bug
2026-04-01 17:52:11 +08:00 · 2026-04-01 17:42:14 +08:00 · 2026-03-27 10:34:38 +08:00 · 2026-03-20 16:37:32 +08:00 · 2026-03-19 13:25:11 +08:00 · 2026-03-19 09:49:08 +08:00
75 changed files with 1702 additions and 879 deletions
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java
+++ b/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;
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
+++ b/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;
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java
@ -1,17 +1,17 @@
 package com.fuyuanshen.app.controller;

 import cn.dev33.satoken.annotation.SaIgnore;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
 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.domain.vo.AppFileVo;
 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;
@ -81,6 +81,7 @@ public class AppVideoController extends BaseController {
    @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) {
@ -101,11 +102,15 @@ public class AppVideoController extends BaseController {
            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()
+                    request.getFileSuffix(),
+                    "app"
            );
            return R.ok(result);
        } catch (Exception e) {
@ -119,15 +124,15 @@ public class AppVideoController extends BaseController {
     */
    @GetMapping("/queryAudioFileList")
    public R<List<AppFileVo>> queryAudioFileList(Long deviceId) {
-        return R.ok(audioProcessService.queryAudioFileList(deviceId));
+        return R.ok(audioProcessService.queryAudioFileList(deviceId,"app"));
    }

    /**
     * 删除语音文件
     */
    @GetMapping("/deleteAudioFile")
-    public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
-        return audioProcessService.deleteAudioFile(fileId,deviceId);
+    public R<Void> deleteAudioFile(Long id) {
+        return audioProcessService.deleteAudioFile(id);
    }

    /**
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceHBY100JController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/bjq/AppDeviceHBY100JController.java
@ -3,15 +3,13 @@ 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.Data;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import java.util.List;
-
 /**
 * HBY100J设备控制类
 */
@ -66,20 +64,6 @@ public class AppDeviceHBY100JController extends BaseController {
    }


-    @Data
-    public static class HBY100JVoiceBroadcastDto {
-
-        /**
-         * 设备ID
-         */
-        Long deviceId;
-        /**
-         * 0 关闭, 1开启
-         */
-        private Integer voiceBroadcast;
-
-    }
-
    /**
     * 爆闪模式
     */
@ -117,100 +101,4 @@ public class AppDeviceHBY100JController extends BaseController {
        deviceHBY100JBizService.updateVolume(params);
        return R.ok();
    }
-
-    @Data
-    public static class HBY100JUpdateVoiceDto {
-
-        private Long id;
-
-    }
-
-    @Data
-    public static class HBY100JForceAlarmActivationDto {
-
-        /**
-         * 设备ID
-         */
-        List<Long> deviceIds;
-        /**
-         * 0 关闭, 1开启
-         */
-        private Integer voiceStrobeAlarm;
-        /**
-         * 0 公安,1消防,2应急,3交警，4 市政，5 铁路，6 医疗，7语音
-         */
-        private Integer mode;
-
-    }
-
-    @Data
-    public static class HBY100JUpdateVolumeDto{
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-        /**
-         * "volume": 1-100(app端可根据需求把40作为低音量, 70作为中音量，100作为高音量)
-         */
-        private Integer volume;
-
-    }
-
-    @Data
-    public static class HBY100JStrobeFrequencyDto{
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-        /**
-         * "frequency": 1-12
-         */
-        private Integer frequency;
-
-    }
-
-    @Data
-    public static 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;
-
-    }
-    @Data
-    public static class HBY100JStrobeModeDto{
-
-        /**
-         * 设备ID
-         */
-        private Long deviceId;
-        /**
-         * 0 关闭 1 开启
-         */
-        private Integer enable;
-
-        /**
-         * 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
-         */
-        private Integer mode;
-    }
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppAudioFileDto.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppAudioFileDto.java
@ -14,4 +14,8 @@ public class AppAudioFileDto {
    private MultipartFile file;


+    /**
+     *  数据来源 1:app 2:web 3:其他
+     */
+    private String source;
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileRenameDto.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileRenameDto.java
@ -6,6 +6,8 @@ import org.springframework.web.multipart.MultipartFile;
@Data
 public class AppFileRenameDto {

+    private Long id;
+
    /**
     * 文件id
     */
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java
@ -1,13 +1,14 @@
 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;
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java
@ -1,15 +1,19 @@
 package com.fuyuanshen.app.service;

 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+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.AppFileVo;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
 import com.fuyuanshen.app.http.HttpTtsClient;
-import com.fuyuanshen.app.mapper.AppBusinessFileMapper;
 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;
@ -20,6 +24,7 @@ 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;

@ -62,6 +67,17 @@ public class AudioProcessService {
    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;

    /**
     * 处理上传的音频文件
@ -372,7 +388,8 @@ public class AudioProcessService {
            appBusinessFileBo.setFileId(upload.getOssId());
            appBusinessFileBo.setBusinessId(bo.getDeviceId());
            appBusinessFileBo.setFileType(3L);
-            appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId());
+            Long userId = getUserId(bo.getSource(), bo.getDeviceId());
+            appBusinessFileBo.setCreateBy(userId);
            savedPath = saveByteArrayToFile(file.getInputStream(), generateRandomFileName(fileSuffix));
            if (savedPath != null) {
                log.info("MP3文件已保存: {}", savedPath);
@ -396,6 +413,20 @@ public class AudioProcessService {
        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;
+    }
    /**
     * 校验音频文件格式
     */
@ -418,8 +449,9 @@ public class AudioProcessService {
            throw new IllegalArgumentException("只允许上传MP3、WAV、PCM格式的音频文件");
        }

+        long fileSize = 256 * 1024;
        // 检查文件大小
-        if (file.getSize() > MAX_AUDIO_SIZE) {
+        if (file.getSize() > fileSize) {
            throw new IllegalArgumentException("音频大小不能超过5MB");
        }
    }
@ -435,7 +467,7 @@ public class AudioProcessService {
        return SUPPORTED_FORMATS.contains(ext);
    }

-    public String textToSpeech(Long deviceId,String text, String fileSuffix) {
+    public String textToSpeech(Long deviceId,String text, String fileSuffix,String source) {
        //支持PCM/WAV/MP3格式
        if (fileSuffix == null || fileSuffix.isEmpty()) {
            fileSuffix = "mp3";
@ -448,9 +480,9 @@ public class AudioProcessService {
        if (!contains) {
            throw new IllegalArgumentException("不支持的音频格式");
        }
-        String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
-        String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
-        String appKey = "lbGuq5K5bEH4uxmT";
+//        String accessKeyId = "LTAI5t66moCkhNC32TDJ5ReP";
+//        String accessKeySecret = "2F3sdoBJ08bYvJcuDgSkLnJwGXsvYH";
+//        String appKey = "lbGuq5K5bEH4uxmT";
        String savedPath = null;
        String savedMp3VolumePath = null;
        try {
@ -458,7 +490,7 @@ public class AudioProcessService {
            HttpTtsClient httpClient = new HttpTtsClient(accessKeyId, accessKeySecret, appKey);
 //
            byte[] mp3Data = httpClient.synthesizeTextToMp3(text,fileSuffix);
-//            byte[] mp3Data = alibabaTTSUtil.synthesizeTextToMp3(text);
+//            byte[] mp3Data = alibabaTTSUtil.synthesizeTextToMp3(text,fileSuffix);


            AppBusinessFileBo appBusinessFileBo = new AppBusinessFileBo();
@ -472,7 +504,7 @@ public class AudioProcessService {
            String fileName = generateRandomFileName(fileSuffix);
            savedMp3VolumePath = directory + "/" + fileName;
            log.info("保存MP3文件: {}", savedMp3VolumePath);
-            FfmpegVolumeUtil.increaseMp3Volume(savedPath, savedMp3VolumePath, 12);
+            FfmpegVolumeUtil.increaseMp3Volume(savedPath, savedMp3VolumePath, 8);

            File file = new File(savedMp3VolumePath);
            String fileHash = fileHashUtil.getFileHash(file,"SHA-256");
@ -486,7 +518,8 @@ public class AudioProcessService {
            appBusinessFileBo.setFileId(upload.getOssId());
            appBusinessFileBo.setBusinessId(deviceId);
            appBusinessFileBo.setFileType(3L);
-            appBusinessFileBo.setCreateBy(AppLoginHelper.getUserId());
+            Long userId = getUserId(source, deviceId);
+            appBusinessFileBo.setCreateBy(userId);
            appBusinessFileService.insertByBo(appBusinessFileBo);
            if (upload != null) {
                return upload.getUrl();
@ -531,32 +564,36 @@ public class AudioProcessService {
            extension = "." + extension;
        }

-        return timestamp + "_" + String.format("%04d", randomNum) + "_" + uuidPart + extension;
+        return timestamp+extension;
    }

-    public List<AppFileVo> queryAudioFileList(Long deviceId) {
+    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);
-        List<AppFileVo> appFileVos = appBusinessFileService.queryAppFileList(bo);
-        return appFileVos;
+        if("web".equals(source)){
+            bo.setCreateBy(null);
+        }else{
+            bo.setCreateBy(userId);
+        }
+        return appBusinessFileService.queryAppFileList(bo);
    }

-    public R<Void> deleteAudioFile(Long fileId,Long deviceId) {
+    public R<Void> deleteAudioFile(Long id) {
        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("file_id",fileId);
-        updateWrapper.eq("business_id",deviceId);
+        updateWrapper.eq("id",id);
        appBusinessFileMapper.delete(updateWrapper);
        return R.ok();
    }

    public R<Void> renameAudioFile(AppFileRenameDto bo) {
        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("file_id",bo.getFileId());
-        updateWrapper.eq("business_id",bo.getDeviceId());
+        updateWrapper.eq("id",bo.getId());
        updateWrapper.set("re_name",bo.getFileName());
        appBusinessFileMapper.update(updateWrapper);
        return R.ok();
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/NewMqttInboundConfiguration.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/NewMqttInboundConfiguration.java
@ -1,68 +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();
-    // }
-}
+//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();
+//    // }
+//}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/NewMqttOutboundConfiguration.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/NewMqttOutboundConfiguration.java
@ -1,46 +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;
-    }
- 
-}
+//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;
+//    }
+//
+//}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/RegisEquipMqttInboundConfiguration.java
+++ b/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();
+    // }
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/RegisEquipMqttOutboundConfiguration.java
+++ b/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;
+    }
+ 
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/NewReceiverMessageHandler.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/NewReceiverMessageHandler.java
@ -1,125 +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);
+//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;
 //        }
-////         获取锁成功，处理业务
-//        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);
+//        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));
 //        }
-
-
-        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
-//        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);
-//            }
+//        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);
+////            }
+////        }
+//    }
+//}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/ReceiverMessageHandler.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/ReceiverMessageHandler.java
@ -6,10 +6,7 @@ import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
-import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
-import com.fuyuanshen.global.mqtt.base.MqttRuleEngine;
-import com.fuyuanshen.global.mqtt.base.MqttXinghanCommandType;
-import com.fuyuanshen.global.mqtt.base.NewMqttRuleContext;
+import com.fuyuanshen.global.mqtt.base.*;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
 import lombok.extern.slf4j.Slf4j;
@ -35,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();
@ -50,9 +50,18 @@ public class ReceiverMessageHandler implements MessageHandler {
        if (receivedTopic == null || payloadDict == null) {
            return;
        }
-        String[] subStr = receivedTopic.split("/");
-        String deviceImei = subStr[1];

+        // 模版格式匹配
+        boolean flag = checkTemplateFormatMatching(payloadDict);
+
+
+        String[] subStr = receivedTopic.split("/");
+        String deviceImei = null;
+        if(flag){
+            deviceImei = payloadDict.getStr("imei");
+        } else {
+            deviceImei = subStr[1];
+        }

        RedissonClient client = RedisUtils.getClient();
        String lockKey = "mqtt:consumer:lock:";
@ -74,7 +83,22 @@ public class ReceiverMessageHandler implements MessageHandler {
                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
                }

+                // 新的通信协议
+                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 = newRuleEngine.executeRule(context);
+
+                    if (!ruleExecuted) {
+                        log.warn("未找到匹配的规则来处理命令类型: {}", topicArr[2] + " : " +funcType);
+                    }
+                    return;
+                }

                if (convertArr.length > 0) {
                    Byte val1 = (Byte) convertArr[0];
@ -89,6 +113,7 @@ public class ReceiverMessageHandler implements MessageHandler {
                    if (!ruleExecuted) {
                        log.warn("未找到匹配的规则来处理命令类型: {}", val1);
                    }
+                    return;
                }

                /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
@ -117,4 +142,18 @@ public class ReceiverMessageHandler implements MessageHandler {
        }
    }

+    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;
+    }
+
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/RegisEquipReceiverMessageHandler.java
+++ b/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());
+    }
+
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqActiveReportingDeviceDataRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqActiveReportingDeviceDataRule.java
@ -38,18 +38,18 @@ public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
    @Override
    public void execute(MqttRuleContext context) {
        try {
-//            Object[] convertArr = context.getConvertArr();
-//            // Latitude, longitude
-//            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
-//            String mainLightMode = convertArr[1].toString();
-//            String laserLightMode = convertArr[2].toString();
-//            String batteryPercentage = convertArr[3].toString();
-//            String chargeState = convertArr[4].toString();
-//            String batteryRemainingTime = convertArr[5].toString();
-//
-//            // 发送设备状态和位置信息到Redis
-//            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
-//                    batteryPercentage, chargeState, batteryRemainingTime);
+            Object[] convertArr = context.getConvertArr();
+            // Latitude, longitude
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            String mainLightMode = convertArr[1].toString();
+            String laserLightMode = convertArr[2].toString();
+            String batteryPercentage = convertArr[3].toString();
+            String chargeState = convertArr[4].toString();
+            String batteryRemainingTime = convertArr[5].toString();
+
+            // 发送设备状态和位置信息到Redis
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
+                    batteryPercentage, chargeState, batteryRemainingTime);
        } catch (Exception e) {
            log.error("处理上报数据命令时出错", e);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqBootLogoRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqBootLogoRule.java
@ -44,37 +44,37 @@ public class BjqBootLogoRule implements MqttMessageRule {
    public void execute(MqttRuleContext context) {
        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
        try {
-//            Byte val2 = (Byte) context.getConvertArr()[1];
-//            if (val2 == 100) {
-//                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
-//                return;
-//            }
-//
-//            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX  + context.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX);
-//            if (StringUtils.isEmpty(data)) {
-//                return;
-//            }
-//
-//            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
-//            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
-//            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
-//
-//            ArrayList<Integer> intData = new ArrayList<>();
-//            intData.add(3);
-//            intData.add((int) val2);
-//            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
-//            intData.add(0);
-//            intData.add(0);
-//            intData.add(0);
-//            intData.add(0);
-//
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("instruct", intData);
-//
-//            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-//            log.info("发送开机LOGO点阵数据到设备消息=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
+            Byte val2 = (Byte) context.getConvertArr()[1];
+            if (val2 == 100) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                return;
+            }
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX  + context.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX);
+            if (StringUtils.isEmpty(data)) {
+                return;
+            }
+
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(3);
+            intData.add((int) val2);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            log.info("发送开机LOGO点阵数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));

        } catch (Exception e) {
            log.error("处理开机LOGO时出错", e);
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLaserModeSettingsRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLaserModeSettingsRule.java
@ -34,15 +34,15 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
    public void execute(MqttRuleContext context) {
        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
        try {
-//            Object[] convertArr = context.getConvertArr();
-//
-//            String mode = convertArr[1].toString();
-//            if(StringUtils.isNotBlank(mode)){
-//                // 发送设备状态和位置信息到Redis
-//                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
-//            }
-//
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+            Object[] convertArr = context.getConvertArr();
+
+            String mode = convertArr[1].toString();
+            if(StringUtils.isNotBlank(mode)){
+                // 发送设备状态和位置信息到Redis
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
+            }
+
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
        } catch (Exception e) {
            log.error("处理激光模式命令时出错", e);
            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLightBrightnessRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLightBrightnessRule.java
@ -34,15 +34,15 @@ public class BjqLightBrightnessRule implements MqttMessageRule {
    public void execute(MqttRuleContext context) {
        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
        try {
-//            Object[] convertArr = context.getConvertArr();
-//
-//            String convertValue = convertArr[1].toString();
-//            // 将设备状态信息存储到Redis中
-//            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
-//
-//            // 存储到Redis
-//            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            Object[] convertArr = context.getConvertArr();
+
+            String convertValue = convertArr[1].toString();
+            // 将设备状态信息存储到Redis中
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+            // 存储到Redis
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
        } catch (Exception e) {
            log.error("处理灯光亮度命令时出错", e);
            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLocationDataRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLocationDataRule.java
@ -52,26 +52,26 @@ public class BjqLocationDataRule implements MqttMessageRule {
    public void execute(MqttRuleContext context) {
        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
        try {
-//            Object[] convertArr = context.getConvertArr();
-//            // Latitude, longitude
-//            String latitude = convertArr[1].toString();
-//            String longitude = convertArr[2].toString();
-//            // 判断 latitude 和 longitude 是否都为 0
-//            if ("0".equals(latitude) && "0".equals(longitude)) {
-//                log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
-//                return;
-//            }
-//            // 异步发送经纬度到Redis
-//            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
-//            // 异步保存数据
-//            asyncSaveLocationToMySQLWithFuture(context.getDeviceImei(), latitude, longitude);
-//
-//            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
-//            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-//            log.info("发送定位数据到设备=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            Object[] convertArr = context.getConvertArr();
+            // Latitude, longitude
+            String latitude = convertArr[1].toString();
+            String longitude = convertArr[2].toString();
+            // 判断 latitude 和 longitude 是否都为 0
+            if ("0".equals(latitude) && "0".equals(longitude)) {
+                log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
+                return;
+            }
+            // 异步发送经纬度到Redis
+            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
+            // 异步保存数据
+            asyncSaveLocationToMySQLWithFuture(context.getDeviceImei(), latitude, longitude);
+
+            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            log.info("发送定位数据到设备=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
        } catch (Exception e) {
            log.error("处理定位数据命令时出错", e);
            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
@ -52,45 +52,45 @@ public class BjqModeRule implements MqttMessageRule {
        try {
            log.info("处理灯光模式命令");
            log.info("MQTT消息负载字典：{}", context.getPayloadDict());
-//            Object[] convertArr = context.getConvertArr();
-//
-//            String mainLightMode = convertArr[1].toString();
-//            String batteryRemainingTime = convertArr[2].toString();
-//            if (StringUtils.isNotBlank(mainLightMode)) {
-//                log.info("设备离线mainLightMode：{}", mainLightMode);
-//                if ("0".equals(mainLightMode)) {
-//
-//                    // 设备离线
-//                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
-//                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0");
-//
-//                    String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
-//                    String messageSendingValue = RedisUtils.getCacheObject(sendMessageIng);
-//                    if ("1".equals(messageSendingValue)) {
-//                        // 设置为故障状态
-//                        RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "2");
-//                        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-//                        updateWrapper.eq("device_imei", context.getDeviceImei());
-//                        updateWrapper.set("online_status", 2);
-//                        deviceService.update(updateWrapper);
-//                        RedisUtils.deleteObject(sendMessageIng);
-//
-//                        // 解除告警
-//                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-//                        if (RedisUtils.getCacheObject(deviceRedisKey) != null) {
-//                            RedisUtils.deleteObject(deviceRedisKey);
-//                        }
-//                        cancelAlarm(context.getDeviceImei());
-//                    }
-//                }
-//                // 发送设备状态和位置信息到Redis
-//                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode);
-//                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
-//
-//                // 存储到Redis
-//                RedisUtils.setCacheObject(deviceRedisKey, batteryRemainingTime);
-//            }
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            Object[] convertArr = context.getConvertArr();
+
+            String mainLightMode = convertArr[1].toString();
+            String batteryRemainingTime = convertArr[2].toString();
+            if (StringUtils.isNotBlank(mainLightMode)) {
+                log.info("设备离线mainLightMode：{}", mainLightMode);
+                if ("0".equals(mainLightMode)) {
+
+                    // 设备离线
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0");
+
+                    String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+                    String messageSendingValue = RedisUtils.getCacheObject(sendMessageIng);
+                    if ("1".equals(messageSendingValue)) {
+                        // 设置为故障状态
+                        RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "2");
+                        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                        updateWrapper.eq("device_imei", context.getDeviceImei());
+                        updateWrapper.set("online_status", 2);
+                        deviceService.update(updateWrapper);
+                        RedisUtils.deleteObject(sendMessageIng);
+
+                        // 解除告警
+                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
+                        if (RedisUtils.getCacheObject(deviceRedisKey) != null) {
+                            RedisUtils.deleteObject(deviceRedisKey);
+                        }
+                        cancelAlarm(context.getDeviceImei());
+                    }
+                }
+                // 发送设备状态和位置信息到Redis
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode);
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, batteryRemainingTime);
+            }
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
        } catch (Exception e) {
            log.error("处理灯光模式命令时出错", e);
            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqSendMessageRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqSendMessageRule.java
@ -45,47 +45,47 @@ public class BjqSendMessageRule implements MqttMessageRule {
        try {

 //            Byte val2 = (Byte) context.getConvertArr()[1];
-//            String val2Str = context.getConvertArr()[1].toString();
-//            int val2 = Integer.parseInt(val2Str);
-//            System.out.println("收到设备信息命令:"+val2);
-//            if (val2 == 100) {
-//                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
-//                return;
-//            }
-//
-//            if(val2==200){
-//                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
-//                RedisUtils.deleteObject(sendMessageIng);
-//                return;
-//            }
-//
-//
-//            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":app_send_message_data");
-//            if (StringUtils.isEmpty(data)) {
-//                return;
-//            }
-//
-//            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
-//            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
-//            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
-////            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
-//
-//            ArrayList<Integer> intData = new ArrayList<>();
-//            intData.add(6);
-//            intData.add(val2);
-//            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
-//            intData.add(0);
-//            intData.add(0);
-//            intData.add(0);
-//            intData.add(0);
-//
-//            Map<String, Object> map = new HashMap<>();
-//            map.put("instruct", intData);
-//
-//            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-//            log.info("发送设备信息数据到设备消息=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
+            String val2Str = context.getConvertArr()[1].toString();
+            int val2 = Integer.parseInt(val2Str);
+            System.out.println("收到设备信息命令:"+val2);
+            if (val2 == 100) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                return;
+            }
+
+            if(val2==200){
+                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+                RedisUtils.deleteObject(sendMessageIng);
+                return;
+            }
+
+
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":app_send_message_data");
+            if (StringUtils.isEmpty(data)) {
+                return;
+            }
+
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+//            System.out.println("第" + val2 + "块数据: " + Arrays.toString(specificChunk));
+
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(6);
+            intData.add(val2);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+            intData.add(0);
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("instruct", intData);
+
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            log.info("发送设备信息数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    JsonUtils.toJsonString(map));

        } catch (Exception e) {
            log.error("处理发送设备信息时出错", e);
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType10StrobeMode.java
@ -29,13 +29,13 @@ public class FuncType10StrobeMode implements NewMqttMessageRule {
        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));
-//            }
+            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);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType11Frequency.java
@ -29,13 +29,13 @@ public class FuncType11Frequency implements NewMqttMessageRule {
        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));
-//            }
+            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);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType12ForceAudio.java
@ -30,14 +30,14 @@ public class FuncType12ForceAudio implements NewMqttMessageRule {

        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));
-//            }
+            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);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType1Rest.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType1Rest.java
@ -1,46 +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() + ":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);
-//        }
-//    }
-//}
+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);
+        }
+    }
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType2BaseInfo.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType2BaseInfo.java
@ -1,46 +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);
-//        }
-//    }
-//}
+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);
+        }
+    }
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType5UpdateVoice.java
@ -29,13 +29,13 @@ public class FuncType5UpdateVoice implements NewMqttMessageRule {
        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));
-//            }
+            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);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType6VoicePlay.java
@ -29,13 +29,13 @@ public class FuncType6VoicePlay implements NewMqttMessageRule {
        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));
-//            }
+            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);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/hby100j/FuncType9UpdateVolume.java
@ -29,13 +29,13 @@ public class FuncType9UpdateVolume implements NewMqttMessageRule {
        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));
-//            }
+            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);
        }
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceDebugController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceDebugController.java
@ -1,19 +1,15 @@
 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.web.domain.Dto.DeviceDebugEditDto;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
@ -28,8 +24,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;

 /**
 * 联调中心
@ -125,7 +119,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());
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WebVideoController.java
+++ b/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);
+    }
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/bjq/WebDeviceHBY100JController.java
+++ b/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();
+    }
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JForceAlarmActivationDto.java
+++ b/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;
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JLightAdjustmentDto.java
+++ b/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;
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JStrobeFrequencyDto.java
+++ b/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;
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JStrobeModeDto.java
+++ b/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;
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JUpdateVoiceDto.java
+++ b/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;
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JUpdateVolumeDto.java
+++ b/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;
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/domain/dto/HBY100JVoiceBroadcastDto.java
+++ b/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;
+
+}
--- a/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceInfoVo.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceInfoVo.java
@ -1,10 +1,7 @@
 package com.fuyuanshen.web.domain.vo;

-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
 import lombok.Data;

 import java.util.List;
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java
@ -86,7 +86,7 @@ public class DeviceBizService {
        List<AppDeviceVo> records = result.getRecords();
        if (records != null && !records.isEmpty()) {
            records.forEach(item -> {
-                if (item.getCommunicationMode() != null && item.getCommunicationMode() == 0) {
+                if (item.getCommunicationMode() != null && (item.getCommunicationMode() == 0 || item.getCommunicationMode() == 2)) {

                    // 设备在线状态
                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
@ -271,12 +271,12 @@ public class DeviceBizService {
        if (type == 0) {
            QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
            bindRecordQueryWrapper.eq("device_id", device.getId());
-            bindRecordQueryWrapper.eq("binding_user_id", userId);
+//            bindRecordQueryWrapper.eq("binding_user_id", userId);
            Long count = appDeviceBindRecordMapper.selectCount(bindRecordQueryWrapper);
            if (count == 0) {
                throw new RuntimeException("请先绑定设备！！！");
            }
-            if (count < 2) {
+            if (count <= 1) {
                UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
                deviceUpdateWrapper.eq("id", device.getId())
                        .set("binding_user_id", null)
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceDebugService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceDebugService.java
@ -1,13 +1,13 @@
 package com.fuyuanshen.web.service.device;

 import cn.hutool.core.collection.CollUtil;
-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.AppOperationVideo;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.service.IAppBusinessFileService;
-import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.equipment.service.DeviceService;
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceHBY100JBizService.java
@ -1,63 +1,46 @@
 package com.fuyuanshen.web.service.device;

-import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.fuyuanshen.app.controller.device.bjq.AppDeviceHBY100JController;
-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.AppPersonnelInfo;
-import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
-import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
-import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceHBY100JDetailVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
-import com.fuyuanshen.app.mapper.AppBusinessFileMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
-import com.fuyuanshen.app.service.IAppBusinessFileService;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.exception.ServiceException;
-import com.fuyuanshen.common.core.utils.*;
+import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 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.Device;
 import com.fuyuanshen.equipment.domain.DeviceType;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
-import com.fuyuanshen.equipment.enums.LightModeEnum;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.mapper.AppBusinessFileMapper;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import com.fuyuanshen.global.mqtt.rule.hby100j.domin.*;
 import com.fuyuanshen.global.mqtt.utils.GenerateIdUtil;
-import com.fuyuanshen.system.domain.SysOss;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.mapper.SysOssMapper;
+import com.fuyuanshen.web.controller.device.domain.dto.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;

-import java.io.InputStream;
-import java.time.Duration;
-import java.util.*;
+import java.util.Date;
+import java.util.List;

 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.buildArr;
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
-import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;


@Slf4j
@ -72,9 +55,12 @@ public class DeviceHBY100JBizService {
    private final IAppBusinessFileService appBusinessFileService;
    private final AppBusinessFileMapper appBusinessFileMapper;
    private final SysOssMapper sysOssMapper;
+    private final AppDeviceShareMapper appDeviceShareMapper;


    private static final String DEVICE_TYPE = "HBY100/";
+
+    private static final Long pcUserId = 0L;
    /**
     * 记录设备操作日志
     *
@ -174,6 +160,60 @@ public class DeviceHBY100JBizService {
            }
        }

+        String voicePlayRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                device.getDeviceImei() + ":voicePlay";
+        String voicePlayStatus = RedisUtils.getCacheObject(voicePlayRedisKey);
+        if(StringUtils.isNotBlank(voicePlayStatus)){
+            FuncType6VoicePlayRequest funcType6VoicePlayRequest = JSONObject.parseObject(voicePlayStatus, FuncType6VoicePlayRequest.class);
+            if(funcType6VoicePlayRequest.getData() != null){
+                vo.setVoiceBroadcast(funcType6VoicePlayRequest.getData().getVoiceBroadcast());
+            }
+        }
+
+        String strobeModeRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                device.getDeviceImei() + ":strobeMode";
+        String strobeModeStatus = RedisUtils.getCacheObject(strobeModeRedisKey);
+        if(StringUtils.isNotBlank(strobeModeStatus)){
+            FuncType10StrobeModeRequest strobeModeRequest = JSONObject.parseObject(strobeModeStatus, FuncType10StrobeModeRequest.class);
+            FuncType10StrobeModeRequest.Data data = strobeModeRequest.getData();
+            if(data != null){
+                vo.setStrobeMode(strobeModeRequest.getData().getMode());
+                vo.setStrobeEnable(strobeModeRequest.getData().getEnable());
+            }
+        }
+
+        String updateVolumeRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                device.getDeviceImei() + ":updateVolume";
+        String updateVolumeStatus = RedisUtils.getCacheObject(updateVolumeRedisKey);
+        if(StringUtils.isNotBlank(updateVolumeStatus)){
+            FuncType9UpdateVolumeRequest updateVolumeRequest = JSONObject.parseObject(updateVolumeStatus, FuncType9UpdateVolumeRequest.class);
+            if(updateVolumeRequest.getData() != null){
+                vo.setVolume(updateVolumeRequest.getData().getVolume());
+            }
+        }
+
+        String frequencyRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                device.getDeviceImei() + ":frequency";
+        String frequencyStatus = RedisUtils.getCacheObject(frequencyRedisKey);
+        if(StringUtils.isNotBlank(frequencyStatus)){
+            FuncType11FrequencyRequest frequencyRequest = JSONObject.parseObject(frequencyStatus, FuncType11FrequencyRequest.class);
+            if(frequencyRequest.getData() != null){
+                vo.setStrobeFrequency(frequencyRequest.getData().getFrequency());
+            }
+        }
+
+        String forceAudioRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                device.getDeviceImei() + ":forceAudio";
+        String forceAudioStatus = RedisUtils.getCacheObject(forceAudioRedisKey);
+        if(StringUtils.isNotBlank(forceAudioStatus)){
+            FuncType12ForceAudioRequest forceAudioRequest = JSONObject.parseObject(forceAudioStatus, FuncType12ForceAudioRequest.class);
+            if(forceAudioRequest.getData() != null){
+                vo.setVoiceStrobeAlarm(forceAudioRequest.getData().getVoiceStrobeAlarm());
+                vo.setAlarmMode(forceAudioRequest.getData().getMode());
+            }
+        }
+
+
        // 获取经度纬度

        String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX);
@ -206,12 +246,12 @@ public class DeviceHBY100JBizService {
    }


-    public void forceAlarmActivation(AppDeviceHBY100JController.HBY100JForceAlarmActivationDto bo) {
+    public void forceAlarmActivation(HBY100JForceAlarmActivationDto bo) {
        List<Long> deviceIds = bo.getDeviceIds();
        if (deviceIds == null || deviceIds.isEmpty()) {
            throw new ServiceException("请选择设备");
        }
-        LoginUser loginUser = LoginHelper.getLoginUser();
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
        bo.getDeviceIds().forEach(deviceId -> {
            Device deviceObj = deviceMapper.selectById(deviceId);
            if (getDeviceStatus(deviceObj.getDeviceImei())) {
@ -229,14 +269,14 @@ public class DeviceHBY100JBizService {
            request.setData(data);
            log.info("HBY100J强制报警，下发设备参数：{}", request);
            mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+            Long userId = loginUser == null ? pcUserId : loginUser.getUserId();

-
-//            recordDeviceLog(deviceId, deviceObj.getDeviceName(), "强制报警激活", "强制报警激活", loginUser.getUserId());
+            recordDeviceLog(deviceId, deviceObj.getDeviceName(), "强制报警激活", "强制报警激活", userId);
        });

    }

-    public void updateVoice(AppDeviceHBY100JController.HBY100JUpdateVoiceDto dto) {
+    public void updateVoice(HBY100JUpdateVoiceDto dto) {
        AppBusinessFileVo appBusinessFileVo = appBusinessFileMapper.selectVoById(dto.getId());
        if(appBusinessFileVo == null){
            throw new ServiceException("文件不存在");
@ -245,21 +285,22 @@ public class DeviceHBY100JBizService {
        if (getDeviceStatus(deviceObj.getDeviceImei())) {
            throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
        }
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
+        if(dto.getCommunicationMode()!=null && dto.getCommunicationMode()==0){
+            SysOssVo sysOssVo = sysOssMapper.selectVoById(appBusinessFileVo.getFileId());
+            FuncType5UpdateVoiceRequest  request = new FuncType5UpdateVoiceRequest();
+            request.setRequestId(GenerateIdUtil.generateNumericId());
+            request.setImei(deviceObj.getDeviceImei());
+            request.setFuncType("5");
+            request.setTimestamp(System.currentTimeMillis());
+            FuncType5UpdateVoiceRequest.Data data = new FuncType5UpdateVoiceRequest.Data();
+            data.setVoiceResource(sysOssVo.getUrl());
+            data.setVoiceType(0);
+            request.setData(data);
+            log.info("HBY100J更新语音，参数：{}", request);

-        LoginUser loginUser = LoginHelper.getLoginUser();
-        SysOssVo sysOssVo = sysOssMapper.selectVoById(appBusinessFileVo.getFileId());
-        FuncType5UpdateVoiceRequest  request = new FuncType5UpdateVoiceRequest();
-        request.setRequestId(GenerateIdUtil.generateNumericId());
-        request.setImei(deviceObj.getDeviceImei());
-        request.setFuncType("5");
-        request.setTimestamp(System.currentTimeMillis());
-        FuncType5UpdateVoiceRequest.Data data = new FuncType5UpdateVoiceRequest.Data();
-        data.setVoiceResource(sysOssVo.getUrl());
-        data.setVoiceType(0);
-        request.setData(data);
-        log.info("HBY100J更新语音，参数：{}", request);
-
-        mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+            mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+        }

        UpdateWrapper<AppBusinessFile> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("business_id", appBusinessFileVo.getBusinessId());
@ -270,6 +311,8 @@ public class DeviceHBY100JBizService {
        updateWrapper2.eq("id", appBusinessFileVo.getId());
        updateWrapper2.set("use_status", 1);
        appBusinessFileMapper.update(updateWrapper2);
+        Long userId = loginUser == null ? pcUserId : loginUser.getUserId();
+        recordDeviceLog(deviceObj.getId(), deviceObj.getDeviceName(), "更新语音", "更新语音", userId);
    }

    private String buildMqttTopic(String deviceImei) {
@ -277,11 +320,12 @@ public class DeviceHBY100JBizService {
        return MqttConstants.GLOBAL_PUB_KEY2 +tenantId + "/" + DEVICE_TYPE + deviceImei;
    }

-    public void strobeMode(AppDeviceHBY100JController.HBY100JStrobeModeDto params) {
+    public void strobeMode(HBY100JStrobeModeDto params) {
        Device deviceObj = deviceMapper.selectById(params.getDeviceId());
        if (getDeviceStatus(deviceObj.getDeviceImei())) {
            throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
        }
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
        FuncType10StrobeModeRequest request = new FuncType10StrobeModeRequest();
        request.setRequestId(GenerateIdUtil.generateNumericId());
        request.setImei(deviceObj.getDeviceImei());
@ -293,9 +337,12 @@ public class DeviceHBY100JBizService {
        request.setData(data);
        log.info("HBY100J爆闪模式开启/关闭，下发设备参数：{}", request);
        mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+        String content = params.getEnable() != null && params.getEnable() == 1 ? "爆闪模式开启" : "爆闪模式关闭";
+        Long userId = loginUser == null ? pcUserId : loginUser.getUserId();
+        recordDeviceLog(deviceObj.getId(), deviceObj.getDeviceName(), content, content, userId);
    }

-    public void lightAdjustment(AppDeviceHBY100JController.HBY100JLightAdjustmentDto params) {
+    public void lightAdjustment(HBY100JLightAdjustmentDto params) {
        log.info("HBY100J灯光调节，请求参数：{}", params);
        Device deviceObj = deviceMapper.selectById(params.getDeviceId());
        if (deviceObj == null) {
@ -304,6 +351,7 @@ public class DeviceHBY100JBizService {
        if (getDeviceStatus(deviceObj.getDeviceImei())) {
            throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
        }
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
        FuncType13BrightnessRequest request = new FuncType13BrightnessRequest();
        request.setRequestId(GenerateIdUtil.generateNumericId());
        request.setImei(deviceObj.getDeviceImei());
@ -316,9 +364,11 @@ public class DeviceHBY100JBizService {
        request.setData(data);
        log.info("HBY100J灯光调节，下发设备参数：{}", request);
        mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+        Long userId = loginUser == null ? pcUserId : loginUser.getUserId();
+        recordDeviceLog(deviceObj.getId(), deviceObj.getDeviceName(), "灯光调节", "灯光调节", userId);
    }

-    public void strobeFrequency(AppDeviceHBY100JController.HBY100JStrobeFrequencyDto params) {
+    public void strobeFrequency(HBY100JStrobeFrequencyDto params) {
        Device deviceObj = deviceMapper.selectById(params.getDeviceId());
        if (deviceObj == null) {
            throw new ServiceException("设备不存在");
@ -326,6 +376,7 @@ public class DeviceHBY100JBizService {
        if (getDeviceStatus(deviceObj.getDeviceImei())) {
            throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
        }
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
        FuncType11FrequencyRequest request = new FuncType11FrequencyRequest();
        request.setRequestId(GenerateIdUtil.generateNumericId());
        request.setImei(deviceObj.getDeviceImei());
@ -336,9 +387,11 @@ public class DeviceHBY100JBizService {
        request.setData(data);
        log.info("HBY100J爆闪频率，下发设备参数：{}", request);
        mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+        Long userId = loginUser == null ? pcUserId : loginUser.getUserId();
+        recordDeviceLog(deviceObj.getId(), deviceObj.getDeviceName(), "爆闪频率", "爆闪频率", userId);
    }

-    public void updateVolume(AppDeviceHBY100JController.HBY100JUpdateVolumeDto params) {
+    public void updateVolume(HBY100JUpdateVolumeDto params) {
        Device deviceObj = deviceMapper.selectById(params.getDeviceId());
        if (deviceObj == null) {
            throw new ServiceException("设备不存在");
@ -346,6 +399,7 @@ public class DeviceHBY100JBizService {
        if (getDeviceStatus(deviceObj.getDeviceImei())) {
            throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
        }
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
        FuncType9UpdateVolumeRequest request = new FuncType9UpdateVolumeRequest();
        request.setRequestId(GenerateIdUtil.generateNumericId());
        request.setImei(deviceObj.getDeviceImei());
@ -356,9 +410,11 @@ public class DeviceHBY100JBizService {
        request.setData(data);
        log.info("HBY100J更新音量，下发设备参数：{}", JSON.toJSONString(request));
        mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+        Long userId = loginUser == null ? pcUserId : loginUser.getUserId();
+        recordDeviceLog(deviceObj.getId(), deviceObj.getDeviceName(), "更新音量", "更新音量", userId);
    }

-    public void voiceBroadcast(AppDeviceHBY100JController.HBY100JVoiceBroadcastDto params) {
+    public void voiceBroadcast(HBY100JVoiceBroadcastDto params) {
        Device deviceObj = deviceMapper.selectById(params.getDeviceId());
        if (deviceObj == null) {
            throw new ServiceException("设备不存在");
@ -366,6 +422,7 @@ public class DeviceHBY100JBizService {
        if (getDeviceStatus(deviceObj.getDeviceImei())) {
            throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
        }
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
        FuncType6VoicePlayRequest request = new FuncType6VoicePlayRequest();
        request.setRequestId(GenerateIdUtil.generateNumericId());
        request.setImei(deviceObj.getDeviceImei());
@ -376,5 +433,9 @@ public class DeviceHBY100JBizService {
        request.setData(data);
        log.info("HBY100J语音播报，下发设备参数：{}", request);
        mqttGateway.sendMsgToMqtt(buildMqttTopic(deviceObj.getDeviceImei()), 1, JSON.toJSONString(request));
+        Long userId = loginUser == null ? pcUserId : loginUser.getUserId();
+        recordDeviceLog(deviceObj.getId(), deviceObj.getDeviceName(), "语音播报", "语音播报", userId);
    }
+
+
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
@ -1,11 +1,11 @@
 package com.fuyuanshen.web.service.device;

 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -15,20 +15,17 @@ import com.fuyuanshen.app.domain.AppPersonnelInfo;
 import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
-import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.exception.BadRequestException;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
-import com.fuyuanshen.common.core.utils.ObjectUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
@ -40,7 +37,6 @@ import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
 import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
-import com.fuyuanshen.equipment.enums.LightModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
@ -51,8 +47,6 @@ import com.fuyuanshen.global.mqtt.base.MqttXinghanJson;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.MqttConstants;
-import com.fuyuanshen.system.domain.vo.SysOssVo;
-import com.fuyuanshen.system.domain.vo.SysRoleVo;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
 import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
 import com.fuyuanshen.web.domain.vo.DeviceXinghanDetailVo;
@ -64,15 +58,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;

 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
 import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
@ -93,6 +84,8 @@ public class DeviceXinghanBizService {
    private final IDeviceAlarmService deviceAlarmService;
    private final DeviceTypeGrantsMapper deviceTypeGrantsMapper;
    private final DeviceAssignmentsService deviceAssignmentsService;
+    private final IAppBusinessFileService appBusinessFileService;
+    private final IAppOperationVideoService appOperationVideoService;
    @Autowired
    private ObjectMapper objectMapper;
    private final AliyunVoiceUtil voiceUtil;
@ -721,20 +714,31 @@ public class DeviceXinghanBizService {
        return deviceTypeMapper.findAll(criteria);
    }

-    // @Log("新增设备")
-    public void addDevice(DeviceForm deviceForm) {
-        if (deviceForm.getDeviceMac() != null && deviceForm.getBluetoothName() == null) {
+    /**
+     * 校验唯一性约束
+     */
+    private void validateDeviceUnique(DeviceForm form) {
+        if (form.getDeviceMac() != null && form.getBluetoothName() == null) {
            throw new BadRequestException("请填写蓝牙名称！！！");
        }

-        Device device1 = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_mac", deviceForm.getDeviceMac()));
-        if (device1 != null) {
+        // 使用 QueryWrapper 替代 lambdaQuery()
+        Long macCount = deviceMapper.selectCount(new LambdaQueryWrapper<Device>()
+                .eq(Device::getDeviceMac, form.getDeviceMac()));
+        if (macCount > 0) {
            throw new BadRequestException("设备MAC已存在！！！");
        }
-        Device device2 = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_imei", deviceForm.getDeviceImei()));
-        if (device2 != null) {
+
+        Long imeiCount = deviceMapper.selectCount(new LambdaQueryWrapper<Device>()
+                .eq(Device::getDeviceImei, form.getDeviceImei()));
+        if (imeiCount > 0) {
            throw new BadRequestException("设备IMEI已存在！！！");
        }
+    }
+
+    // @Log("新增设备")
+    public void addDevice(DeviceForm deviceForm) {
+        validateDeviceUnique(deviceForm);

        DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
        queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
@ -768,6 +772,14 @@ public class DeviceXinghanBizService {
        device.setBindingStatus(0);
        deviceMapper.insert(device);

+        Long deviceId = device.getDeviceId();
+
+        // 查询设备类型的文件列表
+        // 4. 核心优化：同步设备类型的文件列表 (一行代码)
+        appBusinessFileService.cloneFiles(deviceTypes.getId(), device.getId());
+        //同步设备类型的视频列表
+        appOperationVideoService.cloneFiles(deviceTypes.getId(), device.getId());
+
        // 新增设备类型记录
        DeviceAssignments assignments = new DeviceAssignments();
        assignments.setDeviceId(device.getId());
--- a/fys-admin/src/main/resources/application-dev.yml
+++ b/fys-admin/src/main/resources/application-dev.yml
@ -282,10 +282,10 @@ mqtt:
  password: #YtvpSfCNG
  url: tcp://47.120.79.150:2883
  subClientId: fys_subClient
-  subTopic: A/#
-  pubTopic: B/#
-  subTopic2: command/894078/#
-  pubTopic2: status/894078/#
+  subTopic: A/#,status/#
+  pubTopic: B/#,command/#
+  subTopic2: regis/equip/#
+  pubTopic2: regis/#
  pubClientId: fys_pubClient


--- a/fys-admin/src/main/resources/application-prod.yml
+++ b/fys-admin/src/main/resources/application-prod.yml
@ -283,10 +283,10 @@ mqtt:
  password: #YtvpSfCNG
  url: tcp://47.120.79.150:3883
  subClientId: fys_subClient
-  subTopic: A/#
-  pubTopic: B/#
-  subTopic2: status/894078/#
-  pubTopic2: command/894078/#
+  subTopic: A/#,status/#
+  pubTopic: B/#,command/#
+  subTopic2: regis/equip/#
+  pubTopic2: regis/#
  pubClientId: fys_pubClient

 # TTS语音交互配置
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java
@ -17,9 +17,9 @@ import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.core.validate.EditGroup;
 import com.fuyuanshen.common.log.enums.BusinessType;
 import com.fuyuanshen.common.excel.utils.ExcelUtil;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;

 /**
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
@ -17,9 +17,9 @@ import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.core.validate.EditGroup;
 import com.fuyuanshen.common.log.enums.BusinessType;
 import com.fuyuanshen.common.excel.utils.ExcelUtil;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;

 /**
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceBindRecordBo.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceBindRecordBo.java
@ -46,6 +46,9 @@ public class AppDeviceBindRecordBo extends BaseEntity {
     * 绑定时间
     */
    private Date bindingTime;
-
+    /**
+     * 通讯方式 0:4G;1:蓝牙,2 4G&蓝牙
+     */
+    private Integer communicationMode;

 }
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppDeviceBindRecordServiceImpl.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppDeviceBindRecordServiceImpl.java
@ -76,6 +76,7 @@ public class AppDeviceBindRecordServiceImpl implements IAppDeviceBindRecordServi
        lqw.eq(bo.getDeviceId() != null, AppDeviceBindRecord::getDeviceId, bo.getDeviceId());
        lqw.eq(bo.getBindingUserId() != null, AppDeviceBindRecord::getBindingUserId, bo.getBindingUserId());
        lqw.eq(bo.getBindingTime() != null, AppDeviceBindRecord::getBindingTime, bo.getBindingTime());
+        lqw.eq(bo.getCommunicationMode() != null, AppDeviceBindRecord::getCommunicationMode, bo.getCommunicationMode());
        return lqw;
    }

--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
@ -317,8 +317,7 @@ public class DeviceController extends BaseController {
            // 定义必需的表头
            Set<String> requiredHeaders = new HashSet<>(Arrays.asList(
                    "设备名称", "设备类型名称", "设备图片", "设备MAC", "蓝牙名称", "设备IMEI",
-                    "备注", "是否支持蓝牙", "定位方式", "通讯方式",
-                    "型号字典用于APP页面跳转", "型号字典用于PC页面跳转"
+                    "备注"
            ));

            // 检查必需的表头是否都存在
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppBusinessFile.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppBusinessFile.java
@ -1,4 +1,4 @@
-package com.fuyuanshen.app.domain;
+package com.fuyuanshen.equipment.domain;

 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppOperationVideo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppOperationVideo.java
@ -1,4 +1,4 @@
-package com.fuyuanshen.app.domain;
+package com.fuyuanshen.equipment.domain;

 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppBusinessFileBo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppBusinessFileBo.java
@ -1,6 +1,6 @@
-package com.fuyuanshen.app.domain.bo;
+package com.fuyuanshen.equipment.domain.bo;

-import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
 import com.fuyuanshen.common.core.validate.EditGroup;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
@ -56,4 +56,6 @@ public class AppBusinessFileBo extends BaseEntity {
     * 是否使用语音播报（0-否，1-是）
     */
    private Integer useStatus;
+
+    private Long createBy;
 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppOperationVideoBo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppOperationVideoBo.java
@ -1,6 +1,6 @@
-package com.fuyuanshen.app.domain.bo;
+package com.fuyuanshen.equipment.domain.bo;

-import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
 import com.fuyuanshen.common.core.validate.EditGroup;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppBusinessFileVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppBusinessFileVo.java
@ -1,17 +1,13 @@
-package com.fuyuanshen.app.domain.vo;
+package com.fuyuanshen.equipment.domain.vo;

-import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
-import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;

 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-


 /**
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppFileVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppFileVo.java
@ -1,4 +1,4 @@
-package com.fuyuanshen.app.domain.vo;
+package com.fuyuanshen.equipment.domain.vo;

 import lombok.Data;

--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppOperationVideoVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppOperationVideoVo.java
@ -1,17 +1,13 @@
-package com.fuyuanshen.app.domain.vo;
+package com.fuyuanshen.equipment.domain.vo;

-import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
-import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
-import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;

 import java.io.Serial;
 import java.io.Serializable;
-import java.util.Date;
-


 /**
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
@ -1,10 +1,10 @@
-package com.fuyuanshen.app.mapper;
+package com.fuyuanshen.equipment.mapper;

-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;

 import java.util.List;

@ -17,4 +17,5 @@ import java.util.List;
 public interface AppBusinessFileMapper extends BaseMapperPlus<AppBusinessFile, AppBusinessFileVo> {

    List<AppFileVo> queryAppFileList(AppBusinessFileBo bo);
+
 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppOperationVideoMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppOperationVideoMapper.java
@ -1,8 +1,8 @@
-package com.fuyuanshen.app.mapper;
+package com.fuyuanshen.equipment.mapper;

-import com.fuyuanshen.app.domain.AppOperationVideo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
 import org.apache.ibatis.annotations.Mapper;

 /**
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppBusinessFileService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppBusinessFileService.java
@ -1,11 +1,11 @@
-package com.fuyuanshen.app.service;
+package com.fuyuanshen.equipment.service;

-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;

 import java.util.Collection;
 import java.util.List;
@ -57,7 +57,9 @@ public interface IAppBusinessFileService {
     * @param bo 批量新增app业务文件
     * @return 是否新增成功
     */
-    Boolean insertBatch(Collection<AppBusinessFile> bo,Boolean isBatch);
+    Boolean insertBatch(Collection<AppBusinessFile> bo, Boolean isBatch);
+
+    void cloneFiles(Long sourceId, Long targetId);

    /**
     * 修改app业务文件
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppOperationVideoService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppOperationVideoService.java
@ -1,11 +1,10 @@
-package com.fuyuanshen.app.service;
+package com.fuyuanshen.equipment.service;

-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.AppOperationVideo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;

 import java.util.Collection;
 import java.util.List;
@ -59,6 +58,8 @@ public interface IAppOperationVideoService {
     */
    Boolean insertBatch(Collection<AppOperationVideo> bo);

+    void cloneFiles(Long sourceId, Long targetId);
+
    /**
     * 修改操作视频
     *
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppBusinessFileServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppBusinessFileServiceImpl.java
@ -1,27 +1,29 @@
-package com.fuyuanshen.app.service.impl;
+package com.fuyuanshen.equipment.service.impl;

+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
-import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.mapper.AppBusinessFileMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.mapper.AppBusinessFileMapper;
-import com.fuyuanshen.app.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import org.springframework.transaction.annotation.Transactional;

-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;

 /**
 * app业务文件Service业务层处理
@ -117,6 +119,38 @@ public class AppBusinessFileServiceImpl implements IAppBusinessFileService {
        return baseMapper.insertBatch(bo);
    }

+    /**
+     * 克隆业务文件列表到新业务ID
+     * @param sourceId 源业务ID（如设备类型ID）
+     * @param targetId 目标业务ID（如新设备ID）
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cloneFiles(Long sourceId, Long targetId) {
+        // 1. 使用 Wrappers 替代 this.lambdaQuery()
+        List<AppBusinessFile> sourceFiles = baseMapper.selectList(
+                Wrappers.<AppBusinessFile>lambdaQuery().eq(AppBusinessFile::getBusinessId, sourceId)
+        );
+
+        if (CollUtil.isEmpty(sourceFiles)) {
+            return;
+        }
+
+        // 2. 批量转换并重置ID
+        List<AppBusinessFile> newFiles = sourceFiles.stream().map(file -> {
+            AppBusinessFile entity = new AppBusinessFile();
+            // 建议使用你代码中已有的 MapstructUtils 或 BeanUtil
+            BeanUtil.copyProperties(file, entity);
+            entity.setId(null);             // 确保主键自增
+            entity.setBusinessId(targetId);  // 绑定到新设备ID
+            return entity;
+        }).collect(Collectors.toList());
+
+        // 3. 使用你已有的 insertBatch 替代 saveBatch
+        // 注意：这里第二个参数传 false，因为是新设备，不需要执行你 insertBatch 里的删除逻辑
+        this.insertBatch(newFiles, false);
+    }
+
    /**
     * 修改app业务文件
     *
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppOperationVideoServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppOperationVideoServiceImpl.java
@ -1,7 +1,8 @@
-package com.fuyuanshen.app.service.impl;
+package com.fuyuanshen.equipment.service.impl;

+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.fuyuanshen.app.domain.AppBusinessFile;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@ -9,18 +10,20 @@ import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.equipment.mapper.AppOperationVideoMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.app.domain.AppOperationVideo;
-import com.fuyuanshen.app.mapper.AppOperationVideoMapper;
-import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
+import org.springframework.transaction.annotation.Transactional;

 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
+import java.util.stream.Collectors;

 /**
 * 操作视频Service业务层处理
@ -125,6 +128,37 @@ public class AppOperationVideoServiceImpl implements IAppOperationVideoService {
        return baseMapper.updateById(update) > 0;
    }

+    /**
+     * 克隆业务文件列表到新业务ID
+     * @param sourceId 源业务ID（如设备类型ID）
+     * @param targetId 目标业务ID（如新设备ID）
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void cloneFiles(Long sourceId, Long targetId) {
+        // 1. 使用 Wrappers 替代 this.lambdaQuery()
+        List<AppOperationVideo> sourceFiles = baseMapper.selectList(
+                Wrappers.<AppOperationVideo>lambdaQuery().eq(AppOperationVideo::getDeviceId, sourceId)
+        );
+
+        if (CollUtil.isEmpty(sourceFiles)) {
+            return;
+        }
+
+        // 2. 批量转换并重置ID
+        List<AppOperationVideo> newFiles = sourceFiles.stream().map(file -> {
+            AppOperationVideo entity = new AppOperationVideo();
+            // 建议使用你代码中已有的 MapstructUtils 或 BeanUtil
+            BeanUtil.copyProperties(file, entity);
+            entity.setId(null);             // 确保主键自增
+            entity.setDeviceId(targetId);  // 绑定到新设备ID
+            return entity;
+        }).collect(Collectors.toList());
+
+        // 3. 使用你已有的 insertBatch 替代 saveBatch
+        this.insertBatch(newFiles);
+    }
+
    /**
     * 保存前的数据校验
     */
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
@ -30,10 +30,7 @@ import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
 import com.fuyuanshen.equipment.mapper.*;
-import com.fuyuanshen.equipment.service.DeviceAssignmentsService;
-import com.fuyuanshen.equipment.service.DeviceService;
-import com.fuyuanshen.equipment.service.DeviceTypeGrantsService;
-import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
+import com.fuyuanshen.equipment.service.*;
 import com.fuyuanshen.equipment.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
@ -77,6 +74,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme

    private final DeviceFenceAccessRecordMapper deviceFenceAccessRecordMapper;
    private final FileHashUtil fileHashUtil;
+    private final IAppBusinessFileService appBusinessFileService;
+    private final IAppOperationVideoService appOperationVideoService;


    /**
@ -210,6 +209,20 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme

        DeviceTypeGrants typeGrants = new DeviceTypeGrants();

+        // 修改为：
+        Long userId;
+        LoginUser loginUser;
+        try {
+            loginUser = LoginHelper.getLoginUser();
+            userId = loginUser != null ? loginUser.getUserId() : 1938143703108689922L; // 如果没有登录用户，使用默认系统用户ID
+        } catch (Exception e) {
+            userId = 1938143703108689922L; // 出现异常时使用默认系统用户ID
+            loginUser = new LoginUser();
+            loginUser.setUserId(userId);
+            loginUser.setNickname("admin");
+            loginUser.setTenantId("894078"); // 设置租户ID
+        }
+
        if (deviceForm.getDeviceType() != null) {
            DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
            queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
@ -282,8 +295,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
                throw new RuntimeException("设备类型名称已存在，无法新增!!!");
            }

-            LoginUser loginUser = LoginHelper.getLoginUser();
            newDeviceType.setCreateByName(loginUser.getNickname());
+            newDeviceType.setTenantId(loginUser.getTenantId());
            deviceTypeMapper.insert(newDeviceType);

            // 重新查询确保获取到正确的ID
@ -295,6 +308,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
            deviceTypeGrants.setCustomerId(loginUser.getUserId());
            deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
            deviceTypeGrants.setGrantedAt(new Date());
+            deviceTypeGrants.setTenantId(loginUser.getTenantId());
            deviceTypeGrantsMapper.insert(deviceTypeGrants);
        }

@ -319,13 +333,13 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme

        BeanUtil.copyProperties(deviceForm, device, true);
        device.setDeviceNo(createDeviceNo());
-        LoginUser loginUser = LoginHelper.getLoginUser();
        device.setCurrentOwnerId(loginUser.getUserId());
        device.setOriginalOwnerId(loginUser.getUserId());
        device.setCreateByName(loginUser.getNickname());
        device.setTypeName(deviceType.getTypeName());
        device.setDeviceType(deviceType.getId());
        device.setDevicePic(deviceType.getDevicePic());
+        device.setTenantId(loginUser.getTenantId());
        if (device.getDeviceImei() != null) {
            device.setPubTopic("A/" + device.getDeviceImei());
            device.setSubTopic("B/" + device.getDeviceImei());
@ -334,6 +348,12 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
        device.setBindingStatus(0);
        deviceMapper.insert(device);

+        // 查询设备类型的文件列表
+        // 4. 核心优化：同步设备类型的文件列表 (一行代码)
+        appBusinessFileService.cloneFiles(deviceType.getId(), device.getId());
+        // 同步设备类型的视频列表
+        appOperationVideoService.cloneFiles(deviceType.getId(), device.getId());
+
        // 新增设备类型记录
        DeviceAssignments assignments = new DeviceAssignments();
        assignments.setDeviceId(device.getId());
@ -346,10 +366,12 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
        assignments.setActive(DeviceActiveStatusEnum.ACTIVE.getCode());
        String lever = USER_ID_SEPARATOR + loginUser.getUserId();
        assignments.setLever(lever);
+        assignments.setTenantId(loginUser.getTenantId());
        deviceAssignmentsService.save(assignments);

    }

+
    private String createDeviceNo() {
        String uuidStr = UUID.fastUUID().toString(); // 获取带 - 的标准格式字符串
        return uuidStr.replaceAll("-", "");
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/AlibabaTTSUtil.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/AlibabaTTSUtil.java
@ -113,14 +113,14 @@ public class AlibabaTTSUtil {
                DEFAULT_VOLUME, DEFAULT_SPEECH_RATE, DEFAULT_PITCH_RATE);
    }

-    public byte[] synthesizeTextToMp3(String text){
+    public byte[] synthesizeTextToMp3(String text,String fileSuffix){
        try {
            // 获取访问令牌
            String token = getValidAccessToken();
            // 使用HTTP方式调用
            HttpTtsClient httpClient = new HttpTtsClient(appkey,token);

-            return httpClient.synthesizeTextToMp3(text);
+            return httpClient.synthesizeTextToMp3(text,fileSuffix);
        } catch (IOException e) {
            e.printStackTrace();
        }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/HttpTtsClient.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/utils/HttpTtsClient.java
@ -9,7 +9,9 @@ import java.net.URL;
 import static cn.dev33.satoken.SaManager.log;

 public class HttpTtsClient {
-
+    
+    private String accessKeyId;
+    private String accessKeySecret;
    private String appKey;
    private String token;
    /**
@ -17,36 +19,57 @@ public class HttpTtsClient {
     */
    private static final String BASE_URL = "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts";

-    public HttpTtsClient(String appKey, String token) {
-        this.appKey = appKey;
+    public HttpTtsClient(String accessKeyId, String token) {
+        this.accessKeyId = accessKeyId;
        this.token = token;
+//        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) throws IOException {
-        String endpoint = "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts";
+    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("\"", "\\\"")
+//            text.replace("\"", "\\\"")zhide
 //        );
+
+//        String token = refreshAccessToken();
        String requestBody = "  {\n" +
                "    \"appkey\":\""+appKey+"\",\n" +
+                "    \"voice\":\"zhifeng\",\n" +
                "    \"text\":\""+text+"\",\n" +
                "    \"token\":\""+token+"\",\n" +
-                "    \"format\":\"mp3\"\n" +
+                "    \"volume\": 100,\n" +
+                "    \"pitch_rate\": 0,\n" +
+                "    \"format\":\""+fileSuffix+"\"\n" +
                "  }";
        
-        URL url = new URL(endpoint);
+        URL url = new URL(BASE_URL);
        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
        
        // 设置请求方法和头部
        conn.setRequestMethod("POST");
        conn.setRequestProperty("Content-Type", "application/json");
-//        conn.setRequestProperty("Authorization", buildAuthorization());
+        conn.setRequestProperty("Authorization", buildAuthorization());
        conn.setRequestProperty("Content-Length", String.valueOf(requestBody.getBytes().length));
        conn.setDoOutput(true);
        
@ -72,13 +95,29 @@ public class HttpTtsClient {
            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);
+        byte[] mp3Data = synthesizeTextToMp3(text,"mp3");
        
        try (FileOutputStream fos = new FileOutputStream(outputPath)) {
            fos.write(mp3Data);
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fuyuanshen.app.mapper.AppBusinessFileMapper">
+<mapper namespace="com.fuyuanshen.equipment.mapper.AppBusinessFileMapper">

-    <select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
+    <select id="queryAppFileList" resultType="com.fuyuanshen.equipment.domain.vo.AppFileVo">
        select a.id,a.business_id,a.file_id,a.file_type,b.file_name,b.url fileUrl,a.duration,
        CASE
        WHEN a.re_name IS NULL THEN
@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="fileType != null">
            and a.file_type = #{fileType}
        </if>
-        <if test="createBy != null">
-            and a.create_by = #{createBy}
+        <if test="createBy != null ">
+            and (a.create_by = #{createBy}  or a.create_by = 0)
        </if>
        order by a.create_time desc
    </select>
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppOperationVideoMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppOperationVideoMapper.xml
@ -2,6 +2,6 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fuyuanshen.app.mapper.AppOperationVideoMapper">
+<mapper namespace="com.fuyuanshen.equipment.mapper.AppOperationVideoMapper">

 </mapper>
--- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssServiceImpl.java
+++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysOssServiceImpl.java
@ -213,11 +213,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
        try {
            byte[] imageData = file.getBytes();
            // 检查是否需要压缩
-            if (ImageCompressUtil.needCompress(imageData)) {
-                // 压缩到100KB以内
-                imageData = ImageCompressUtil.compressImage(imageData);
-                // 使用压缩后的数据
-            }
+//            if (ImageCompressUtil.needCompress(imageData)) {
+//                // 压缩到100KB以内
+//                imageData = ImageCompressUtil.compressImage(imageData);
+//                // 使用压缩后的数据
+//            }
            uploadResult = storage.uploadSuffix(imageData, suffix, file.getContentType());
        } catch (IOException e) {
            throw new ServiceException(e.getMessage());
--- a/generated_speech.wav
+++ b/generated_speech.wav
--- a/log/de_english-words.txt
+++ b/log/de_english-words.txt
--- a/log/de_unknown.txt
+++ b/log/de_unknown.txt
--- a/公安报警中.wav
+++ b/公安报警中.wav
Author	SHA1	Message	Date
chenyouting	05cb75e652	修复bug3	2026-04-01 17:52:11 +08:00
chenyouting	5813425be9	修复bug2	2026-04-01 17:42:14 +08:00
chenyouting	539caa4b5f	修复bug	2026-03-27 10:34:38 +08:00
chenyouting	1111e03bf4	修复bug2	2026-03-20 16:37:32 +08:00
chenyouting	83752b2f11	修复bug	2026-03-19 13:25:11 +08:00
chenyouting	f37cb405cc	提交代码9	2026-03-19 09:49:08 +08:00
chenyouting	cc2713618a	提交代码8	2026-03-18 15:29:42 +08:00
chenyouting	47d40cf9d2	提交代码7	2026-03-06 17:58:39 +08:00
chenyouting	83b97841ef	提交代码6	2026-03-05 17:49:55 +08:00
daiyongfei	9d84265f57	Merge remote-tracking branch 'origin/6170' into 6170	2026-03-02 16:38:01 +08:00
daiyongfei	fa5dfab939	2.4G设备上报技术方案	2026-03-02 16:37:50 +08:00
chenyouting	5fb71dd092	提交代码5	2026-03-02 15:35:19 +08:00
daiyongfei	1ce87aaec5	Merge branch '6170' of http://47.107.152.87:3000/dyf/fys-Multi-tenant into 6170	2026-03-02 14:31:46 +08:00
daiyongfei	4f3e7b0ed0	regis	2026-03-02 14:31:40 +08:00
chenyouting	b75b7ef431	提交代码4	2026-03-02 13:55:21 +08:00
chenyouting	c9cad751f0	提交代码3	2026-03-02 13:45:30 +08:00
chenyouting	34841c8704	提交代码2	2026-03-02 11:17:46 +08:00
chenyouting	20ac6b0baa	bug修改4	2026-02-27 18:34:21 +08:00
chenyouting	4d5292cebc	bug修改3	2026-02-27 18:31:03 +08:00
chenyouting	7a35baa8f0	bug修改2	2026-02-27 17:42:23 +08:00
chenyouting	dbb7076b50	Merge remote-tracking branch 'origin/6170' into 6170	2026-02-27 15:34:22 +08:00
chenyouting	15c85d4c62	bug修改	2026-02-27 15:34:15 +08:00
daiyongfei	e036ef05ce	Merge branch 'jingquan' into 6170 # Conflicts: # fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml	2026-02-27 15:31:26 +08:00
dyf	03f453f901	Merge pull request 'refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块' (#25 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #25	2026-02-27 15:29:26 +08:00
DragonWenLong	e23c5267ee	refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块 - 移动AppBusinessFile相关类到equipment模块 - 移动AppOperationVideo相关类到equipment模块 - 更新所有导入路径以指向新的equipment包结构 - 重构设备创建流程中的文件克隆逻辑 - 添加cloneFiles方法支持从设备类型复制文件和视频到新设备 - 优化DeviceXinghanBizService中的设备验证逻辑 - 更新Mapper XML命名空间和返回类型引用 - 调整设备导入Excel的必填字段验证规则	2026-02-27 15:13:53 +08:00