fix(Statistics): 修改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/AQZSDPStatisticsServiceImpl.java

@@ -101,7 +101,7 @@ public class AQZSDPStatisticsServiceImpl {
 
     private StCommonServiceImpl stCommonService;
 
-    private TZSCommonServiceImpl tstCommonService;
+    private TZSCommonServiceImpl tzsCommonService;
 
     private JGDPStatisticsServiceImpl jgDPStatisticsService;
 
@@ -119,7 +119,7 @@ public class AQZSDPStatisticsServiceImpl {
                                        StCommonServiceImpl stCommonService,
                                        DataDictionaryMapper dataDictionaryMapper,
                                        JGDPStatisticsServiceImpl jgDPStatisticsService,
-                                       TZSCommonServiceImpl tstCommonService) {
+                                       TZSCommonServiceImpl tzsCommonService) {
         this.restHighLevelClient = restHighLevelClient;
         this.statisticsMapper = statisticsMapper;
         this.enterpriseInfoMapper = enterpriseInfoMapper;
@@ -128,7 +128,7 @@ public class AQZSDPStatisticsServiceImpl {
         this.stCommonService = stCommonService;
         this.dataDictionaryMapper = dataDictionaryMapper;
         this.jgDPStatisticsService = jgDPStatisticsService;
-        this.tstCommonService = tstCommonService;
+        this.tzsCommonService = tzsCommonService;
     }
 
 
@@ -512,14 +512,24 @@ public class AQZSDPStatisticsServiceImpl {
         List<String> enumNameList = IssueTypeEnum.getEnumNameListByMainBody("1");
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode != null) {
+//            BoolQueryBuilder overdueQuery = new BoolQueryBuilder();
+//            statisticalAnalysisService.personOrgCodeBoolMust(orgCode, overdueQuery, StatisticalAnalysisEnum.person.getCode());
+//            tstCommonService.buildExpiryDateQueryBuilder(overdueQuery, "overdue", "licenses", "licenses.expiryDate");
+//            Long overNumber = statisticalAnalysisService.getStatisticCount(overdueQuery, StatisticalAnalysisEnum.person.getKey());
+//            BoolQueryBuilder nearQuery = new BoolQueryBuilder();
+//            statisticalAnalysisService.personOrgCodeBoolMust(orgCode, nearQuery, StatisticalAnalysisEnum.person.getCode());
+//            tstCommonService.buildExpiryDateQueryBuilder(nearQuery, "near", "licenses", "licenses.expiryDate");
+//            Long nearNumber = statisticalAnalysisService.getStatisticCount(nearQuery, StatisticalAnalysisEnum.person.getKey());
+//            dataMap.put(IssueTypeEnum.LICENSE_OVERDUE_PERSON.getName(), overNumber);
+//            dataMap.put(IssueTypeEnum.LICENSE_EXPIRY_PERSON.getName(), nearNumber);
+
             BoolQueryBuilder overdueQuery = new BoolQueryBuilder();
-            overdueQuery.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
-            tstCommonService.buildExpiryDateQueryBuilder(overdueQuery, "overdue", "licenses", "licenses.expiryDate");
-            Long overNumber = stCommonService.getNestedQueryStatisticCount(overdueQuery, StatisticalAnalysisEnum.person.getKey(), "licenses", "expiryDate");
+//            overdueQuery.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+//            tstCommonService.buildExpiryDateQueryBuilder(overdueQuery, "overdue", "licenses", "licenses.expiryDate");
+            Long overNumber = stCommonService.getNestedQueryStatisticCount(overdueQuery, StatisticalAnalysisEnum.person.getKey(), "licenses", "expiryDate", tzsCommonService.overdue);
             BoolQueryBuilder nearQuery = new BoolQueryBuilder();
-            nearQuery.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
-            tstCommonService.buildExpiryDateQueryBuilder(nearQuery, "near", "licenses", "licenses.expiryDate");
-            Long nearNumber = stCommonService.getNestedQueryStatisticCount(nearQuery, StatisticalAnalysisEnum.person.getKey(), "licenses", "expiryDate");
+            statisticalAnalysisService.personOrgCodeBoolMust(orgCode, nearQuery, StatisticalAnalysisEnum.person.getCode());
+            Long nearNumber = stCommonService.getNestedQueryStatisticCount(nearQuery, StatisticalAnalysisEnum.person.getKey(), "licenses", "expiryDate", tzsCommonService.near);
             dataMap.put(IssueTypeEnum.LICENSE_OVERDUE_PERSON.getName(), overNumber);
             dataMap.put(IssueTypeEnum.LICENSE_EXPIRY_PERSON.getName(), nearNumber);
         }
@@ -933,8 +943,8 @@ public class AQZSDPStatisticsServiceImpl {
         //3.单位数量统计
         // 单位统计修改为查询es
 //        this.staticsCenterMapCountDataForCompany(result, orgCode, dpFilterParamDto.getCityCode());
-          this.staticsCenterMapCompanyCountToEs(result, orgCode);
-         //4.人员数量统计
+        this.staticsCenterMapCompanyCountToEs(result, orgCode);
+        //4.人员数量统计
         // 人员统计改为查询es，修改之前查询的是作业人员的总数，修改为所有人员的总数
 //        this.staticsCenterMapCountDataForPerson(result, dpFilterParamDto, orgCode);
         this.staticsCenterMapPersonCountToEs(result, orgCode);
@@ -1211,4 +1221,4 @@ public class AQZSDPStatisticsServiceImpl {
             return item;
         }).collect(Collectors.toList());
     }
-}
+}
\ No newline at end of file

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

@@ -403,7 +403,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return result;
     }
 
-    private void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust, String type) {
+    public void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust, String type) {
         String superviseOrgCodeKey = type.equals(StatisticalAnalysisEnum.person.getCode()) ? "superviseOrgCode" : "superviseOrgCode.keyword";
         String officeRegion = commonMapper.getCompanyCodeByOrgCode(orgCode);
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
@@ -4670,7 +4670,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         // 使用 match_all 查询，拉取所有文档（通过 scroll 分批）
         log.info("ES 全量查询开始, index={}, 时间={}", index, System.currentTimeMillis());
         //BoolQueryBuilder boolQuery = QueryBuilders.boolQuery()
-          //      .must(QueryBuilders.termsQuery("STATUS", Collections.singletonList("已认领")));
+        //      .must(QueryBuilders.termsQuery("STATUS", Collections.singletonList("已认领")));
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
         boolQuery.must(QueryBuilders.matchAllQuery());
         // 线程安全的结果容器
@@ -4696,4 +4696,4 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return esIds.stream().distinct().collect(Collectors.toList());
     }
 
-}
+}
\ No newline at end of file

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

@@ -11,6 +11,7 @@ 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.common.biz.service.impl.TZSCommonServiceImpl;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.CommonBaseMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
@@ -23,6 +24,7 @@ import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
@@ -30,6 +32,8 @@ import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.NestedQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.Filter;
@@ -44,18 +48,24 @@ import org.springframework.util.ObjectUtils;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static org.elasticsearch.index.query.QueryBuilders.existsQuery;
+
 /**
  * @author Administrator
  */
 @Service
 public class StCommonServiceImpl {
 
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
     /**
      * 气瓶设备类别
      */
@@ -71,6 +81,8 @@ public class StCommonServiceImpl {
 
     private RestHighLevelClient restHighLevelClient;
 
+    private TZSCommonServiceImpl tzsCommonService;
+
     private EquipTechParamPipelineMapper techParamsPipelineMapper;
 
     private EquipmentCategoryMapper equipmentCategoryMapper;
@@ -85,12 +97,18 @@ public class StCommonServiceImpl {
 
     private static List<EquipmentCategoryDto> equipmentCategoryDtos;
 
-    public StCommonServiceImpl(CommonBaseMapper commonMapper, RestHighLevelClient restHighLevelClient, EquipTechParamPipelineMapper techParamsPipelineMapper, EquipmentCategoryMapper equipmentCategoryMapper, ZLStatisticsMapper zlStatisticsMapper) {
+    public StCommonServiceImpl(CommonBaseMapper commonMapper,
+                               RestHighLevelClient restHighLevelClient,
+                               EquipTechParamPipelineMapper techParamsPipelineMapper,
+                               EquipmentCategoryMapper equipmentCategoryMapper,
+                               ZLStatisticsMapper zlStatisticsMapper,
+                               TZSCommonServiceImpl tzsCommonService) {
         this.commonMapper = commonMapper;
         this.restHighLevelClient = restHighLevelClient;
         this.techParamsPipelineMapper = techParamsPipelineMapper;
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.zlStatisticsMapper = zlStatisticsMapper;
+        this.tzsCommonService = tzsCommonService;
     }
 
     public static Map<String, String> getRegionCodeOrgCodeMap() {
@@ -262,7 +280,7 @@ 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(StatisticalAnalysisEnum.equip.getKey());
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
         if (isOrgBranchCodeExactMatch) {
@@ -338,16 +356,27 @@ public class StCommonServiceImpl {
     }
 
 
-    public Long getNestedQueryStatisticCount(BoolQueryBuilder builder, String index, String nestedFiled, String filterFiled) {
+    public Long getNestedQueryStatisticCount(BoolQueryBuilder builder, String index, String nestedFiled, String filterFiled, String type) {
         SearchRequest searchRequest = new SearchRequest(index);
         SearchSourceBuilder sourceBuilder = new SearchSourceBuilder();
-        // 构建嵌套聚合
+        BoolQueryBuilder notNeedLicensesQueryBuilder = tzsCommonService.getNotLicencesBuilderWithPerson();
+        NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
+                nestedFiled,
+                existsQuery(nestedFiled + "." + "certNo"),
+                ScoreMode.None
+        );
+        builder.must(notNeedLicensesQueryBuilder);
+        builder.must(nestedQuery);
+
+        // 根据类型动态获取日期范围查询
+        QueryBuilder dateRangeQuery = getRangeDateByType(nestedFiled, filterFiled, type);
         NestedAggregationBuilder nestedAgg = AggregationBuilders.nested(nestedFiled, nestedFiled)
                 .subAggregation(
-                        AggregationBuilders.filter(filterFiled + "_count", builder)
+                        AggregationBuilders.filter(filterFiled + "_count", dateRangeQuery)
                 );
         sourceBuilder.aggregation(nestedAgg);
         sourceBuilder.size(0); // 只要聚合结果，不要文档
+        sourceBuilder.query(builder);
         searchRequest.source(sourceBuilder);
         long count = 0;
         try {
@@ -362,6 +391,19 @@ public class StCommonServiceImpl {
         return count;
     }
 
+    private QueryBuilder getRangeDateByType(String nestedFiled, String filterFiled, String type) {
+        QueryBuilder dateRangeQuery = null;
+        if (tzsCommonService.near.equals(type)) {
+            dateRangeQuery = QueryBuilders.rangeQuery(nestedFiled + "." + filterFiled)
+                    .lt(LocalDate.now().format(formatter));
+        } else if (tzsCommonService.overdue.equals(type)) {
+            dateRangeQuery = QueryBuilders.rangeQuery(nestedFiled + "." + filterFiled)
+                    .gte(LocalDate.now().format(formatter))
+                    .lte(LocalDate.now().plusDays(30).format(formatter));
+        }
+        return dateRangeQuery;
+    }
+
     /**
      * 统计已赋码设备数量
      * @param orgCode