refactor(statistics): 优化设备数量统计逻辑

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

@@ -380,6 +380,9 @@ public class JGDPStatisticsServiceImpl {
         long cylinderNum = stCommonService.staticsCenterMapCountDataForCylinder(result, orgCode, true, false, false);
         //1.8大类设备数量统计,压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode, true, false, false);
+        // 单独计算已纳管设备（台套）数量总数
+        long hasSupervisoryCodeEquipCount = stCommonService.queryHasSupervisoryCodeEquipCount(orgCode, false);
+        result.put("total", hasSupervisoryCodeEquipCount);
         //2.压力管道长度统计
         stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
         //3.单位数量统计

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

@@ -303,7 +303,7 @@ public class StCommonServiceImpl {
             });
             // 注意，求总数时：countMap不包括气瓶数量、压力管道数量（20240819修改）
             // 总数为已赋码设备数量，需要单独统计
-            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), queryHasSupervisoryCodeEquipCount(orgCode, isOrgBranchCodeExactMatch, cylinderNum));
+            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), countMap.values().stream().mapToLong(e -> e).sum());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -315,10 +315,9 @@ public class StCommonServiceImpl {
      * 统计已赋码设备数量
      * @param orgCode
      * @param isOrgBranchCodeExactMatch
-     * @param cylinderNum
      * @return
      */
-    public long queryHasSupervisoryCodeEquipCount(String orgCode, Boolean isOrgBranchCodeExactMatch, long cylinderNum) {
+    public long queryHasSupervisoryCodeEquipCount(String orgCode, Boolean isOrgBranchCodeExactMatch) {
         CountRequest request = new CountRequest();
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();