1.大屏-监管-左侧设备状态情况统计，统计数量不对bug修改

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

@@ -689,20 +689,19 @@ public class JGDPStatisticsServiceImpl {
     }
 
     public List<Map<String, Object>> equStateCount(DPFilterParamDto dpFilterParamDto) {
-        List<Map<String, Object>> resultList = new ArrayList<>();
+        List<Map<String, Object>> resultList;
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
-            this.setDefaultEquStateCount(resultList);
-            return resultList;
+            return this.setDefaultEquStateCount();
         }
         // 按照管辖机构区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
-        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE");
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE").size(20);
         builder.aggregation(aggregationBuilder);
         request.source(builder);
         try {
@@ -714,17 +713,12 @@ public class JGDPStatisticsServiceImpl {
                 long docCount = bucket.getDocCount();
                 dataMap.put(category, docCount);
             }
-            /**
-             * 3	报废
-             * 1	在用
-             * 2	停用
-             * 4	注销
-             */
-            for (int i = 0; i < 4; i++) {
-                Map<String, Object> map = setEquStateNameValue(i);
-                map.put("value", dataMap.getOrDefault(String.valueOf(i), 0L));
-                resultList.add(map);
-            }
+            resultList = Arrays.stream(EquimentEnum.values()).filter(e->e.getCode() > 0).map(e->{
+                Map<String, Object> map = new HashMap<>();
+                map.put("name", e.getName());
+                map.put("value", dataMap.getOrDefault(e.getCode().toString(), 0L));
+                return map;
+            }).collect(Collectors.toList());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -732,26 +726,13 @@ public class JGDPStatisticsServiceImpl {
         return resultList;
     }
 
-    private Map<String, Object> setEquStateNameValue(int i) {
-        Map<String, Object> map = new LinkedHashMap<>();
-        if (i == 0) {
-            map.put("name", "在用");
-        } else if (i == 1) {
-            map.put("name", "停用");
-        } else if (i == 2) {
-            map.put("name", "报废");
-        } else {
-            map.put("name", "注销");
-        }
-        return map;
-    }
-
-    private void setDefaultEquStateCount(List<Map<String, Object>> resultList) {
-        for (int i = 0; i < 4; i++) {
-            Map<String, Object> map = setEquStateNameValue(i);
+    private List<Map<String, Object>> setDefaultEquStateCount() {
+        return  Arrays.stream(EquimentEnum.values()).filter(e->e.getCode() > 0).map(e->{
+            Map<String, Object> map = new HashMap<>();
+            map.put("name", e.getName());
             map.put("value",  0L);
-            resultList.add(map);
-        }
+            return map;
+        }).collect(Collectors.toList());
     }
 
     public Map<String, Object> equStopStateCount(DPFilterParamDto dpFilterParamDto) {