Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.common.biz.utils.TechParamUtil;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.MinioUtils;
+import com.yeejoin.amos.boot.module.statistcs.biz.utils.QueryBuilderUtils;
 import com.yeejoin.amos.boot.module.statistcs.factory.DynamicQueryBuilder;
 import com.yeejoin.amos.boot.module.statistcs.factory.EnhancedDynamicQueryBuilder;
 import com.yeejoin.amos.boot.module.statistics.api.enums.*;
@@ -325,31 +326,42 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                                             boolMust.must(queryBuilder);
                                         }
                                     } else if (k.equals("expiryDate")) {
-                                        boolMust.must(existsQuery(nestedField));
+                                        EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
                                         if (item.equals("overdue")) {
                                             // 超期：小于当前日期
                                             NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
                                                     path,
-                                                    QueryBuilders.boolQuery().filter(QueryBuilders.rangeQuery(nestedField).lt(LocalDate.now().format(formatter))),
+                                                    QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).lt(LocalDate.now().format(formatter))),
                                                     ScoreMode.None
                                             );
-                                            boolMust.must(nestedQuery);
+                                            enhancedDynamicQueryBuilder.add(nestedQuery, or);
+                                            boolMust.must(enhancedDynamicQueryBuilder.build());
                                         } else if (item.equals("near")) {
                                             // 临期：小于等于当前日期加上30天
                                             NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
                                                     path,
-                                                    QueryBuilders.boolQuery().filter(QueryBuilders.rangeQuery(nestedField).lte(LocalDate.now().plusDays(30).format(formatter)).gte(LocalDate.now().format(formatter))),
+                                                    QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).lte(LocalDate.now().plusDays(30).format(formatter)).gte(LocalDate.now().format(formatter))),
                                                     ScoreMode.None
                                             );
-                                            boolMust.must(nestedQuery);
+                                            enhancedDynamicQueryBuilder.add(nestedQuery, or);
+                                            boolMust.must(enhancedDynamicQueryBuilder.build());
                                         } else if (item.equals("normal")) {
                                             // 正常：大于当前日期加上30天
                                             NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
                                                     path,
-                                                    QueryBuilders.boolQuery().filter(QueryBuilders.rangeQuery(nestedField).gt(LocalDate.now().plusDays(30).format(formatter))),
+                                                    QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).gt(LocalDate.now().plusDays(30).format(formatter))),
                                                     ScoreMode.None
                                             );
-                                            boolMust.must(nestedQuery);
+                                            enhancedDynamicQueryBuilder.add(nestedQuery, or);
+                                            boolMust.must(enhancedDynamicQueryBuilder.build());
+                                        } else if (item.equals("none")) {
+                                            NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
+                                                    path,
+                                                    QueryBuilders.boolQuery().must(QueryBuilders.existsQuery(nestedField)),
+                                                    ScoreMode.None
+                                            );
+                                            enhancedDynamicQueryBuilder.add(nestedQuery, or);
+                                            boolMust.must(enhancedDynamicQueryBuilder.build());
                                         }
                                     } else if (k.equals("certType") || k.equals("permissionLevel")) {
                                         NestedQueryBuilder nestedQuery = QueryBuilders.nestedQuery(
@@ -448,7 +460,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                     }
                     dto.put("equipType", equipTypes.substring(0, equipTypes.length() - 1));
                 }
-                String licensesStauts = "";
+                StringBuilder licensesStatus = new StringBuilder();
                 if (dto.containsKey("licenses")) {
                     // 以下人员类型有资质要求
                     // 人员类型(newPost)：检验人员：66151、检测人员：66152、作业人员：6552、检查人员：6763
@@ -461,8 +473,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             List<String> permissionStatusList = new ArrayList<>();
                             for (Object object : licenses) {
                                 JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(object));
-                                if (!json.containsKey("certNo")) {
-                                    licensesStauts = "无资质";
+                                if (!json.containsKey("expiryDate")) {
+                                    licensesStatus.append("/无有效期");
                                     continue;
                                 }
                                 String expiryDate = json.getString("expiryDate");
@@ -480,21 +492,30 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                             long cq = permissionStatusList.stream().filter(e -> e.equals("超期")).count();
                             long lq = permissionStatusList.stream().filter(e -> e.equals("临期")).count();
                             long zc = permissionStatusList.stream().filter(e -> e.equals("正常")).count();
+                            long no = permissionStatusList.stream().filter(e -> e.equals("无有效期")).count();
                             if (cq > 0) {
-                                licensesStauts = "超期";
-                            } else if (lq > 0) {
-                                licensesStauts = "临期";
-                            } else if (zc > 0) {
-                                licensesStauts = "正常";
+                                licensesStatus.append("/资质超期");
+                            }
+                            if (lq > 0) {
+                                licensesStatus.append("/资质临期");
+                            }
+                            if (zc > 0) {
+                                licensesStatus.append("/资质正常");
+                            }
+                            if (no > 0) {
+                                licensesStatus.append("/无有效期");
                             }
                         } else {
-                            licensesStauts = "无资质";
+                            licensesStatus.append("无资质");
                         }
                     } else {
-                        licensesStauts = "无资质要求";
+                        licensesStatus.append("无资质要求");
                     }
                 }
-                dto.put("licensesStauts", licensesStauts);
+                String licensesStatusStr = licensesStatus.toString();
+                licensesStatusStr = licensesStatusStr.startsWith("/") ? licensesStatusStr.substring(1) : licensesStatusStr;
+                licensesStatusStr = licensesStatusStr.endsWith("/") ? licensesStatusStr.substring(0, licensesStatusStr.length() - 1) : licensesStatusStr;
+                dto.put("licensesStatus", licensesStatusStr);
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
@@ -512,6 +533,10 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         statics.add(sum);
         result.put("statics", statics);
 
+        // 获取许可状态统计
+        List<Map<String, Object>> staticMap = new ArrayList<>();
+        getCompanyOrPersonPermitStatusStatic(boolMust, staticMap, StatisticalAnalysisEnum.person.getKey());
+        result.put("keyIndicator", staticMap);
         return result;
     }
 
@@ -652,7 +677,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             for (SearchHit hit : response.getHits().getHits()) {
                 JSONObject jsonObject = (JSONObject) JSONObject.toJSON(hit);
                 JSONObject dto = jsonObject.getJSONObject("sourceAsMap");
-                String permissionStatus = null;
+                StringBuilder permissionStatus = new StringBuilder();
                 if (dto.containsKey("licenses")) {
                     JSONArray licenses = dto.getJSONArray("licenses");
                     if (!ObjectUtils.isEmpty(licenses)) {
@@ -678,13 +703,16 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         long zc = permissionStatusList.stream().filter(e -> e.equals("正常")).count();
                         long no = permissionStatusList.stream().filter(e -> e.equals("无有效期")).count();
                         if (cq > 0) {
-                            permissionStatus = "许可超期";
-                        } else if (lq > 0) {
-                            permissionStatus = "许可临期";
-                        } else if (zc > 0) {
-                            permissionStatus = "许可正常";
-                        } else if (no > 0) {
-                            permissionStatus = "无有效期";
+                            permissionStatus.append("/许可超期");
+                        }
+                        if (lq > 0) {
+                            permissionStatus.append("/许可临期");
+                        }
+                        if (zc > 0) {
+                            permissionStatus.append("/许可正常");
+                        }
+                        if (no > 0) {
+                            permissionStatus.append("/无有效期");
                         }
                     }
                 } else if (!dto.containsKey("licenses") && (dto.get("unitType").toString().contains("检测单位") ||
@@ -693,9 +721,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
                         dto.get("unitType").toString().contains("充装单位") ||
                         dto.get("unitType").toString().contains("设计单位") ||
                         dto.get("unitType").toString().contains("安装改造维修单位"))) {
-                    permissionStatus = "无有效期";
+                    permissionStatus.append("/无有效期");
                 }
-                dto.put("permissionStatus", permissionStatus);
+                String permissionStatusStr = permissionStatus.toString();
+                permissionStatusStr = permissionStatusStr.startsWith("/") ? permissionStatusStr.substring(1) : permissionStatusStr;
+                permissionStatusStr = permissionStatusStr.endsWith("/") ? permissionStatusStr.substring(0, permissionStatusStr.length() - 1) : permissionStatusStr;
+                dto.put("permissionStatus", permissionStatusStr);
                 list.add(dto);
             }
             totle = Objects.requireNonNull(response.getInternalResponse().hits().getTotalHits()).value;
@@ -714,6 +745,11 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         statics.add(sum);
         result.put("statics", statics);
 
+        // 获取许可状态统计
+        List<Map<String, Object>> staticMap = new ArrayList<>();
+        getCompanyOrPersonPermitStatusStatic(boolMust, staticMap, StatisticalAnalysisEnum.company.getKey());
+        result.put("keyIndicator", staticMap);
+
         return result;
     }
 
@@ -1068,6 +1104,54 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
     }
 
+    private void getCompanyOrPersonPermitStatusStatic(BoolQueryBuilder boolMust, List<Map<String, Object>> statics, String index) {
+        String path = "licenses";
+        String nestedField = path + ".expiryDate";
+
+        BoolQueryBuilder normalBoolQuery = QueryBuilderUtils.copyBoolQuery(boolMust);
+        NestedQueryBuilder normalNestedQuery = QueryBuilders.nestedQuery(
+                path,
+                QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).gt(LocalDate.now().plusDays(30).format(formatter))),
+                ScoreMode.None
+        );
+        normalBoolQuery.must(normalNestedQuery);
+
+        Long normalCount = getStaticCount(normalBoolQuery, index);
+
+        BoolQueryBuilder nearBoolQuery = QueryBuilderUtils.copyBoolQuery(boolMust);
+        NestedQueryBuilder nearNestedQuery = QueryBuilders.nestedQuery(
+                path,
+                QueryBuilders.boolQuery().must(QueryBuilders.rangeQuery(nestedField).lte(LocalDate.now().plusDays(30).format(formatter)).gte(LocalDate.now().format(formatter))),
+                ScoreMode.None
+        );
+        nearBoolQuery.must(nearNestedQuery);
+        Long nearCount = getStaticCount(nearBoolQuery, StatisticalAnalysisEnum.company.getKey());
+
+        Map<String, Object> normalMap = new HashMap<>();
+        normalMap.put("name", index.equals(StatisticalAnalysisEnum.company.getKey()) ? "许可正常" : "资质正常");
+        normalMap.put("value", normalCount);
+        statics.add(normalMap);
+
+        Map<String, Object> nearMap = new HashMap<>();
+        nearMap.put("name", index.equals(StatisticalAnalysisEnum.company.getKey()) ? "许可临期" : "资质临期");
+        nearMap.put("value", nearCount);
+        statics.add(nearMap);
+    }
+
+
+    private Long getStaticCount(BoolQueryBuilder builder, String index) {
+        CountRequest countRequest = new CountRequest();
+        countRequest.indices(index);
+        CountResponse response = null;
+        countRequest.query(builder);
+        try {
+            response = restHighLevelClient.count(countRequest, RequestOptions.DEFAULT);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return ObjectUtils.isEmpty(response) ? 0 : response.getCount();
+    }
+
     private BigDecimal getPipeLength(BoolQueryBuilder boolMust, SearchSourceBuilder builder) {
         SearchRequest request = new SearchRequest();
         request.indices(StatisticalAnalysisEnum.equip.getKey());
@@ -1881,25 +1965,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         }
         result.put("certNo", certNoData);
         //资质状态
-        JSONArray permissionStatus = new JSONArray();
-        for (int i = 0; i < 3; i++) {
-            JSONObject object = new JSONObject();
-            if (0 == i) {
-                object.put("key", "overdue");
-                object.put("value", "overdue");
-                object.put("label", "资质超期");
-            } else if (1 == i) {
-                object.put("key", "near");
-                object.put("value", "near");
-                object.put("label", "资质临期");
-            } else {
-                object.put("key", "normal");
-                object.put("value", "normal");
-                object.put("label", "正常");
-            }
-            permissionStatus.add(object);
-        }
-        result.put("expiryDate", permissionStatus);
+        result.put("expiryDate", queryExpiryDate());
         //证书类型
         List<DictionarieValueModel> certType = Systemctl.dictionarieClient.dictValues("CERT_TYPE").getResult();
         JSONArray certTypeArray = new JSONArray();
@@ -2442,20 +2508,24 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
     public JSONArray queryExpiryDate() {
         //资质状态
         JSONArray permissionStatus = new JSONArray();
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 4; i++) {
             JSONObject object = new JSONObject();
             if (0 == i) {
-                object.put("key", "overdue");
-                object.put("value", "overdue");
-                object.put("label", "资质超期");
+                object.put("key", "normal");
+                object.put("value", "normal");
+                object.put("label", "资质正常");
             } else if (1 == i) {
                 object.put("key", "near");
                 object.put("value", "near");
                 object.put("label", "资质临期");
+            } else if (2 == i) {
+                object.put("key", "overdue");
+                object.put("value", "overdue");
+                object.put("label", "资质超期");
             } else {
-                object.put("key", "normal");
-                object.put("value", "normal");
-                object.put("label", "正常");
+                object.put("key", "none");
+                object.put("value", "none");
+                object.put("label", "无有效期");
             }
             permissionStatus.add(object);
         }

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

+package com.yeejoin.amos.boot.module.statistcs.biz.utils;
+
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+
+public class QueryBuilderUtils {
+
+    public static BoolQueryBuilder copyBoolQuery(BoolQueryBuilder original) {
+        if (original == null) {
+            return QueryBuilders.boolQuery();
+        }
+
+        BoolQueryBuilder copy = QueryBuilders.boolQuery();
+
+        // 复制查询条件
+        original.must().forEach(copy::must);
+        original.filter().forEach(copy::filter);
+        original.should().forEach(copy::should);
+        original.mustNot().forEach(copy::mustNot);
+
+        // 复制minimumShouldMatch设置（新版本方式）
+        if (original.minimumShouldMatch() != null) {
+            copy.minimumShouldMatch(original.minimumShouldMatch());
+        }
+
+        // 复制其他属性
+        copy.boost(original.boost());
+        copy.queryName(original.queryName());
+
+        return copy;
+    }
+}
\ No newline at end of file