完善附件上传公共接口

修改手机端安全检查实体类中附件实体信息。

src/main/java/com/sooka/sponest/mobile/data/housingconstruction/HousingconstructionSafetyinspectionrecordsController.java

@@ -1,22 +1,23 @@
 package com.sooka.sponest.mobile.data.housingconstruction;
 
+import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.core.web.page.TableSupport;
+import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionAttach;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionitem;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecords;
 import com.sooka.sponest.data.api.housingconstruction.domain.HousingconstructionSafetyinspectionrecordsdetail;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionitemService;
 import com.sooka.sponest.data.api.housingconstruction.service.RemoteHousingconstructionSafetyinspectionrecordsService;
+import com.sooka.sponest.mobile.remoteapi.RemoteSystemBaseService;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping("AppHousingconstructionSafetyinspectionrecordsController")
@@ -43,16 +44,38 @@ public class HousingconstructionSafetyinspectionrecordsController {
     }
 
     @GetMapping("/safetyinspectionrecords/edit")
-    public AjaxResult getRecordDetailById(HousingconstructionSafetyinspectionrecords record) {
-        if (StringUtils.isEmpty(record.getId())) {
-            return getTemplate(record.getEnterpriseInspectionType());
+    public AjaxResult getRecordDetailById(HousingconstructionSafetyinspectionrecords recordVO) {
+        if (StringUtils.isEmpty(recordVO.getId())) {
+            return getTemplate(recordVO.getEnterpriseInspectionType());
         } else {
-            return safetyinspectionrecordsService.getRecordDetailById(record.getId());
+            AjaxResult recordDetailById = safetyinspectionrecordsService.getRecordDetailById(recordVO.getId());
+            Map<String, Object> record = (Map<String, Object>) recordDetailById.get("data");
+            String oldIp = SpringUtils.getBean(RemoteSystemBaseService.class).selectConfigKey("fileUrl").getData();
+            String newIp = SpringUtils.getBean(RemoteSystemBaseService.class).selectConfigKey("appUrl").getData();
+
+            List<Map<String, Object>> detailList = (List<Map<String, Object>>) record.get("detailList");
+            for (Map<String, Object> detail : detailList) {
+                List<Map<String, Object>> attachList = (List<Map<String, Object>>) detail.get("attachList");
+                for (Map<String, Object> attach : attachList) {
+                    String string = MapUtils.getString(attach, "attachPath");
+                    attach.put("realUrl",string.replaceAll(oldIp, newIp));
+                }
+            }
+            return AjaxResult.success(record);
         }
     }
 
     @PostMapping("/safetyinspectionrecords")
     public AjaxResult addSafetyinspectionrecords(@RequestBody HousingconstructionSafetyinspectionrecords record) {
+        List<HousingconstructionSafetyinspectionrecordsdetail> detailList = record.getDetailList();
+        detailList.forEach(detail->{
+            List<HousingconstructionAttach> attachList = detail.getAttachList();
+            for (int i = 0; i < attachList.size(); i++) {
+                HousingconstructionAttach attach = attachList.get(i);
+                attach.setAttachPath(attach.getRealUrl());
+                attach.setAttachSorts(Long.parseLong(String.valueOf(i)));
+            }
+        });
         return safetyinspectionrecordsService.addSafetyinspectionrecords(record);
     }