大屏bug修改

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/StatisticalAnalysisEnum.java → amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/StatisticalAnalysisEnum.java

-package com.yeejoin.amos.boot.module.statistics.api.enums;
+package com.yeejoin.amos.boot.module.common.api.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -30,6 +30,7 @@ import com.yeejoin.amos.boot.biz.common.utils.*;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.EquipmentCategoryService;
@@ -69,7 +70,6 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.Operator;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -2541,7 +2541,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
         Page<JSONObject> result = new Page<>(pageNumber, size);
         SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices(StatisticalAnalysisEnum.equip.getKey());
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
@@ -2731,8 +2731,16 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         if (!ObjectUtils.isEmpty(map.getString(IS_INTO_MANAGEMENT))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String param = QueryParser.escape(map.getString(IS_INTO_MANAGEMENT));
-            pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
+            if ("true".equals(map.getString(IS_INTO_MANAGEMENT))) {
+                pBuilder.must(QueryBuilders.termQuery(IS_INTO_MANAGEMENT, Boolean.TRUE));
+            } else {
+                BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
+                boolQueryBuilder.should(QueryBuilders.termQuery(IS_INTO_MANAGEMENT, Boolean.FALSE))
+                        .should(QueryBuilders.termQuery(IS_INTO_MANAGEMENT, ""))
+                        .minimumShouldMatch(1)
+                        .mustNot(QueryBuilders.existsQuery(IS_INTO_MANAGEMENT));
+                pBuilder.must(boolQueryBuilder);
+            }
             boolMust.must(pBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString(EQU_CATEGORY))) {
@@ -2919,11 +2927,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(pBuilder);
         }
         // 使用单位 名称模糊查询
-        if (!ObjectUtils.isEmpty(map.getString(USE_UNIT_NAME))) {
-            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String text = map.getString(USE_UNIT_NAME);
-            pBuilder.must(QueryBuilders.matchQuery(USE_UNIT_NAME, text).operator(Operator.AND));
-            boolMust.must(pBuilder);
+        if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_NAME"))) {
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString("USE_UNIT_NAME"));
+            query.must(QueryBuilders.wildcardQuery("USE_UNIT_NAME", "*" + test + "*"));
+            boolMust.must(query);
         }
         // 模糊查询
         if (!ObjectUtils.isEmpty(map.getString(USE_PLACE_CODE))) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/init/DataInitAfterRuning.java

 package com.yeejoin.amos.boot.module.statistcs.biz.init;
 
-import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.AQZSDPStatisticsServiceImpl;
+import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.JGDPStatisticsServiceImpl;
 import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.StCommonServiceImpl;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.boot.ApplicationArguments;
@@ -16,12 +16,14 @@ public class DataInitAfterRuning implements ApplicationRunner {
 
 
     private StCommonServiceImpl stCommonService;
+    private JGDPStatisticsServiceImpl jgdpStatisticsService;
 
     private AmosRequestContext amosRequestContext;
 
-    public DataInitAfterRuning(StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext) {
+    public DataInitAfterRuning(StCommonServiceImpl stCommonService, AmosRequestContext amosRequestContext, JGDPStatisticsServiceImpl jgdpStatisticsService) {
         this.stCommonService = stCommonService;
         this.amosRequestContext = amosRequestContext;
+        this.jgdpStatisticsService = jgdpStatisticsService;
     }
 
     @Override
@@ -31,5 +33,6 @@ public class DataInitAfterRuning implements ApplicationRunner {
         RequestContext.setProduct(amosRequestContext.getProduct());
         RequestContext.setToken(amosRequestContext.getToken());
         stCommonService.init();
+        jgdpStatisticsService.init();
     }
 }

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

@@ -14,12 +14,12 @@ import com.yeejoin.amos.boot.module.common.api.dto.LegendDataDto;
 import com.yeejoin.amos.boot.module.common.api.enums.IssueMainBodyEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.IssueProblemLevelEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.IssueTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.SafetyProblemStatusEnum;
 import com.yeejoin.amos.boot.module.statistics.api.dto.EquipQuestionNumCountDto;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SafetyProblemTracingDto;
 import com.yeejoin.amos.boot.module.statistics.api.dto.SecurityIndexCountItemDto;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
@@ -910,7 +910,7 @@ public class AQZSDPStatisticsServiceImpl {
         result.put("total", hasSupervisoryCodeEquipCount);
         //2.压力管道长度统计
 //        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
-        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode, true);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode, true, false);
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
@@ -1024,7 +1024,7 @@ public class AQZSDPStatisticsServiceImpl {
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode,true,true, false);
         // 2. 压力管道长度统计
 //        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
-        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode, true);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode, true, false);
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());

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

@@ -20,6 +20,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RequestContextWrapper;
 import com.yeejoin.amos.boot.module.common.api.dao.EsEquipmentDao;
 import com.yeejoin.amos.boot.module.common.api.dto.TechParamItem;
 import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeNewEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.TZSCommonServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;

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

@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.EnterpriseBizMapper;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;

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

@@ -4,8 +4,9 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
+import com.yeejoin.amos.boot.module.statistics.api.enums.InformationManageTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import lombok.extern.slf4j.Slf4j;
@@ -50,6 +51,7 @@ public class EquipmentStaticsServiceImpl {
 
     private static final String EQUSTATE = "EQU_STATE";
     private static final String SUPERVISORYCODE = "SUPERVISORY_CODE";
+    private static final String INFORMATIONSITUATION = "INFORMATION_SITUATION";
 
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
@@ -284,6 +286,11 @@ public class EquipmentStaticsServiceImpl {
                 } else {
                     dto2.put("IS_SUPERVISORY_CODE", "未赋码");
                 }
+                if (!ValidationUtil.isEmpty(dto2.get(INFORMATIONSITUATION))) {
+                    String string = dto2.get(INFORMATIONSITUATION).toString();
+                    String informationSituation = InformationManageTypeEnum.getName(string);
+                    dto2.put(INFORMATIONSITUATION, informationSituation);
+                }
                 list.add(dto2);
             }
             total = response.getInternalResponse().hits().getTotalHits().value;

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

@@ -37,7 +37,6 @@ import com.yeejoin.amos.boot.module.statistcs.biz.utils.QueryBuilderUtils;
 import com.yeejoin.amos.boot.module.statistcs.factory.EnhancedDynamicQueryBuilder;
 import com.yeejoin.amos.boot.module.statistics.api.dto.*;
 import com.yeejoin.amos.boot.module.statistics.api.enums.RegulatoryUnitLevelEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderBusinessStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.JGStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
@@ -285,6 +284,11 @@ public class JGDPStatisticsServiceImpl {
 
     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
+    public void init() {
+        DPFilterParamDto dpFilterParamDto = new DPFilterParamDto();
+        dpFilterParamDto.setCityCode("610000");
+        this.centerMapCountForGlobalNoSupervisoryCode(dpFilterParamDto);
+    }
 
     private List<LegendDataDto> buildLegendDataList() {
         List<LegendDataDto> legendDataDtos = new ArrayList<>();
@@ -397,7 +401,7 @@ public class JGDPStatisticsServiceImpl {
         //2.压力管道长度统计
         // 修改为查询es
         // stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
-        this.staticsCenterMapCountPipLine(result, orgCode, true);
+        this.staticsCenterMapCountPipLine(result, orgCode, true, false);
         //3.单位数量统计
         this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
         //4.人员数量统计
@@ -416,7 +420,7 @@ public class JGDPStatisticsServiceImpl {
         //1.8大类设备数量统计,压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
         stCommonService.staticsCenterMapCountDataForEquip(result, cylinderNum, orgCode, false, true, false);
         //2.压力管道长度统计
-        this.staticsCenterMapCountPipLine(result, orgCode, false);
+        this.staticsCenterMapCountPipLine(result, orgCode, false, false);
 //        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, false, false);
         return result;
     }
@@ -434,7 +438,7 @@ public class JGDPStatisticsServiceImpl {
         // 2. 压力管道长度统计
         // 修改为查询es
         //stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
-        this.staticsCenterMapCountPipLine(result, orgCode, true);
+        this.staticsCenterMapCountPipLine(result, orgCode, true, false);
         // 3. 人员数量统计
         this.staticsCenterMapCountDataForPerson(result, dpFilterParamDto, orgCode);
         return result;
@@ -492,7 +496,7 @@ public class JGDPStatisticsServiceImpl {
     }
 
 
-    public void staticsCenterMapCountPipLine(Map<String, Object> result, String orgCode, Boolean isMatchSupervisoryCode) {
+    public void staticsCenterMapCountPipLine(Map<String, Object> result, String orgCode, Boolean isMatchSupervisoryCode,Boolean isOrgBranchCodeExactMatch) {
         SearchRequest request = new SearchRequest();
         SearchSourceBuilder builder = new SearchSourceBuilder();
         request.indices(StatisticalAnalysisEnum.equip.getKey());
@@ -501,6 +505,14 @@ public class JGDPStatisticsServiceImpl {
         pipeLengthQuery.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         pipeLengthQuery.must(QueryBuilders.existsQuery("pipeLength"));
         pipeLengthQuery.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
+        if (isOrgBranchCodeExactMatch) {
+            // 按照管辖机构区域信息精确查询
+            pipeLengthQuery.must(QueryBuilders.termQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode)));
+        } else {
+            // 按照管辖机构区域信息模糊查询
+            pipeLengthQuery.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
+        }
+        
         if (isMatchSupervisoryCode) {
             pipeLengthQuery.must(existsQuery("SUPERVISORY_CODE"));
             pipeLengthQuery.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", ""));
@@ -1100,14 +1112,14 @@ public class JGDPStatisticsServiceImpl {
     public List<Map<String, Object>> equStateCount(DPFilterParamDto dpFilterParamDto) {
         List<Map<String, Object>> resultList;
         SearchRequest request = new SearchRequest();
-        request.indices("idx_biz_view_jg_all");
+        request.indices(StatisticalAnalysisEnum.equip.getKey());
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
             return this.setDefaultEquStateCount();
         }
         // 按照管辖机构区域信息模糊查询
-        boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"));
+        boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", QueryParser.escape(orgCode)));
         //已赋码
         boolMust.must(QueryBuilders.existsQuery("SUPERVISORY_CODE"));
         boolMust.mustNot(QueryBuilders.termQuery("SUPERVISORY_CODE", "null"));
@@ -1844,7 +1856,7 @@ public class JGDPStatisticsServiceImpl {
         result.put("total", hasSupervisoryCodeEquipCount);
         // 2.压力管道长度统计
 //        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode, true, false);
-        this.staticsCenterMapCountPipLine(result, orgCode, true);
+        this.staticsCenterMapCountPipLine(result, orgCode, true, false);
         // 3.已纳管设备总数
         this.staticsCenterMapCountDataForEquipIsManage(result);
         // 4.登记证总数
@@ -3889,7 +3901,8 @@ public class JGDPStatisticsServiceImpl {
                 countItemDto.setGl(String.valueOf(data.get(DPMapStatisticsItemEnum.BOILERS.getCode())));
                 countItemDto.setYlrq(String.valueOf(data.get(DPMapStatisticsItemEnum.PRESSURE_VESSELS.getCode())));
                 // 2. 压力管道长度统计
-                countItemDto.setYlgd(stCommonService.staticsCenterMapCountDataForPipeline(data, orgCode, true, isOrgBranchCodeExactMatch));
+                this.staticsCenterMapCountPipLine(data, orgCode, true,isOrgBranchCodeExactMatch);
+//                countItemDto.setYlgd(stCommonService.staticsCenterMapCountDataForPipeline(data, orgCode, true, isOrgBranchCodeExactMatch));
                 // 如果是地市数据则计算上线率，上线率=系统已有数据/最新期底数x100%
                 if ("610000".equals(r.getParentRegionCode())) {
                     Map<String, Object> baselineMap = baselineData.stream().filter(d -> d.get("city_code").equals(regionCode)).findFirst().orElse(null);

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

@@ -548,7 +548,7 @@ public class JYJCDPStatisticsServiceImpl {
         result.put("total", hasSupervisoryCodeEquipCount);
         // 3.压力管道统计
 //        stCommonService.staticsCenterMapCountDataForPipeline(result, orgCode,true, false);
-        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode, true);
+        jgDPStatisticsService.staticsCenterMapCountPipLine(result, orgCode, true, false);
         // 4.报检数量统计
         this.staticsCenterMapCountDataReporting(result, dpFilterParamDto);
         // 5.检验检测临期设备数数量统计

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

@@ -10,8 +10,8 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
@@ -281,8 +281,9 @@ public class StCommonServiceImpl {
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         // 默认size为10 ，数据库有脏数据，所以需要多查询一些
-        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE").size(20);
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE").size(15);
         builder.aggregation(aggregationBuilder);
+        builder.size(0);
         request.source(builder);
         try {
             SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);

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

@@ -17,12 +17,12 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
 import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
+import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.QueryBuilderUtils;
 import com.yeejoin.amos.boot.module.statistics.api.enums.InformationManageTypeEnum;
-import com.yeejoin.amos.boot.module.statistics.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.statistics.api.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.TzsCustomFilterMapper;
@@ -890,8 +890,15 @@ public class ZLDPStatisticsServiceImpl {
             boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE", orgCode));
         }
 
+        if (!ObjectUtils.isEmpty(map.getString("CODE96333"))) {
+            boolMust.must(QueryBuilders.wildcardQuery("CODE96333", "*" + map.getString("CODE96333") + "*"));
+        }
+
+        if (!ObjectUtils.isEmpty(map.getString("SUPERVISORY_CODE"))) {
+            boolMust.must(QueryBuilders.wildcardQuery("SUPERVISORY_CODE", "*" + map.getString("SUPERVISORY_CODE") + "*"));
+        }
+
         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.prefixQuery("ORG_BRANCH_CODE", map.getString("ORG_BRANCH_CODE")));
         }