1.压力管道数量算在特种设备总量里面

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/StCommonServiceImpl.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
@@ -46,11 +47,6 @@ import java.util.stream.Collectors;
 public class StCommonServiceImpl {
 
     /**
-     * 压力容器设备种类
-     */
-    public final static String EQU_LIST_CYLINDER = "2000";
-
-    /**
      * 气瓶设备类别
      */
     public final static String EQU_CATEGORY_CYLINDER = "2300";
@@ -243,9 +239,10 @@ public class StCommonServiceImpl {
             Map<String, Long> countMap = new HashMap<>();
             for (Terms.Bucket bucket : terms.getBuckets()) {
                 // 压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
-                if (bucket.getKeyAsString().equals(EQU_LIST_CYLINDER)) {
+                if (bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLRQ.getCode())) {
                     countMap.put(bucket.getKeyAsString(), bucket.getDocCount() - cylinderNum);
                 } else if (equipmentCategoryDtos.stream().anyMatch(e -> e.getCode().equalsIgnoreCase(bucket.getKeyAsString()))) {
+                    // 是八大类且非压力管道时（压力管道按照长度单独统计）
                     countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
                 }
             }