From 46222610b14f1c9327a3e4e6945e8ebe9bcefef4 Mon Sep 17 00:00:00 2001 From: yangxiaozhong <429869597@qq.com> Date: Tue, 13 Jan 2026 15:10:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A1=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E5=9B=BE=E7=89=87=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../infra/service/file/FileServiceImpl.java | 9 ++++---- .../DustPatrolRecordController.java | 23 ++++--------------- .../DustPatrolRectifyController.java | 22 +++--------------- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java index 406ac793d..d7dfba5b0 100644 --- a/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java +++ b/yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java @@ -84,12 +84,11 @@ public class FileServiceImpl implements FileService { FileClient client = fileConfigService.getMasterFileClient(); Assert.notNull(client, "客户端(master) 不能为空"); String url = client.upload(content, path, type); - FileDO fileDO = new FileDO().setConfigId(client.getId()) - .setName(name).setPath(path).setUrl(url) - .setType(type).setSize(content.length); // 3. 保存到数据库 - fileMapper.insert(fileDO); - return fileDO.getId().toString(); + fileMapper.insert(new FileDO().setConfigId(client.getId()) + .setName(name).setPath(path).setUrl(url) + .setType(type).setSize(content.length)); + return url; } @VisibleForTesting diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/DustPatrolRecordController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/DustPatrolRecordController.java index 6f52db582..be9780764 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/DustPatrolRecordController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/DustPatrolRecordController.java @@ -80,16 +80,8 @@ public class DustPatrolRecordController { public CommonResult getDustPatrolRecord(@RequestParam("id") String id) { DustPatrolRecordDO dustPatrolRecord = dustPatrolRecordService.getDustPatrolRecord(id); DustPatrolRecordRespVO respVO = BeanUtils.toBean(dustPatrolRecord, DustPatrolRecordRespVO.class); - String[] strings = dustPatrolRecord.getPatrolPicture().split(","); - List arrayList = new ArrayList<>(); - for (String imgId : strings) { - CommonResult urlById = fileApi.getUrlById(imgId); - if (urlById.getData()!=null){ - String url = urlById.getData(); - arrayList.add(url); - } - } - respVO.setPatrolPictures(arrayList); + List list = Arrays.stream(dustPatrolRecord.getPatrolPicture().split(",")).toList(); + respVO.setPatrolPictures(list); return success(respVO); } @@ -104,15 +96,8 @@ public class DustPatrolRecordController { for (DustPatrolRecordRespVO vo : list) { if (vo.getPatrolPicture() != null) { List strings = Arrays.stream(vo.getPatrolPicture().split(",")).toList(); - List urls = new ArrayList<>(); - for (String id : strings) { - CommonResult urlById = fileApi.getUrlById(id); - if (urlById.getData()!=null){ - String url = urlById.getData(); - urls.add(url); - } - } - vo.setPatrolPictures(urls); + + vo.setPatrolPictures(strings); } } return success(voPageResult); diff --git a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/DustPatrolRectifyController.java b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/DustPatrolRectifyController.java index 3a51dbb07..984fe3eb6 100644 --- a/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/DustPatrolRectifyController.java +++ b/yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/DustPatrolRectifyController.java @@ -80,16 +80,8 @@ public class DustPatrolRectifyController { public CommonResult getDustPatrolRectify(@RequestParam("id") String id) { DustPatrolRectifyDO dustPatrolRectify = dustPatrolRectifyService.getDustPatrolRectify(id); DustPatrolRectifyRespVO respVO = BeanUtils.toBean(dustPatrolRectify, DustPatrolRectifyRespVO.class); - String[] strings = dustPatrolRectify.getRectifyImg().split(","); - List arrayList = new ArrayList<>(); - for (String imgId : strings) { - CommonResult urlById = fileApi.getUrlById(imgId); - if (urlById.getData()!=null){ - String url = urlById.getData(); - arrayList.add(url); - } - } - respVO.setRectifyImgs(arrayList); + List list = Arrays.stream(dustPatrolRectify.getRectifyImg().split(",")).toList(); + respVO.setRectifyImgs(list); return success(respVO); } @@ -102,15 +94,7 @@ public class DustPatrolRectifyController { List list = result.getList(); for (DustPatrolRectifyRespVO respVO : list) { if (respVO.getRectifyImg() != null){ - List strings = Arrays.stream(respVO.getRectifyImg().split(",")).toList(); - List urls = new ArrayList<>(); - for (String id : strings) { - CommonResult urlById = fileApi.getUrlById(id); - if (urlById.getData()!=null){ - String url = urlById.getData(); - urls.add(url); - } - } + List urls = Arrays.stream(respVO.getRectifyImg().split(",")).toList(); respVO.setRectifyImgs(urls); } }