水源增加工业水池

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

@@ -371,4 +371,21 @@ public class WaterResourceDto extends BaseDto {
 	@ApiModelProperty(value = "附件")
 	@TableField(exist = false)
 	private Map<String, List<AttachmentDto>> attachments;
+
+	@ExcelProperty(value = "最低报警水位（m）", index = 43)
+	@ApiModelProperty(value = "最低报警水位（m）")
+	private float minWaterLevel;
+
+	@ExcelProperty(value = "最高报警水位（m）", index = 44)
+	@ApiModelProperty(value = "最高报警水位（m）")
+	private float maxWaterLevel;
+
+	@ExcelIgnore
+	@ApiModelProperty("水池液位显示装置id")
+	private Long levelDeviceId;
+
+	@ApiModelProperty("水池液位显示装置名称")
+	@ExcelProperty(value = "水池液位显示装置", index = 45)
+	@ExplicitConstraint(indexNum = 45, sourceClass = CommonExplicitConstraint.class, method = "getListByEquipmentCode")
+	private String levelDeviceName;
 }

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

@@ -62,4 +62,16 @@ public class WaterResourcePoolDto  extends BaseDto {
     @ApiModelProperty(value = "更新人员")
     private String recUserName;
 
+   @ApiModelProperty(value = "最低报警水位（m）")
+   private float minWaterLevel;
+
+   @ApiModelProperty(value = "最高报警水位（m）")
+   private float maxWaterLevel;
+
+   @ApiModelProperty("水池液位显示装置id")
+   private Long levelDeviceId;
+
+   @ApiModelProperty("水池液位显示装置名称")
+   private String levelDeviceName;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/WaterResourcePool.java

@@ -87,4 +87,28 @@ public class WaterResourcePool extends BaseEntity {
      */
 	@TableField("water_supply_name")
     private String waterSupplyName;
+
+    /**
+     * 最低报警水位
+     */
+    @TableField("min_water_level")
+    private float minWaterLevel;
+
+    /**
+     * 最高报警水位
+     */
+    @TableField("max_water_level")
+    private float maxWaterLevel;
+
+    /**
+     * 水池液位显示装置id
+     */
+    @TableField("level_device_id")
+    private Long levelDeviceId;
+
+    /**
+     * 水池液位显示装置名称
+     */
+    @TableField("level_device_name")
+    private String levelDeviceName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/WaterResourceTypeEnum.java

@@ -9,7 +9,8 @@ public enum WaterResourceTypeEnum {
     消火栓("hydrant", "消火栓"),
     消防水鹤("crane", "消防水鹤"),
     消防水池("pool", "消防水池"),
-    天然水源("natural", "天然水源");
+    天然水源("natural", "天然水源"),
+    工业水池("industryPool", "工业水池");
 
     private String code;
     private String name;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java

@@ -386,4 +386,12 @@ public interface EquipFeignClient {
     
     @RequestMapping(value = "/building/companyBuildingTree", method = RequestMethod.GET)
     public  ResponseModel<Object> getCompanyBuildingTree();
+
+    /**
+     * 根据code获取指定分类的装备列表
+     * @param code 分类
+     * @return 装备列表
+     */
+    @RequestMapping(value = "equipSpecific/getListByEquipmentCode/{code}", method = RequestMethod.GET)
+    ResponseModel<List<Map<String, Object>>>  getListByEquipmentCode(@PathVariable("code") String code);
 }

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

@@ -136,6 +136,7 @@ public class WaterResourceController extends BaseController {
                     waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
                     break;
                 case "pool":
+                case "industryPool":
                     // 新增基础信息
                     model.setIsIot(true);
                     waterResourceServiceImpl.createWithModel(model);
@@ -145,6 +146,8 @@ public class WaterResourceController extends BaseController {
                     waterResourcePoolDto.setResourceId(model.getSequenceNbr());
                     waterResourcePoolService.createWithModel(waterResourcePoolDto);
                     break;
+                default:
+                    break;
             }
             // 新增物联信息
             if (null != model.getWaterResourceIotDto() && model.getWaterResourceIotDto().size() > 0) {
@@ -270,6 +273,7 @@ public class WaterResourceController extends BaseController {
                     waterResourceNaturalDto.setSequenceNbr(waterResourceNatural.getSequenceNbr());
                     waterResourceNaturalService.updateWithModel(waterResourceNaturalDto);
                     break;
+                case "industryPool":
                 case "pool":
                     WaterResourcePoolDto waterResourcePoolDto = new WaterResourcePoolDto();
                     WaterResourcePool waterResourcePool =
@@ -279,6 +283,8 @@ public class WaterResourceController extends BaseController {
                     waterResourcePoolDto.setSequenceNbr(waterResourcePool.getSequenceNbr());
                     waterResourcePoolService.updateWithModel(waterResourcePoolDto);
                     break;
+                default:
+                    break;
             }
         }
         // 更新物联信息
@@ -392,12 +398,15 @@ public class WaterResourceController extends BaseController {
                                     sequenceNbr));
                     BeanUtils.copyProperties(waterResourceNatural, waterResourceDto);
                     break;
+                case "industryPool":
                 case "pool":
                     WaterResourcePool waterResourcePool =
                             waterResourcePoolService.getOne(new QueryWrapper<WaterResourcePool>().eq("resource_id",
                                     sequenceNbr));
                     BeanUtils.copyProperties(waterResourcePool, waterResourceDto);
                     break;
+                default:
+                    break;
             }
         }
         waterResourceDto.setSequenceNbr(sequenceNbr);

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

@@ -160,6 +160,7 @@ public class WaterResourceServiceImpl extends BaseService<WaterResourceDto, Wate
                     waterResourceNaturalDto.setResourceId(model.getSequenceNbr());
                     waterResourceNaturalService.createWithModel(waterResourceNaturalDto);
                     break;
+                case "industryPool":
                 case "pool":
                     // 新增基础信息
                     model.setIsIot(true);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentSpecificController.java

@@ -342,4 +342,11 @@ public class EquipmentSpecificController extends AbstractBaseController {
         return equipmentSpecificMapper.getListByWarehouseStructureId(buildingId);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getListByEquipmentCode/{code}")
+    @ApiOperation(httpMethod = "GET", value = "根据装备分类code获取装备list", notes = "根据装备分类code获取装备list")
+    public List<Map<String, Object>> getListByEquipmentCode( @PathVariable String code){
+        return equipmentSpecificSerivce.getListByEquipmentCode(code);
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificSerivce.java

@@ -215,4 +215,10 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
      */
     Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo);
 
+    /**
+     * 根据装备分类code获取装备列表
+     * @param code 装备分类逗号隔开
+     * @return 装备list
+     */
+    List<Map<String, Object>> getListByEquipmentCode(String code);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificSerivceImpl.java

@@ -2,14 +2,7 @@ package com.yeejoin.equipmanage.service.impl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
@@ -1776,4 +1769,14 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
         return Boolean.TRUE;
     }
 
+    @Override
+    public List<Map<String, Object>> getListByEquipmentCode(String code) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (StringUtil.isNotEmpty(code)) {
+            String[] strings = code.split(",");
+            list = equipmentSpecificMapper.getFirePumpInfo(strings);
+        }
+        return list;
+    }
+
 }

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

@@ -190,6 +190,9 @@ public class DataSourcesImpl implements DataSources {
                 case "getFireTeamList":
                     str =  getFireTeamList();
                     break;
+                case "getListByEquipmentCode":
+                    str =  getListByEquipmentCode();
+                    break;
 
             }
         }
@@ -696,5 +699,19 @@ public class DataSourcesImpl implements DataSources {
         return str;
     }
 
+    private String[] getListByEquipmentCode() {
+        String code = "92010700,92011500";
+        ResponseModel<List<Map<String, Object>>> response = equipFeignClient.getListByEquipmentCode(code);
+        List<Map<String, Object>> equipmentList = response.getResult();
+        String[] str = null;
+        List<String> resultList = Lists.newArrayList();
+        if (equipmentList != null && equipmentList.size() > 0) {
+            equipmentList.forEach(t -> {
+                resultList.add(t.get("name") + "@" + t.get("id"));
+            });
+            str = resultList.toArray(new String[resultList.size()]);
+        }
+        return str;
+    }
 
 }

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

@@ -1284,6 +1284,11 @@ public class ExcelServiceImpl {
 				item.setType(type[0]);
 				item.setTypeCode(type[1]);
 			}
+			if (item.getLevelDeviceName() != null) {
+				String[] type = item.getType().split("@");
+				item.setLevelDeviceName(type[0]);
+				item.setLevelDeviceId(Long.valueOf(type[1]));
+			}
 			// BUG 2935 优化项 分类从93060000 取得字典数据 by kongfm 2021-09-17
 			if (item.getEquipCategoryName() != null) {
 				String[] equipCategory = item.getEquipCategoryName().split("@");
@@ -1317,6 +1322,9 @@ public class ExcelServiceImpl {
 				case "消防水鹤":
 					item.setEquipCategoryCode("93060200");
 					break;
+				case "工业水池":
+					item.setEquipCategoryCode("93060500");
+					break;
 				default:
 					break;
 				}