消防水源接口

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

 package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.EnumsUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.*;
@@ -13,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import net.sf.json.JSONArray;
 
 import java.util.List;
 import java.util.Optional;
@@ -64,10 +64,8 @@ public class WaterResourceController extends BaseController {
         Optional<WaterResourceTypeEnum> resourceTypeEnum = EnumsUtils.getEnumObject(WaterResourceTypeEnum.class,
                 e -> e.getCode().equals(resourceType));
         model.setResourceTypeName(resourceTypeEnum.get().getName());
-        model.setRealityImg(model.getRealityImgList() == null ? "" :
-                JSONArray.fromObject(model.getRealityImgList()).toString());
-        model.setOrientationImg(model.getRealityImgList() == null ? "" :
-                JSONArray.fromObject(model.getOrientationImgList()).toString());
+        model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
+        model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
         if (!StringUtils.isEmpty(resourceType)) {
             switch (resourceType) {
                 case "hydrant":
@@ -243,10 +241,9 @@ public class WaterResourceController extends BaseController {
     public ResponseModel<WaterResourceDto> selectOne(@PathVariable Long sequenceNbr) {
         // 查询基本信息
         WaterResourceDto waterResourceDto = waterResourceServiceImpl.queryBySeq(sequenceNbr);
-        waterResourceDto.setRealityImgList(StringUtils.isEmpty(waterResourceDto.getRealityImg()) ? null :
-                JSONArray.fromObject(waterResourceDto.getRealityImg()));
-        waterResourceDto.setOrientationImgList(StringUtils.isEmpty(waterResourceDto.getOrientationImg()) ? null :
-                JSONArray.fromObject(waterResourceDto.getOrientationImg()));
+        waterResourceDto.setRealityImgList(JSONArray.parseArray(waterResourceDto.getRealityImg(), Object.class));
+        waterResourceDto.setOrientationImgList(JSONArray.parseArray(waterResourceDto.getOrientationImg()));
+        Boolean isDelete = waterResourceDto.getIsDelete();
         // 查询属性信息
         String resourceType = waterResourceDto.getResourceType();
         if (!StringUtils.isEmpty(resourceType)) {
@@ -280,6 +277,7 @@ public class WaterResourceController extends BaseController {
             }
         }
         waterResourceDto.setSequenceNbr(sequenceNbr);
+        waterResourceDto.setIsDelete(isDelete);
         // 查询物联参数
         if (waterResourceDto.getIsIot()) {
             WaterResourceIot waterResourceIot = waterResourceIotService.getOne(new QueryWrapper<WaterResourceIot>().eq(