修改大屏应急处置模块中间电梯设备统计

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

@@ -482,12 +482,9 @@ public class YJDPStatisticsServiceImpl {
         long dtEquCategoryCount = countMap.entrySet()
                 .stream()
                 .filter(entry -> !ELEVATOR_EQU_LIST_CODE.equals(entry.getKey()))
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
-                .values()
-                .stream()
-                .mapToLong(e -> e)
+                .mapToLong(Map.Entry::getValue)
                 .sum();
-        result.put("dtCountNotEquCategory", dtCount - dtEquCategoryCount);
+        result.put("dtCountNotEquDefine", dtCount - dtEquCategoryCount);
 
         // 电梯总量(台)
         // result.put("dtCount", equDefineNumMap.values().stream().mapToLong(e -> e).sum());
@@ -574,12 +571,14 @@ public class YJDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         SearchRequest request = new SearchRequest();
         String orgCode = stCommonService.getAndSetOrgCode(regionCode);
-        request.indices("idx_biz_view_jg_all");
+//        request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        //boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));//索引idx_biz_view_jg_all中的查询方式
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         //已赋码
-        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
-        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        //boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
         //状态为已认领
         String[] status = {"草稿","已拒领","待认领"};
         boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));
@@ -607,12 +606,14 @@ public class YJDPStatisticsServiceImpl {
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         SearchRequest request = new SearchRequest();
         String orgCode = stCommonService.getAndSetOrgCode(regionCode);
-        request.indices("idx_biz_view_jg_all");
+//        request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        //boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));//索引idx_biz_view_jg_all中的查询方式
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         //已赋码
-        boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
-        boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
+        //boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
+        //boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE","null"));
         //状态为已认领
         String[] status = {"草稿","已拒领","待认领"};
         boolMust.mustNot(QueryBuilders.termsQuery("STATUS",Arrays.asList(status)));