From 959030fdb131e87cebb55ae61799ac82affeca43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Mon, 22 Sep 2025 15:27:33 +0800 Subject: [PATCH] =?UTF-8?q?09-22-=E6=8A=A5=E4=BF=AE=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OpsInspectionReportController.java | 10 +++++++ .../domain/OpsInspectionReport.java | 4 +-- .../domain/bo/OpsInspectionReportBo.java | 2 +- .../domain/vo/OpsInspectionReportVo.java | 2 +- .../impl/OpsInspectionReportServiceImpl.java | 26 +++++++++++++------ 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionReportController.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionReportController.java index e5eebdc..ab36512 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionReportController.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/controller/OpsInspectionReportController.java @@ -104,4 +104,14 @@ public class OpsInspectionReportController extends BaseController { @PathVariable("ids") Long[] ids) { return toAjax(opsInspectionReportService.deleteWithValidByIds(List.of(ids), true)); } + + /** + * 生成纪录 + */ + @SaCheckPermission("inspection:report:record") + public R record(){ + + return null; + } + } diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionReport.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionReport.java index e944a3e..2bb881f 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionReport.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/OpsInspectionReport.java @@ -68,9 +68,9 @@ public class OpsInspectionReport extends BaseEntity { private String position; /** - * 文件ID + * 文件ID 多个用逗号分隔 */ - private Long fileId; + private String fileId; /** * 文件路径 diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java index 4dbc81e..bfa4fe3 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/bo/OpsInspectionReportBo.java @@ -76,7 +76,7 @@ public class OpsInspectionReportBo extends BaseEntity { * 文件ID */ // @NotBlank(message = "文件不能为空", groups = {AddGroup.class, EditGroup.class}) - private Long fileId; + private String fileId; /** * 文件路径 diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java index ddf4aac..c55608b 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/domain/vo/OpsInspectionReportVo.java @@ -87,7 +87,7 @@ public class OpsInspectionReportVo implements Serializable { * 文件ID */ @ExcelProperty(value = "文件ID") - private Long fileId; + private String fileId; /** * 文件路径 diff --git a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java index e5864f2..5652696 100644 --- a/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java +++ b/ruoyi-modules/xny-ops/src/main/java/org/dromara/inspection/service/impl/OpsInspectionReportServiceImpl.java @@ -24,10 +24,7 @@ import org.dromara.inspection.mapper.OpsInspectionReportMapper; import org.dromara.inspection.service.IOpsInspectionReportService; import org.springframework.web.multipart.MultipartFile; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Collection; +import java.util.*; /** * 运维-巡检-报修Service业务层处理 @@ -123,13 +120,23 @@ public class OpsInspectionReportServiceImpl implements IOpsInspectionReportServi return false; } - String s = remoteFileService.selectUrlByIds(String.valueOf(add.getFileId())); - add.setFileUrl(s); + if (add.getFileId() != null){ + String[] split = add.getFileId().split(","); + List urls = new ArrayList<>(); + for (String s : split) { + String ossUrl = remoteFileService.selectUrlByIds(s); + if (ossUrl != null){ + urls.add(ossUrl); + } + } + String join = String.join(",", urls); + add.setFileUrl(join); + bo.setFileUrl(join); + } boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setId(add.getId()); - bo.setFileUrl(s); } return flag; } @@ -179,7 +186,10 @@ public class OpsInspectionReportServiceImpl implements IOpsInspectionReportServi } if (!urls.isEmpty()) { - remoteFileService.deleteFile(urls); + for (String url : urls) { + List list = Arrays.asList(url.split(",")); + remoteFileService.deleteFile(list); + } } return baseMapper.deleteByIds(ids) > 0;