切换设备索引库到idx_biz_equipment_info

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

@@ -215,14 +215,15 @@ public class StCommonServiceImpl {
     public long staticsCenterMapCountDataForCylinder(Map<String, Object> result, String orgCode, Boolean supervisoryFlag, Boolean isMatchSupervisoryCode, Boolean isOrgBranchCodeExactMatch) {
         long num = 0;
         CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
+        //request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         if (isOrgBranchCodeExactMatch) {
             // 按照管辖机构区域信息精确查询
-            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode)));
+            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode)));
         } else {
             // 按照管辖机构区域信息模糊查询
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         }
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
@@ -252,14 +253,15 @@ public class StCommonServiceImpl {
 
     public long staticsCenterMapCountDataForEquip(Map<String, Object> result, long cylinderNum, String orgCode, Boolean supervisoryFlag, Boolean isMatchSupervisoryCode, Boolean isOrgBranchCodeExactMatch) {
         SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
+       // request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         if (isOrgBranchCodeExactMatch) {
             // 按照管辖机构区域信息精确查询
-            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode)));
+            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode)));
         } else {
             // 按照管辖机构区域信息模糊查询
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         }
         if(isMatchSupervisoryCode){
             if(supervisoryFlag) {
@@ -319,14 +321,15 @@ public class StCommonServiceImpl {
      */
     public long queryHasSupervisoryCodeEquipCount(String orgCode, Boolean isOrgBranchCodeExactMatch) {
         CountRequest request = new CountRequest();
-        request.indices("idx_biz_view_jg_all");
+        //request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         if (isOrgBranchCodeExactMatch) {
             // 按照管辖机构区域信息精确查询
-            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode)));
+            boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode)));
         } else {
             // 按照管辖机构区域信息模糊查询
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         }
         //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));

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

@@ -851,7 +851,8 @@ public class ZLDPStatisticsServiceImpl {
 
         Page<JSONObject> result = new Page<>(map.getInteger("number"), map.getInteger("size"));
         SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
+//        request.indices("idx_biz_view_jg_all");
+        request.indices("idx_biz_equipment_info");
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
@@ -866,16 +867,18 @@ public class ZLDPStatisticsServiceImpl {
         if (!ObjectUtils.isEmpty(map.getString("USE_PLACE"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("USE_PLACE"));
-            query.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + test + "*"));
+            test = test.replace(",","/");
+            query.must(QueryBuilders.wildcardQuery("USE_PLACE", "*" + test + "*"));
             boolMust.must(query);
         }
         if (!ObjectUtils.isEmpty(map.getString("cityCode"))) {
             String orgCode = stCommonService.getAndSetOrgCode((String) map.get("cityCode"));
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         }
 
         if (!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))) {
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
+//            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", map.getString("ORG_BRANCH_CODE")));
         }
 
         if (!ObjectUtils.isEmpty(map.getString("superviseUnitName"))) {
@@ -888,7 +891,7 @@ public class ZLDPStatisticsServiceImpl {
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_NAME"))) {
             BoolQueryBuilder query = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("USE_UNIT_NAME"));
-            query.must(QueryBuilders.matchPhraseQuery("USE_UNIT_NAME", "*" + test + "*"));
+            query.must(QueryBuilders.wildcardQuery("USE_UNIT_NAME", "*" + test + "*"));
             boolMust.must(query);
         }
         if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_CREDIT_CODE"))) {