From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java |   63 ++++++++++++++++---------------
 1 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index 33469c9..fbf7d2a 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -6,10 +6,14 @@
 import com.ycl.platform.mapper.CheckIndexCarMapper;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
+import com.ycl.system.entity.SysDictData;
 import com.ycl.system.mapper.SysConfigMapper;
+import com.ycl.system.mapper.SysDeptMapper;
+import com.ycl.system.mapper.SysDictDataMapper;
+import com.ycl.system.mapper.SysDictTypeMapper;
 import com.ycl.utils.DateUtils;
-import constant.ApiConstants;
-import constant.CheckSnapCountConstants;
+import constant.*;
+import enumeration.general.AreaDeptEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -44,7 +48,8 @@
     private ICheckIndexCarService checkIndexCarService;
     @Autowired
     private RedisTemplate redisTemplate;
-
+    @Autowired
+    private SysDictDataMapper dictDataMapper;
     //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
     private static class AreaStats {
         int totalSites = 0;
@@ -73,7 +78,7 @@
         // 鍒ゆ柇浠婂ぉ鏄惁鏄湰鏈堢殑绗竴澶�
         if (today.equals(firstDayOfMonth)) {
             // 濡傛灉鏄紝鍒欐竻闄edis涓褰曚腑鏂鏁扮殑鏁版嵁
-            redisTemplate.delete(ApiConstants.Check_Car_ViewConnect);
+            redisTemplate.delete(RedisConstant.Check_Car_ViewConnect);
         }
         for (SnapshotDataMonitorResult result : list) {
             TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
@@ -89,16 +94,17 @@
             }
         }
 
-        //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
-        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
-        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
-
+//        //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
+//        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
+//        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
+        //浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
+        List<SysDictData> carSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_CAR_SNAP);
         // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
         List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
         List<CheckIndexCar> checkIndexCars = new ArrayList<>();
         areaStatsMap.forEach((key, stats) -> {
             if (stats.totalSites > 0) {
-                CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, cityCountAvg, countyCountAvg, checkIndexCarList);
+                CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, checkIndexCarList,carSnap);
                 if (checkIndexCar != null) {
                     checkIndexCars.add(checkIndexCar);
                 }
@@ -124,27 +130,16 @@
     }
 
     /**
-     * 鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊�
-     */
-    private BigDecimal getAverageCount(String configKey) {
-        String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue();
-        return new BigDecimal(count)
-                .multiply(new BigDecimal(CheckSnapCountConstants.Multiply))
-                .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 10, RoundingMode.HALF_UP)
-                .divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP);
-    }
-
-    /**
      * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
      */
-    private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexCar> checkIndexCarList) {
+    private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList,List<SysDictData> carSnap) {
         CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
         if (checkIndexCar == null) {
             return null;
         }
 
         //璋冪敤鐐逛綅鍦ㄧ嚎璁$畻鏂规硶
-        if (stats.totalSites >= ApiConstants.Check_Car_SiteOnline) {
+        if (stats.totalSites >= CheckThreadConstants.Check_Car_SiteOnline) {
             Map<String, Object> siteOnlineParam = new HashMap<>();
             siteOnlineParam.put("totalSites", stats.totalSites);
             siteOnlineParam.put("onlineSites", stats.onlineSites);
@@ -155,25 +150,31 @@
         }
         //瑙嗗浘搴撳鎺ョǔ瀹氭��
         //Redis璁板綍璇ュ尯鍘垮綋鏈堟棤鏁版嵁涓婁紶娆℃暟
-        Integer noDateCount = (Integer) redisTemplate.opsForHash().get(ApiConstants.Check_Car_ViewConnect, key);
+        Integer noDateCount = (Integer) redisTemplate.opsForHash().get(RedisConstant.Check_Car_ViewConnect, key);
         // 濡傛灉鍊间负null锛屽垯鍒濆鍖栦负0
         if (noDateCount == null) {
             noDateCount = 0;
         }
         Double deductScore = 0.1 * noDateCount;
+
         if (stats.totalDataSum != 0) {
-            BigDecimal avgCount = key.startsWith(ApiConstants.Province) ? cityCountAvg : countyCountAvg;
-            Map<String, Object> viewConnectParam = new HashMap<>();
-            viewConnectParam.put("totalDataSum", stats.totalDataSum);
-            viewConnectParam.put("avgCount", avgCount);
-            BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
-            viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE);
-            checkIndexCar.setViewConnectStability(viewConnectStability);
+            Integer deptId = key.startsWith(ApiConstants.Province) ? Integer.parseInt(key.split("_")[1]) : Integer.parseInt(key);
+            String dictKey = key.startsWith(ApiConstants.Province) ? ApiConstants.Province+AreaDeptEnum.fromDept(deptId).getCode() : ApiConstants.County+AreaDeptEnum.fromDept(deptId).getCode();
+            Optional<SysDictData> first = carSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst();
+            if(first.isPresent()){
+                String value = first.get().getDictValue();
+                Map<String, Object> viewConnectParam = new HashMap<>();
+                viewConnectParam.put("totalDataSum", stats.totalDataSum);
+                viewConnectParam.put("avgCount", new BigDecimal(value).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP));
+                BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
+                viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE);
+                checkIndexCar.setViewConnectStability(viewConnectStability);
+            }
         } else {
             noDateCount++;
         }
         // 灏嗘柊鐨勫�兼斁鍥濰ash涓�
-        redisTemplate.opsForHash().put(ApiConstants.Check_Car_ViewConnect, key, noDateCount);
+        redisTemplate.opsForHash().put(RedisConstant.Check_Car_ViewConnect, key, noDateCount);
         return checkIndexCar;
     }
 }

--
Gitblit v1.8.0