修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

@@ -11,12 +11,7 @@ import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceCrane;
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceHydrant;
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceIot;
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourceNatural;
-import com.yeejoin.amos.boot.module.common.api.entity.WaterResourcePool;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.enums.WaterResourceTypeEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.*;
 import io.swagger.annotations.Api;
@@ -83,13 +78,12 @@ public class WaterResourceController extends BaseController {
         Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
                 e -> e.getCode().equals(resourceType));
         /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
-        List<Object> realityImgList = model.getRealityImgList();
+       // List<Object> realityImgList = model.getRealityImgList();
+
       /*
         if (realityImgList != null ){
-
         }
         realityImgList.forEach(i->{
-
             ((Map<String, Object>) i).put("name",QRCodeUtil.generateQRCode()+"."+i.toString().substring(i.toString().lastIndexOf(".") + 1).toLowerCase());
         });*/
 
@@ -97,7 +91,7 @@ public class WaterResourceController extends BaseController {
 
 
         model.setResourceTypeName(resourceTypeEnum.get().getName());
-        model.setRealityImg(JSONArray.toJSONString(realityImgList));
+        model.setRealityImg(null);
         model.setOrientationImg(JSONArray.toJSONString(model.   getOrientationImgList()));
         /*2021-09-08 前端表示前端传递的address参数已经切割过，后端无需再切割获取 陈召 屏蔽代码 97-102行*/
        /* if(model.getAddress()!=null){
@@ -160,11 +154,9 @@ public class WaterResourceController extends BaseController {
         } else {
             waterResourceServiceImpl.createWithModel(model);
         }
-
-        if (model.getAttachments() != null && ! model.getAttachments().isEmpty()){
+        if (model.getAttachments() != null){
             sourceFileService.saveAttachments(model.getSequenceNbr(),model.getAttachments());
         }
-
         return ResponseHelper.buildResponse(model);
     }
 
@@ -189,6 +181,7 @@ public class WaterResourceController extends BaseController {
         /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
         if (model.getAttachments() != null && ! model.getAttachments().isEmpty()){
             sourceFileService.saveAttachments(model.getSequenceNbr(),model.getAttachments());
+
         }
         /*bug 2913 更换保存方式 存储到公共附件表 chenzhao 2021-10-18 start*/
         // 更新基本信息