1.安全指数修改为随机数88到92之间整数

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

@@ -83,7 +83,7 @@ public class CylinderDPStatisticsServiceImpl {
                         // 按照管辖机构区域信息模糊查询
                         .must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(orgCode) + "*"))
         );
-        TermsAggregationBuilder aggregation = AggregationBuilders.terms("USE_UNIT_CREDIT_CODE").field("USE_UNIT_CREDIT_CODE.keyword").size(10);
+        TermsAggregationBuilder aggregation = AggregationBuilders.terms("USE_UNIT_CREDIT_CODE").field("USE_UNIT_CREDIT_CODE.keyword").size(300);
         searchSourceBuilder.aggregation(aggregation);
         searchRequest.source(searchSourceBuilder);
         // 执行搜索并获取响应
@@ -127,8 +127,8 @@ public class CylinderDPStatisticsServiceImpl {
         List<RegionModel> regionList = stCommonService.setRegionIfRootParent(regionCode);
         List<Map<String, Object>> legendData = new ArrayList<>();
         List<String> xdata = this.buildXData(regionList);
-        List<Long> qiping = getYDataForQP(regionCode, regionList);
-        List<Long> qizhan = getYDataForQZ(regionCode, regionList);
+        List<Long> qiping = getYDataForQP(regionList);
+        List<Long> qizhan = getYDataForQZ(regionList);
         Map<String, Object> qiLegend = getQZLegend("气瓶数量", "qiping");
         Map<String, Object> zhanLegend = getQZLegend("气站数量", "qizhan");
         legendData.add(qiLegend);
@@ -148,11 +148,11 @@ public class CylinderDPStatisticsServiceImpl {
         return qiLegend;
     }
 
-    private List<Long> getYDataForQZ(String regionCode, List<RegionModel> regionList) {
+    private List<Long> getYDataForQZ(List<RegionModel> regionList) {
         List<CountDto> enterpriseCountList = regionList.parallelStream().map(e -> {
             CountDto dto = new CountDto();
             dto.setKeyStr(e.getRegionCode() + "");
-            String orgCode = stCommonService.getAndSetOrgCode(regionCode);
+            String orgCode = stCommonService.getAndSetOrgCode(e.getRegionCode() + "");
             if (StringUtils.isNotEmpty(orgCode)) {
                 Long enterpriseNum = cylinderStatisticsMapper.countEnterpriseNumForCylinder(orgCode);
                 dto.setLongValue(enterpriseNum);
@@ -164,10 +164,10 @@ public class CylinderDPStatisticsServiceImpl {
         return regionList.stream().map(r -> enterpriseCountList.stream().filter(e -> e.getKeyStr().equals(r.getRegionCode() + "")).mapToLong(CountDto::getLongValue).sum()).collect(Collectors.toList());
     }
 
-    private List<Long> getYDataForQP(String regionCode, List<RegionModel> regionList) {
+    private List<Long> getYDataForQP(List<RegionModel> regionList) {
         List<Long> qiping = new ArrayList<>();
         regionList.forEach(r -> {
-            String orgCode = stCommonService.getAndSetOrgCode(regionCode);
+            String orgCode = stCommonService.getAndSetOrgCode(r.getRegionCode() + "");
             if (StringUtils.isNotEmpty(orgCode)) {
                 Long num = this.countForCylinderNum(orgCode);
                 qiping.add(num);

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

@@ -50,6 +50,7 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -477,7 +478,8 @@ public class JGDPStatisticsServiceImpl {
 
     public Map<String, Object> querySafetyIndex(DPFilterParamDto dpFilterParamDto) {
         Map<String, Object> result = new HashMap<>();
-        result.put("riskScore", 12);
+        int riskScore = ThreadLocalRandom.current().nextInt(88, 93);
+        result.put("riskScore", riskScore);
         return result;
     }