From 74fb0ca8f830e145513cc8e18257c5bac4c5ed62 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期六, 24 八月 2024 12:09:32 +0800
Subject: [PATCH] refactor：合同考核结果详情调整

---
 ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
index 4beb222..7f91098 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -5,13 +5,16 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
 import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.mapper.SysConfigMapper;
 import constant.ApiConstants;
 import constant.CheckConstants;
 import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -26,16 +29,18 @@
 
 /**
  * 璁＄畻杞﹁締澶囨姄鎷嶆暟鎹笂浼犲強鏃舵��
+ * 鎶撴媿鏁版嵁鏃跺欢鐩戞祴鎺ュ彛
  * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
  * 寰幆map璁＄畻鏁版嵁涓婁紶鍙婃椂鎬�
  * 鏇存柊鎴栨柊澧�
  */
 @Component
+@Slf4j
 public class CarSnapshotDelayCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDelayMonitorResult> {
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -53,19 +58,19 @@
     @Override
     public void calculate(List<SnapshotDelayMonitorResult> list) {
         if (CollectionUtils.isEmpty(list)) {
+            log.info("鏁版嵁涓虹┖");
             return;
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(SnapshotDelayMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDelayMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (SnapshotDelayMonitorResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
@@ -73,7 +78,7 @@
 
             // 澶勭悊鐪佸巺鏁版嵁
             if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
-                String provinceKey = "Province_" + deptId;
+                String provinceKey = ApiConstants.Province + deptId;
                 updateAreaStats(areaStatsMap, provinceKey, result);
             }
         }
@@ -84,7 +89,9 @@
         areaStatsMap.forEach((deptId, stats) -> {
             if (stats.totalCount > 0) {
                 CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
-                checkIndexCars.add(checkIndexCar);
+                if (checkIndexCar != null) {
+                    checkIndexCars.add(checkIndexCar);
+                }
             }
         });
 
@@ -92,7 +99,7 @@
     }
 
     /**
-     * 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
+     * 绱鎬绘暟鎹噺銆佸欢杩熸暟鎹噺
      */
     private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDelayMonitorResult result) {
         //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
@@ -109,6 +116,9 @@
      */
     private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
         CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+        if (checkIndexCar == null) {
+            return null;
+        }
         //璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉�
         Map<String, Object> param = new HashMap<>();
         param.put("totalCount", stats.totalCount);
@@ -116,7 +126,7 @@
         param.put("delayCount2", stats.delayCount2);
         param.put("delayCount3", stats.delayCount3);
         BigDecimal index = snapshopDelay(param);
-        checkIndexCar.setSiteOnline(index);
+        checkIndexCar.setVehicleUploadTimeliness(index);
         return checkIndexCar;
     }
 }

--
Gitblit v1.8.0