优化巡查记录的图片回显

yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApi.java

@@ -70,4 +70,12 @@ public interface FileApi {
     CommonResult<String> presignGetUrl(@NotEmpty(message = "URL 不能为空") @RequestParam("url") String url,
                                        Integer expirationSeconds);
 
+
+    /**
+     * 根据id获取文件url
+     */
+    @GetMapping(PREFIX + "/getUrl")
+    @Operation(summary = "根据id返回文件的访问路径")
+    CommonResult<String> getUrlById(@NotEmpty(message = "id不能为空") @RequestParam("id") String id);
+
 }

yudao-module-infra/yudao-module-infra-server/src/main/java/cn/iocoder/yudao/module/infra/api/file/FileApiImpl.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.infra.api.file;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.infra.api.file.dto.FileCreateReqDTO;
+import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
 import cn.iocoder.yudao.module.infra.service.file.FileService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,4 +29,12 @@ public class FileApiImpl implements FileApi {
         return success(fileService.presignGetUrl(url, expirationSeconds));
     }
 
+    @Override
+    public CommonResult<String> getUrlById(String id) {
+        FileDO file = fileService.getFile(Long.valueOf(id));
+        if (file != null && file.getUrl() != null){
+            return success(file.getUrl());
+        }else return success(null);
+    }
+
 }

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/DustPatrolRecordController.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.dustpatrolrecord;
 
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,7 +38,8 @@ public class DustPatrolRecordController {
 
     @Resource
     private DustPatrolRecordService dustPatrolRecordService;
-
+    @Resource
+    private FileApi fileApi;
     @PostMapping("/create")
     @Operation(summary = "创建巡查记录")
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-record:create')")
@@ -77,7 +79,18 @@ public class DustPatrolRecordController {
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-record:query')")
     public CommonResult<DustPatrolRecordRespVO> getDustPatrolRecord(@RequestParam("id") String id) {
         DustPatrolRecordDO dustPatrolRecord = dustPatrolRecordService.getDustPatrolRecord(id);
-        return success(BeanUtils.toBean(dustPatrolRecord, DustPatrolRecordRespVO.class));
+        DustPatrolRecordRespVO respVO = BeanUtils.toBean(dustPatrolRecord, DustPatrolRecordRespVO.class);
+        String[] strings = dustPatrolRecord.getPatrolPicture().split(",");
+        List<String> arrayList = new ArrayList<>();
+        for (String imgId : strings) {
+            CommonResult<String> urlById = fileApi.getUrlById(imgId);
+            if (urlById.getData()!=null){
+                String url = urlById.getData();
+                arrayList.add(url);
+            }
+        }
+        respVO.setPatrolPictures(arrayList);
+        return success(respVO);
     }
 
     @GetMapping("/page")
@@ -85,10 +98,28 @@ public class DustPatrolRecordController {
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-record:query')")
     public CommonResult<PageResult<DustPatrolRecordRespVO>> getDustPatrolRecordPage(@Valid DustPatrolRecordPageReqVO pageReqVO) {
         PageResult<DustPatrolRecordDO> pageResult = dustPatrolRecordService.getDustPatrolRecordPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DustPatrolRecordRespVO.class));
+        PageResult<DustPatrolRecordRespVO> voPageResult = BeanUtils.toBean(pageResult, DustPatrolRecordRespVO.class);
+        // 获取巡查图片
+        List<DustPatrolRecordRespVO> list = voPageResult.getList();
+        for (DustPatrolRecordRespVO vo : list) {
+            if (vo.getPatrolPicture() != null) {
+                List<String> strings = Arrays.stream(vo.getPatrolPicture().split(",")).toList();
+                List<String> urls = new ArrayList<>();
+                for (String id : strings) {
+                    CommonResult<String> urlById = fileApi.getUrlById(id);
+                    if (urlById.getData()!=null){
+                        String url = urlById.getData();
+                        urls.add(url);
+                    }
+                }
+                vo.setPatrolPictures(urls);
+            }
+        }
+        return success(voPageResult);
     }
 
     @GetMapping("/export-excel")
+
     @Operation(summary = "导出巡查记录 Excel")
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-record:export')")
     @ApiAccessLog(operateType = EXPORT)

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/vo/DustPatrolRecordRespVO.java

@@ -39,7 +39,7 @@ public class DustPatrolRecordRespVO {
     @Schema(description = "巡查图片")
     @ExcelProperty("巡查图片")
     private String patrolPicture;
-
+    private List<String> patrolPictures;
     @Schema(description = "巡查单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("巡查单位")
     private String patrolUnit;

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrecord/vo/DustPatrolRecordSaveReqVO.java

@@ -36,6 +36,7 @@ public class DustPatrolRecordSaveReqVO {
 
     @Schema(description = "巡查图片")
     private String patrolPicture;
+    private List<String> patrolPictures;
 
     @Schema(description = "巡查单位", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "巡查单位不能为空")

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/DustPatrolRectifyController.java

@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.system.controller.admin.dustpatrolrectify;
 
+import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,7 +38,8 @@ public class DustPatrolRectifyController {
 
     @Resource
     private DustPatrolRectifyService dustPatrolRectifyService;
-
+    @Resource
+    private FileApi fileApi;
     @PostMapping("/create")
     @Operation(summary = "创建巡查问题整改")
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-rectify:create')")
@@ -77,7 +79,18 @@ public class DustPatrolRectifyController {
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-rectify:query')")
     public CommonResult<DustPatrolRectifyRespVO> getDustPatrolRectify(@RequestParam("id") String id) {
         DustPatrolRectifyDO dustPatrolRectify = dustPatrolRectifyService.getDustPatrolRectify(id);
-        return success(BeanUtils.toBean(dustPatrolRectify, DustPatrolRectifyRespVO.class));
+        DustPatrolRectifyRespVO respVO = BeanUtils.toBean(dustPatrolRectify, DustPatrolRectifyRespVO.class);
+        String[] strings = dustPatrolRectify.getRectifyImg().split(",");
+        List<String> arrayList = new ArrayList<>();
+        for (String imgId : strings) {
+            CommonResult<String> urlById = fileApi.getUrlById(imgId);
+            if (urlById.getData()!=null){
+                String url = urlById.getData();
+                arrayList.add(url);
+            }
+        }
+        respVO.setRectifyImgs(arrayList);
+        return success(respVO);
     }
 
     @GetMapping("/page")
@@ -85,7 +98,23 @@ public class DustPatrolRectifyController {
     @PreAuthorize("@ss.hasPermission('system:dust-patrol-rectify:query')")
     public CommonResult<PageResult<DustPatrolRectifyRespVO>> getDustPatrolRectifyPage(@Valid DustPatrolRectifyPageReqVO pageReqVO) {
         PageResult<DustPatrolRectifyDO> pageResult = dustPatrolRectifyService.getDustPatrolRectifyPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DustPatrolRectifyRespVO.class));
+        PageResult<DustPatrolRectifyRespVO> result = BeanUtils.toBean(pageResult, DustPatrolRectifyRespVO.class);
+        List<DustPatrolRectifyRespVO> list = result.getList();
+        for (DustPatrolRectifyRespVO respVO : list) {
+            if (respVO.getRectifyImg() != null){
+                List<String> strings = Arrays.stream(respVO.getRectifyImg().split(",")).toList();
+                List<String> urls = new ArrayList<>();
+                for (String id : strings) {
+                    CommonResult<String> urlById = fileApi.getUrlById(id);
+                    if (urlById.getData()!=null){
+                        String url = urlById.getData();
+                        urls.add(url);
+                    }
+                }
+                respVO.setRectifyImgs(urls);
+            }
+        }
+        return success(result);
     }
 
     @GetMapping("/export-excel")

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/vo/DustPatrolRectifyPageReqVO.java

@@ -23,6 +23,7 @@ public class DustPatrolRectifyPageReqVO extends PageParam {
     @Schema(description = "问题整改图片")
     private String rectifyImg;
 
+
     @Schema(description = "整改人")
     private String rectifyPerson;
 

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/vo/DustPatrolRectifyRespVO.java

@@ -27,6 +27,7 @@ public class DustPatrolRectifyRespVO {
     @Schema(description = "问题整改图片")
     @ExcelProperty("问题整改图片")
     private String rectifyImg;
+    private List<String> rectifyImgs;
 
     @Schema(description = "整改人")
     @ExcelProperty("整改人")

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dustpatrolrectify/vo/DustPatrolRectifySaveReqVO.java

@@ -24,6 +24,7 @@ public class DustPatrolRectifySaveReqVO {
 
     @Schema(description = "问题整改图片")
     private String rectifyImg;
+    private List<String> rectifyImgs;
 
     @Schema(description = "整改人")
     private String rectifyPerson;

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustpatrolrecord/DustPatrolRecordServiceImpl.java

@@ -34,6 +34,8 @@ public class DustPatrolRecordServiceImpl implements DustPatrolRecordService {
 
     @Override
     public String createDustPatrolRecord(DustPatrolRecordSaveReqVO createReqVO) {
+        String join = String.join(",", createReqVO.getPatrolPictures());
+        createReqVO.setPatrolPicture(join);
         // 插入
         DustPatrolRecordDO dustPatrolRecord = BeanUtils.toBean(createReqVO, DustPatrolRecordDO.class);
         dustPatrolRecordMapper.insert(dustPatrolRecord);
@@ -46,6 +48,8 @@ public class DustPatrolRecordServiceImpl implements DustPatrolRecordService {
     public void updateDustPatrolRecord(DustPatrolRecordSaveReqVO updateReqVO) {
         // 校验存在
         validateDustPatrolRecordExists(updateReqVO.getId());
+        String join = String.join(",", updateReqVO.getPatrolPictures());
+        updateReqVO.setPatrolPicture(join);
         // 更新
         DustPatrolRecordDO updateObj = BeanUtils.toBean(updateReqVO, DustPatrolRecordDO.class);
         dustPatrolRecordMapper.updateById(updateObj);

yudao-module-system/yudao-module-system-server/src/main/java/cn/iocoder/yudao/module/system/service/dustpatrolrectify/DustPatrolRectifyServiceImpl.java

@@ -34,6 +34,8 @@ public class DustPatrolRectifyServiceImpl implements DustPatrolRectifyService {
 
     @Override
     public String createDustPatrolRectify(DustPatrolRectifySaveReqVO createReqVO) {
+        String join = String.join(",", createReqVO.getRectifyImgs());
+        createReqVO.setRectifyImg(join);
         // 插入
         DustPatrolRectifyDO dustPatrolRectify = BeanUtils.toBean(createReqVO, DustPatrolRectifyDO.class);
         dustPatrolRectifyMapper.insert(dustPatrolRectify);
@@ -46,6 +48,8 @@ public class DustPatrolRectifyServiceImpl implements DustPatrolRectifyService {
     public void updateDustPatrolRectify(DustPatrolRectifySaveReqVO updateReqVO) {
         // 校验存在
         validateDustPatrolRectifyExists(updateReqVO.getId());
+        String join = String.join(",", updateReqVO.getRectifyImgs());
+        updateReqVO.setRectifyImg(join);
         // 更新
         DustPatrolRectifyDO updateObj = BeanUtils.toBean(updateReqVO, DustPatrolRectifyDO.class);
         dustPatrolRectifyMapper.updateById(updateObj);