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/JGDPStatisticsServiceImpl.java

@@ -1417,7 +1417,7 @@ public class JGDPStatisticsServiceImpl {
         // 2.压力管道长度统计
         stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode);
         // 3.已纳管设备总数
-        this.staticsCenterMapCountDataForEquipIsManage(result, orgCode);
+        this.staticsCenterMapCountDataForEquipIsManage(result);
         // 4.登记证总数
         this.staticsCenterMapCountCertificate(result, orgCode);
         // 5.超过15年电梯数量
@@ -1459,30 +1459,14 @@ public class JGDPStatisticsServiceImpl {
         result.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), num);
     }
 
-    private void staticsCenterMapCountDataForEquipIsManage(Map<String, Object> result, String orgCode) {
-        long num = 0;
-        CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
-        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
-        // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
-        // 只统计已纳管设备
-        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
-        // 且8大类，目的去掉脏数据
-        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE", StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
-        request.query(boolMust);
-        try {
-            CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
-            num = response.getCount();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), num);
+    private void staticsCenterMapCountDataForEquipIsManage(Map<String, Object> result) {
+        result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), result.get(DPMapStatisticsItemEnum.TOTAL.getCode()));
+        result.remove(DPMapStatisticsItemEnum.TOTAL.getCode());
     }
 
     public List<Map<String, Object>> JGCenterMapCountForOverview(DPFilterParamDto dpFilterParamDto) {
         List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(dpFilterParamDto);
-        List<Map<String, Object>> result = regionModels.parallelStream().map(r -> {
+        return regionModels.parallelStream().map(r -> {
             DPFilterParamDto filterParamDto = new DPFilterParamDto();
             filterParamDto.setCityCode(r.getRegionCode().toString());
             Map<String, Object> itemResult = JGCenterMapCountForGlobal(filterParamDto);
@@ -1490,7 +1474,6 @@ public class JGDPStatisticsServiceImpl {
             itemResult.put("regionName", r.getRegionName());
             return itemResult;
         }).collect(Collectors.toList());
-        return result;
     }
 
     public List<Map<String, Object>> noticeList(DPFilterParamDto dpFilterParamDto) {

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

@@ -245,7 +245,8 @@ public class StCommonServiceImpl {
                     // 压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
                     if(bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLRQ.getCode())){
                         countMap.put(bucket.getKeyAsString(), bucket.getDocCount() - cylinderNum);
-                    } else {
+                    } else if(!bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLGD.getCode())) {
+                        //  压力管道单独统计，求总数时，不包括压力管道
                         countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
                     }
                 }
@@ -254,7 +255,8 @@ public class StCommonServiceImpl {
             equipmentCategoryDtos.forEach(c -> {
                 result.put(this.castCategoryCode2WebCode(c.getCode()), countMap.getOrDefault(c.getCode(), 0L));
             });
-            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), countMap.values().stream().mapToLong(e -> e).sum() + cylinderNum);
+            // 注意，求总数时：countMap不包括气瓶数量、压力管道数量（20240819修改）
+            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), countMap.values().stream().mapToLong(e -> e).sum());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }