消防水源接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/WaterResourceTypeDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.excel.RoleNameExplicitConstraint;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author system_generator
+ * @date 2021-06-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "WaterResourceTypeDto", description = "水资源")
+public class WaterResourceTypeDto extends BaseDto {
+
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资源类型（消火栓：hydrant、消防水鹤：crane、天然水源：natural、消防水池：pool）")
+    private String resourceType;
+
+    @ApiModelProperty(value = "资源类型名称（消火栓、消防水鹤、天然水源、消防水池）")
+    private String resourceTypeName;
+
+    @ApiModelProperty(value = "所属消防系统id")
+    private Long belongFightingSystemId;
+
+    @ApiModelProperty(value = "所属消防系统")
+    private String belongFightingSystem;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/WaterResourceMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceZhDto;
 import com.yeejoin.amos.boot.module.common.api.entity.WaterResource;
 import org.apache.ibatis.annotations.Param;
@@ -35,5 +36,5 @@ public interface WaterResourceMapper extends BaseMapper<WaterResource> {
     Integer getWaterResourceListCount(@Param("par")RequestData par);
 
 
-    List<WaterResourceDto> getWaterResourceTypeList();
+    List<WaterResourceTypeDto> getWaterResourceTypeList(Boolean isDelete);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/WaterResourceMapper.xml

@@ -101,9 +101,19 @@
             #{par.distance}
         </if>
     </select>
-    <select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto">
-        select distinct belong_fighting_system_id, belong_fighting_system, resource_type, resource_type_name
+    <select id="getWaterResourceTypeList" resultType="com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto">
+        select distinct (case
+                             when ISNULL(belong_fighting_system_id) = 0 and LENGTH(trim(belong_fighting_system_id)) > 0
+                                 then belong_fighting_system_id
+                             else -1 end)   belong_fighting_system_id,
+                        (case
+                             when ISNULL(belong_fighting_system) = 0 and LENGTH(trim(belong_fighting_system)) > 0
+                                 then belong_fighting_system
+                             else '其他' end) belong_fighting_system,
+                        resource_type,
+                        resource_type_name
         from cb_water_resource
+        where is_delete = #{isDelete}
     </select>
 
 

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

@@ -342,8 +342,19 @@ public class WaterResourceController extends BaseController {
     public ResponseModel<List<WaterResourceDto>> selectList(String name, Long sequenceNbr,
                                                             Long belongFightingSystemId, Long belongBuildingId,
                                                             String belongBuilding, String resourceType) {
-        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(false, name, sequenceNbr,
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.queryWaterResourceList(true, name, sequenceNbr,
                 belongFightingSystemId, belongBuildingId,
                 belongBuilding, resourceType));
     }
+
+    /**
+     * 查询水资源类型列表
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询水资源类型列表", notes = "查询水资源类型列表")
+    @GetMapping(value = "/resource_type_list")
+    public ResponseModel<List<WaterResourceTypeDto>> selectResourceTypeList() {
+        return ResponseHelper.buildResponse(waterResourceServiceImpl.getWaterResourceTypeList(true));
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/WaterResourceServiceImpl.java

@@ -225,7 +225,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
         return waterResourceDto;
     }
 
-    public List<WaterResourceDto> getWaterResourceTypeList() {
-        return waterResourceMapper.getWaterResourceTypeList();
+    public List<WaterResourceTypeDto> getWaterResourceTypeList(Boolean isDelete) {
+        return waterResourceMapper.getWaterResourceTypeList(isDelete);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/aop/ControllerAop.java

@@ -46,7 +46,7 @@ public class ControllerAop {
     @Autowired
     private RedisUtils redisUtils;
 
-    @Pointcut("execution(public * com.yeejoin.amos.boot.module.*jcs.biz.controller..*(..))")
+    @Pointcut("execution(public * com.yeejoin.amos.boot.module.*.biz.controller..*(..))")
     public void userCache() {
 
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/EquipmentServiceImpl.java

@@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.biz.common.utils.MenuFrom;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceDto;
+import com.yeejoin.amos.boot.module.common.api.dto.WaterResourceTypeDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.FireSystemDto;
 import com.yeejoin.amos.boot.module.jcs.api.feign.EquipFeignClient;
@@ -86,7 +87,7 @@ public class EquipmentServiceImpl {
         MenuFrom fireSystem = new MenuFrom("-1", "其他系统", "0", "0");
         fireSystemDtoList.add(fireSystem);
         // 获取消防水源类型列表，包含消防系统和消防水源类型，去重
-        List<WaterResourceDto> waterResourceTypeList = waterResourceServiceImpl.getWaterResourceTypeList();
+        List<WaterResourceTypeDto> waterResourceTypeList = waterResourceServiceImpl.getWaterResourceTypeList(true);
 
         // 组装消防水资源树
         fireSystemDtoList.forEach(item -> {