From 5813425be9f744693a1cfacc892ebde99e5c44d0 Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Wed, 1 Apr 2026 17:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppVideoController.java | 4 +-- .../app/domain/dto/AppFileRenameDto.java | 2 ++ .../app/service/AudioProcessService.java | 34 ++++++++++--------- .../controller/device/WebVideoController.java | 4 +-- .../bjq/WebDeviceHBY100JController.java | 1 + .../device/DeviceHBY100JBizService.java | 2 +- .../mapper/AppBusinessFileMapper.java | 1 + .../equipment/AppBusinessFileMapper.xml | 4 +-- .../service/impl/SysOssServiceImpl.java | 10 +++--- 9 files changed, 34 insertions(+), 28 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java index ba6a5dc3..2c186f67 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppVideoController.java @@ -131,8 +131,8 @@ public class AppVideoController extends BaseController { * 删除语音文件 */ @GetMapping("/deleteAudioFile") - public R deleteAudioFile(Long fileId,Long deviceId) { - return audioProcessService.deleteAudioFile(fileId,deviceId); + public R deleteAudioFile(Long id) { + return audioProcessService.deleteAudioFile(id); } /** diff --git 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 index a1cdd3ed..a9621a57 100644 --- 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 */ 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 1c78ff7c..8b84c31e 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 @@ -414,19 +414,18 @@ public class AudioProcessService { } private Long getUserId(String source,Long deviceId){ - Long userId = null; if("app".equals( source)){ - userId = AppLoginHelper.getUserId(); + return AppLoginHelper.getUserId(); } else if ("web".equals( source)){ - AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo(); - appDeviceBindRecordBo.setDeviceId(deviceId); - appDeviceBindRecordBo.setCommunicationMode(0); - List appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo); - if (appDeviceBindRecordVos != null && !appDeviceBindRecordVos.isEmpty()){ - userId = appDeviceBindRecordVos.get(0).getBindingUserId(); - } +// AppDeviceBindRecordBo appDeviceBindRecordBo = new AppDeviceBindRecordBo(); +// appDeviceBindRecordBo.setDeviceId(deviceId); +//// appDeviceBindRecordBo.setCommunicationMode(0); +// List appDeviceBindRecordVos = appDeviceBindRecordService.queryList(appDeviceBindRecordBo); +// if (appDeviceBindRecordVos != null && !appDeviceBindRecordVos.isEmpty()){ +// userId = appDeviceBindRecordVos.get(0).getBindingUserId(); +// } } - return userId; + return 0L; } /** * 校验音频文件格式 @@ -572,26 +571,29 @@ public class AudioProcessService { if(deviceId == null){ return null; } + Long userId = getUserId(source, deviceId); AppBusinessFileBo bo = new AppBusinessFileBo(); bo.setBusinessId(deviceId); - bo.setCreateBy(userId); bo.setFileType(3L); + if("web".equals(source)){ + bo.setCreateBy(null); + }else{ + bo.setCreateBy(userId); + } return appBusinessFileService.queryAppFileList(bo); } - public R deleteAudioFile(Long fileId,Long deviceId) { + public R deleteAudioFile(Long id) { UpdateWrapper 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 renameAudioFile(AppFileRenameDto bo) { UpdateWrapper 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(); diff --git 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 index 2fc2493c..75eaeb82 100644 --- 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 @@ -123,8 +123,8 @@ public class WebVideoController extends BaseController { * 删除语音文件 */ @GetMapping("/deleteAudioFile") - public R deleteAudioFile(Long fileId,Long deviceId) { - return audioProcessService.deleteAudioFile(fileId,deviceId); + public R deleteAudioFile(Long id) { + return audioProcessService.deleteAudioFile(id); } /** diff --git 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 index bb340f73..c95d10a7 100644 --- 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 @@ -38,6 +38,7 @@ public class WebDeviceHBY100JController extends BaseController { */ @PostMapping("/updateVoice") public R updateVoice(@RequestBody HBY100JUpdateVoiceDto dto) { + dto.setCommunicationMode(0); deviceHBY100JBizService.updateVoice(dto); return R.ok(); } 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 c844cb75..b46c73b6 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 @@ -166,7 +166,7 @@ public class DeviceHBY100JBizService { if(StringUtils.isNotBlank(voicePlayStatus)){ FuncType6VoicePlayRequest funcType6VoicePlayRequest = JSONObject.parseObject(voicePlayStatus, FuncType6VoicePlayRequest.class); if(funcType6VoicePlayRequest.getData() != null){ - vo.setVolume(funcType6VoicePlayRequest.getData().getVoiceBroadcast()); + vo.setVoiceBroadcast(funcType6VoicePlayRequest.getData().getVoiceBroadcast()); } } diff --git 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 index fb2f1880..960af434 100644 --- 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 @@ -17,4 +17,5 @@ import java.util.List; public interface AppBusinessFileMapper extends BaseMapperPlus { List queryAppFileList(AppBusinessFileBo bo); + } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml index 01263506..5099169a 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml @@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.file_type = #{fileType} - - and a.create_by = #{createBy} + + and (a.create_by = #{createBy} or a.update_by = 0) order by a.create_time desc diff --git 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 index 125e5996..60bcd12f 100644 --- 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());