修复bug2

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

@@ -8,6 +8,7 @@ import com.fuyuanshen.app.domain.dto.TextToSpeechRequest;
 import com.fuyuanshen.app.service.AudioProcessService;
 import com.fuyuanshen.app.service.VideoProcessService;
 import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.equipment.domain.vo.AppFileVo;
@@ -80,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) {
@@ -100,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) {
@@ -118,7 +124,7 @@ 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"));
     }
 
     /**

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

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

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

@@ -1,8 +1,10 @@
 package com.fuyuanshen.app.service;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.bo.AppDeviceBindRecordBo;
 import com.fuyuanshen.app.domain.dto.AppAudioFileDto;
 import com.fuyuanshen.app.domain.dto.AppFileRenameDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceBindRecordVo;
 import com.fuyuanshen.app.http.HttpTtsClient;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
@@ -65,6 +67,7 @@ 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";
@@ -385,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);
@@ -409,6 +413,21 @@ public class AudioProcessService {
         return null;
     }
 
+    private Long getUserId(String source,Long deviceId){
+        Long userId = null;
+        if("app".equals( source)){
+            userId = 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 userId;
+    }
     /**
      * 校验音频文件格式
      */
@@ -448,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";
@@ -485,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");
@@ -499,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();
@@ -544,14 +564,14 @@ 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 = LoginHelper.getUserId();
+        Long userId = getUserId(source, deviceId);
         AppBusinessFileBo bo = new AppBusinessFileBo();
         bo.setBusinessId(deviceId);
         bo.setCreateBy(userId);

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

@@ -1,12 +1,21 @@
 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;
@@ -22,6 +31,9 @@ import java.util.Objects;
 
 import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
 
+/**
+ * 注册设备消息接收处理
+ */
 @Service
 @Slf4j
 public class RegisEquipReceiverMessageHandler implements MessageHandler {
@@ -29,23 +41,116 @@ 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 (receivedTopic == null || payloadDict == null) {
+        if (payloadDict == null) {
+            log.warn("Failed to parse payload JSON");
             return;
         }
 
+        String imei = payloadDict.getStr("imei");
+        String mac = payloadDict.getStr("mac");
+
+        log.info("Extracted IMEI: {}, MAC: {}", imei, mac);
+
+        // 验证必要字段
+        if (StringUtils.isEmpty(imei) || StringUtils.isEmpty(mac)) {
+            log.warn("Missing required fields - IMEI: {}, MAC: {}", imei, mac);
+            return;
+        }
+
+        DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria();
+        criteria.setTypeName(deviceTypeName);
+        DeviceType deviceType = deviceTypeMapper.queryByName(criteria);
+        if (deviceType == null) {
+            log.warn("Device type not found for name: {}", deviceTypeName);
+            return;
+        }
+
+        Device device = deviceMapper.selectDeviceByImei(imei);
+        if (device != null) {
+            log.warn("Device already exists for IMEI: {}", imei);
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+                    imei + ":regis";
+            Object value = RedisUtils.getCacheObject(redisKey);
+            if (value != null) {
+                log.warn("regis/imei发送次数频率过快: {}", imei);
+                return;
+            }
+//            sendSuccessMessage(imei);
+            RedisUtils.setCacheObject(redisKey, payload.toString(), Duration.ofSeconds(10));
+            return;
+        }
+
+        // 提取MAC地址后6位
+        String macSuffix = mac.replaceAll(":", "").substring(6); // 43:73:43:33:53:33 -> 335333
+        // 构建设备名称和蓝牙名称：设备类型+MAC后6位
+        String deviceName = deviceTypeName + "-" + macSuffix; // HBY100-335333
+
+        DeviceForm deviceForm = new DeviceForm();
+        deviceForm.setDeviceImei(imei);
+        deviceForm.setDeviceMac(mac);
+        deviceForm.setDeviceName(deviceName);
+        deviceForm.setBluetoothName(deviceName);
+        deviceForm.setDeviceType(deviceType.getId());
+
+        try {
+            deviceService.addDevice(deviceForm);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        sendSuccessMessage(imei);
 
     }
+
+    private void sendSuccessMessage(String imei) {
+        // 解析原始JSON数据
+        JSONObject originalData = new JSONObject();
+        originalData.put("code", 200);
+        // 发送到MQTT
+        String topic = "regis/" + imei;
+        mqttGateway.sendMsgToMqtt(topic, originalData.toString());
+    }
+
+
 }

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

@@ -38,18 +38,18 @@ public class BjqActiveReportingDeviceDataRule implements MqttMessageRule {
     @Override
     public void execute(MqttRuleContext context) {
         try {
-//            Object[] convertArr = context.getConvertArr();
+            Object[] convertArr = context.getConvertArr();
-//            // Latitude, longitude
+            // Latitude, longitude
-//            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
-//            String mainLightMode = convertArr[1].toString();
+            String mainLightMode = convertArr[1].toString();
-//            String laserLightMode = convertArr[2].toString();
+            String laserLightMode = convertArr[2].toString();
-//            String batteryPercentage = convertArr[3].toString();
+            String batteryPercentage = convertArr[3].toString();
-//            String chargeState = convertArr[4].toString();
+            String chargeState = convertArr[4].toString();
-//            String batteryRemainingTime = convertArr[5].toString();
+            String batteryRemainingTime = convertArr[5].toString();
-//
+
-//            // 发送设备状态和位置信息到Redis
+            // 发送设备状态和位置信息到Redis
-//            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode, laserLightMode,
-//                    batteryPercentage, chargeState, batteryRemainingTime);
+                    batteryPercentage, chargeState, batteryRemainingTime);
         } catch (Exception e) {
             log.error("处理上报数据命令时出错", e);
         }

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];
+            Byte val2 = (Byte) context.getConvertArr()[1];
-//            if (val2 == 100) {
+            if (val2 == 100) {
-//                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
-//                return;
+                return;
-//            }
+            }
-//
+
-//            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX  + context.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX);
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX  + context.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX);
-//            if (StringUtils.isEmpty(data)) {
+            if (StringUtils.isEmpty(data)) {
-//                return;
+                return;
-//            }
+            }
-//
+
-//            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
+            byte[] arr = ImageToCArrayConverter.convertStringToByteArray(data);
-//            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
+            byte[] specificChunk = ImageToCArrayConverter.getChunk(arr, (val2 - 1), 512);
-//            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
+            log.info("第{}块数据大小: {} 字节", val2, specificChunk.length);
-//
+
-//            ArrayList<Integer> intData = new ArrayList<>();
+            ArrayList<Integer> intData = new ArrayList<>();
-//            intData.add(3);
+            intData.add(3);
-//            intData.add((int) val2);
+            intData.add((int) val2);
-//            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(specificChunk), intData);
-//            intData.add(0);
+            intData.add(0);
-//            intData.add(0);
+            intData.add(0);
-//            intData.add(0);
+            intData.add(0);
-//            intData.add(0);
+            intData.add(0);
-//
+
-//            Map<String, Object> map = new HashMap<>();
+            Map<String, Object> map = new HashMap<>();
-//            map.put("instruct", intData);
+            map.put("instruct", intData);
-//
+
-//            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-//            log.info("发送开机LOGO点阵数据到设备消息=>topic:{},payload:{}",
+            log.info("发送开机LOGO点阵数据到设备消息=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
+                    JsonUtils.toJsonString(map));
 
         } catch (Exception e) {
             log.error("处理开机LOGO时出错", e);

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();
+            Object[] convertArr = context.getConvertArr();
-//
+
-//            String mode = convertArr[1].toString();
+            String mode = convertArr[1].toString();
-//            if(StringUtils.isNotBlank(mode)){
+            if(StringUtils.isNotBlank(mode)){
-//                // 发送设备状态和位置信息到Redis
+                // 发送设备状态和位置信息到Redis
-//                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
-//            }
+            }
-//
+
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
         } catch (Exception e) {
             log.error("处理激光模式命令时出错", e);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/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();
+            Object[] convertArr = context.getConvertArr();
-//
+
-//            String convertValue = convertArr[1].toString();
+            String convertValue = convertArr[1].toString();
-//            // 将设备状态信息存储到Redis中
+            // 将设备状态信息存储到Redis中
-//            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
-//
+
-//            // 存储到Redis
+            // 存储到Redis
-//            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
+            RedisUtils.setCacheObject(deviceRedisKey, convertValue);
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
         } catch (Exception e) {
             log.error("处理灯光亮度命令时出错", e);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));

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

@@ -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();
+            Object[] convertArr = context.getConvertArr();
-//            // Latitude, longitude
+            // Latitude, longitude
-//            String latitude = convertArr[1].toString();
+            String latitude = convertArr[1].toString();
-//            String longitude = convertArr[2].toString();
+            String longitude = convertArr[2].toString();
-//            // 判断 latitude 和 longitude 是否都为 0
+            // 判断 latitude 和 longitude 是否都为 0
-//            if ("0".equals(latitude) && "0".equals(longitude)) {
+            if ("0".equals(latitude) && "0".equals(longitude)) {
-//                log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
+                log.info("位置信息为0，不存储到Redis: device={}, lat={}, lon={}", context.getDeviceImei(), latitude, longitude);
-//                return;
+                return;
-//            }
+            }
-//            // 异步发送经纬度到Redis
+            // 异步发送经纬度到Redis
-//            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
+            asyncSendLocationToRedisWithFuture(context.getDeviceImei(), latitude, longitude);
-//            // 异步保存数据
+            // 异步保存数据
-//            asyncSaveLocationToMySQLWithFuture(context.getDeviceImei(), latitude, longitude);
+            asyncSaveLocationToMySQLWithFuture(context.getDeviceImei(), latitude, longitude);
-//
+
-//            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
+            Map<String, Object> map = buildLocationDataMap(latitude, longitude);
-//            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(), 1, JsonUtils.toJsonString(map));
-//            log.info("发送定位数据到设备=>topic:{},payload:{}",
+            log.info("发送定位数据到设备=>topic:{},payload:{}",
-//                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
+                    MqttConstants.GLOBAL_PUB_KEY + context.getDeviceImei(),
-//                    JsonUtils.toJsonString(map));
+                    JsonUtils.toJsonString(map));
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
         } catch (Exception e) {
             log.error("处理定位数据命令时出错", e);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));

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

@@ -52,45 +52,45 @@ public class BjqModeRule implements MqttMessageRule {
         try {
             log.info("处理灯光模式命令");
             log.info("MQTT消息负载字典：{}", context.getPayloadDict());
-//            Object[] convertArr = context.getConvertArr();
+            Object[] convertArr = context.getConvertArr();
-//
+
-//            String mainLightMode = convertArr[1].toString();
+            String mainLightMode = convertArr[1].toString();
-//            String batteryRemainingTime = convertArr[2].toString();
+            String batteryRemainingTime = convertArr[2].toString();
-//            if (StringUtils.isNotBlank(mainLightMode)) {
+            if (StringUtils.isNotBlank(mainLightMode)) {
-//                log.info("设备离线mainLightMode：{}", mainLightMode);
+                log.info("设备离线mainLightMode：{}", mainLightMode);
-//                if ("0".equals(mainLightMode)) {
+                if ("0".equals(mainLightMode)) {
-//
+
-//                    // 设备离线
+                    // 设备离线
-//                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
+                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
-//                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0");
+                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0");
-//
+
-//                    String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+                    String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
-//                    String messageSendingValue = RedisUtils.getCacheObject(sendMessageIng);
+                    String messageSendingValue = RedisUtils.getCacheObject(sendMessageIng);
-//                    if ("1".equals(messageSendingValue)) {
+                    if ("1".equals(messageSendingValue)) {
-//                        // 设置为故障状态
+                        // 设置为故障状态
-//                        RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "2");
+                        RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "2");
-//                        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                        UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-//                        updateWrapper.eq("device_imei", context.getDeviceImei());
+                        updateWrapper.eq("device_imei", context.getDeviceImei());
-//                        updateWrapper.set("online_status", 2);
+                        updateWrapper.set("online_status", 2);
-//                        deviceService.update(updateWrapper);
+                        deviceService.update(updateWrapper);
-//                        RedisUtils.deleteObject(sendMessageIng);
+                        RedisUtils.deleteObject(sendMessageIng);
-//
+
-//                        // 解除告警
+                        // 解除告警
-//                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
+                        String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-//                        if (RedisUtils.getCacheObject(deviceRedisKey) != null) {
+                        if (RedisUtils.getCacheObject(deviceRedisKey) != null) {
-//                            RedisUtils.deleteObject(deviceRedisKey);
+                            RedisUtils.deleteObject(deviceRedisKey);
-//                        }
+                        }
-//                        cancelAlarm(context.getDeviceImei());
+                        cancelAlarm(context.getDeviceImei());
-//                    }
+                    }
-//                }
+                }
-//                // 发送设备状态和位置信息到Redis
+                // 发送设备状态和位置信息到Redis
-//                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode);
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(), mainLightMode);
-//                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX;
-//
+
-//                // 存储到Redis
+                // 存储到Redis
-//                RedisUtils.setCacheObject(deviceRedisKey, batteryRemainingTime);
+                RedisUtils.setCacheObject(deviceRedisKey, batteryRemainingTime);
-//            }
+            }
-//            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
         } catch (Exception e) {
             log.error("处理灯光模式命令时出错", e);
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));

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

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

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

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

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 +
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":updateVoice";
+                             context.getDeviceImei() + ":updateVoice";
-//
+
-//            Map<String, Object> payloadDict = context.getPayloadDict();
+            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
+            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
+            }
         } catch (Exception e) {
             log.error("HBY100J更新语音失败", e);
         }

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

@@ -29,13 +29,13 @@ public class FuncType6VoicePlay implements NewMqttMessageRule {
         log.info("HBY100J语音播报开启/关闭，消息负载：{}", context.getPayloadDict());
 
         try {
-//            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
+            String redisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
-//                             context.getDeviceImei() + ":VoicePlay";
+                             context.getDeviceImei() + ":voicePlay";
-//
+
-//            Map<String, Object> payloadDict = context.getPayloadDict();
+            Map<String, Object> payloadDict = context.getPayloadDict();
-//            if (payloadDict != null) {
+            if (payloadDict != null) {
-//                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
+                RedisUtils.setCacheObject(redisKey, JSONObject.toJSONString(payloadDict));
-//            }
+            }
         } catch (Exception e) {
             log.error("HBY100J语音播报开启/关闭失败", e);
         }

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 fileId,Long deviceId) {
+        return audioProcessService.deleteAudioFile(fileId,deviceId);
+    }
+
+    /**
+     * 文件重命名
+     */
+    @PostMapping("/renameAudioFile")
+    public R<Void> renameAudioFile(@RequestBody AppFileRenameDto bo) {
+        return audioProcessService.renameAudioFile(bo);
+    }
+}

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

@@ -0,0 +1,106 @@
+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) {
+        deviceHBY100JBizService.updateVoice(dto);
+        return R.ok();
+    }
+
+    /**
+     * 强制报警
+     *
+     */
+
+    @PostMapping("/forceAlarmActivation")
+    public R<Void> forceAlarmActivation(@RequestBody HBY100JForceAlarmActivationDto bo) {
+        deviceHBY100JBizService.forceAlarmActivation(bo);
+        return R.ok();
+    }
+
+    /**
+     * 语音播报
+     *
+     */
+    @PostMapping("/voiceBroadcast")
+    public R<Void> voiceBroadcast(@RequestBody HBY100JVoiceBroadcastDto params) {
+        deviceHBY100JBizService.voiceBroadcast(params);
+        return R.ok();
+    }
+
+
+
+
+    /**
+     * 爆闪模式
+     */
+    @PostMapping("/strobeMode")
+    public R<Void> strobeMode(@RequestBody HBY100JStrobeModeDto params) {
+        deviceHBY100JBizService.strobeMode(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 灯光调节
+     */
+    @PostMapping("/lightAdjustment")
+    public R<Void> lightAdjustment(@RequestBody HBY100JLightAdjustmentDto params) {
+        deviceHBY100JBizService.lightAdjustment(params);
+        return R.ok();
+    }
+
+
+    /**
+     * 爆闪频率
+     */
+    @PostMapping("/strobeFrequency")
+    public R<Void> strobeFrequency(@RequestBody HBY100JStrobeFrequencyDto params) {
+        deviceHBY100JBizService.strobeFrequency(params);
+        return R.ok();
+    }
+
+    /**
+     * 修改音量
+     */
+    @PostMapping("/updateVolume")
+    public R<Void> updateVolume(@RequestBody HBY100JUpdateVolumeDto params) {
+        deviceHBY100JBizService.updateVolume(params);
+        return R.ok();
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+package com.fuyuanshen.web.controller.device.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class HBY100JUpdateVoiceDto {
+
+    private Long id;
+
+}

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

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

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

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

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

@@ -1,34 +1,23 @@
 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.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.AppDeviceHBY100JDetailVo;
-import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
 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.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.equipment.enums.LightModeEnum;
 import com.fuyuanshen.equipment.mapper.AppBusinessFileMapper;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
@@ -39,24 +28,19 @@ 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.util.Date;
-import java.time.Duration;
+import java.util.List;
-import java.util.*;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.buildArr;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
-import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 
 @Slf4j
@@ -71,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;
     /**
      * 记录设备操作日志
      *
@@ -172,6 +159,17 @@ public class DeviceHBY100JBizService {
                 vo.setAlarmMode(sirenAlarm.getMode());
             }
         }
+
+        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.setVolume(funcType6VoicePlayRequest.getData().getVoiceBroadcast());
+            }
+        }
+
         String strobeModeRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX +
                 device.getDeviceImei() + ":strobeMode";
         String strobeModeStatus = RedisUtils.getCacheObject(strobeModeRedisKey);
@@ -248,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())) {
@@ -271,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(), "强制报警激活", "强制报警激活", userId);
-//            recordDeviceLog(deviceId, deviceObj.getDeviceName(), "强制报警激活", "强制报警激活", loginUser.getUserId());
         });
 
     }
 
-    public void updateVoice(AppDeviceHBY100JController.HBY100JUpdateVoiceDto dto) {
+    public void updateVoice(HBY100JUpdateVoiceDto dto) {
         AppBusinessFileVo appBusinessFileVo = appBusinessFileMapper.selectVoById(dto.getId());
         if(appBusinessFileVo == null){
             throw new ServiceException("文件不存在");
@@ -288,7 +286,7 @@ public class DeviceHBY100JBizService {
             throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
         }
 
-        LoginUser loginUser = LoginHelper.getLoginUser();
+        AppLoginUser loginUser = AppLoginHelper.getLoginUser();
         SysOssVo sysOssVo = sysOssMapper.selectVoById(appBusinessFileVo.getFileId());
         FuncType5UpdateVoiceRequest  request = new FuncType5UpdateVoiceRequest();
         request.setRequestId(GenerateIdUtil.generateNumericId());
@@ -312,6 +310,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) {
@@ -319,11 +319,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());
@@ -335,9 +336,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) {
@@ -346,6 +350,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());
@@ -358,9 +363,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("设备不存在");
@@ -368,6 +375,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());
@@ -378,9 +386,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("设备不存在");
@@ -388,6 +398,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());
@@ -398,9 +409,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("设备不存在");
@@ -408,6 +421,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());
@@ -418,5 +432,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);
     }
+
+
 }

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

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

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -209,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());
@@ -281,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
@@ -294,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);
         }
 
@@ -318,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());
@@ -351,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("-", "");