From 539caa4b5fe62054aa407c8c5997f8f5a50237c7 Mon Sep 17 00:00:00 2001
From: chenyouting <514333061@qq.com>
Date: Fri, 27 Mar 2026 10:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/service/AudioProcessService.java      |  3 ++-
 .../domain/dto/HBY100JUpdateVoiceDto.java     |  4 +++
 .../web/service/device/DeviceBizService.java  |  4 +--
 .../device/DeviceHBY100JBizService.java       | 27 ++++++++++---------
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java b/fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java
index 832dd4d6..1c78ff7c 100644
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AudioProcessService.java
@@ -450,8 +450,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");
         }
     }
diff --git 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
index 43ff37f2..c7374143 100644
--- 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
@@ -7,4 +7,8 @@ public class HBY100JUpdateVoiceDto {
 
     private Long id;
 
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     */
+    private Integer communicationMode;
 }
\ No newline at end of file
diff --git 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
index 5b1a0a1c..fbaf2ce7 100644
--- 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
@@ -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)
diff --git 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
index aa4a13fb..c844cb75 100644
--- 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
@@ -285,21 +285,22 @@ public class DeviceHBY100JBizService {
         if (getDeviceStatus(deviceObj.getDeviceImei())) {
             throw new ServiceException(deviceObj.getDeviceName() + ",设备已断开连接");
         }
-
         AppLoginUser loginUser = AppLoginHelper.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);
+        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);
 
-        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());