From 3e9a6da99aae968123ee7bca352fc08becd7f1f2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 17:29:21 +0800
Subject: [PATCH] 工单过程图接口更换

---
 ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
index 5a09508..fac20a8 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -6,6 +6,7 @@
 import com.ycl.platform.domain.entity.TMonitor;
 import com.ycl.platform.domain.result.HK.CrossDetailResult;
 import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
+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;
@@ -13,6 +14,7 @@
 import com.ycl.system.mapper.SysConfigMapper;
 import constant.ApiConstants;
 import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -24,16 +26,18 @@
 import java.util.stream.Collectors;
 
 /**
- * 璁$畻杞﹁締鏁版嵁瀹屾暣鎬�
+ * 璁$畻杞﹁締鏁版嵁瀹屾暣鎬э紙妫�娴嬭溅鐗屽彿銆佽溅鐗岄鑹插暐鐨勫悎涓嶅悎鏍囧噯
+ * 閲囩敤鏁版嵁瀹屾暣鎬х洃娴嬫帴鍙�
  * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
  * 鏇存柊鎴栨柊澧�
  */
 @Component
+@Slf4j
 public class CarDataIntegrityCalculation extends IndexCalculationServe implements CalculationStrategy<DataIntegrityMonitoringResult> {
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -48,27 +52,26 @@
     @Override
     public void calculate(List<DataIntegrityMonitoringResult> list) {
         if (CollectionUtils.isEmpty(list)) {
+            log.info("鏁版嵁涓虹┖");
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        //TODO锛歮onitor鍘绘帀浜哾eptId
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(DataIntegrityMonitoringResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(DataIntegrityMonitoringResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         //鑾峰彇閲嶇偣鐐逛綅闆嗗悎
         List<String> importantIds = getImportant();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
         for (DataIntegrityMonitoringResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
             String deptId = monitor.getDeptId().toString();
             updateAreaStats(areaStatsMap, deptId, result, importantIds);
 
             // 澶勭悊鐪佸巺鏁版嵁
             if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
-                String provinceKey = "Province_" + deptId;
+                String provinceKey = ApiConstants.Province + deptId;
                 updateAreaStats(areaStatsMap, provinceKey, result, importantIds);
             }
         }
@@ -79,7 +82,9 @@
         areaStatsMap.forEach((deptId, stats) -> {
             if (stats.totalSites > 0) {
                 CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
-                checkIndexCars.add(checkIndexCar);
+                if (checkIndexCar != null) {
+                    checkIndexCars.add(checkIndexCar);
+                }
             }
         });
 
@@ -97,8 +102,8 @@
         if (result.getMainNoIntegrityPercent() <= 0.1) {
             stats.integritySites++;
         }
-        //閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬�
-        if (importantIds.contains(key)) {
+        //閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬у畬鏁�
+        if (importantIds.contains(result.getExternalIndexCode())) {
             stats.importantTotalSites++;
             if (result.getNoIntegrityPercent() <= 0.1) {
                 stats.importantIntegritySites++;
@@ -111,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("totalSites", stats.totalSites);

--
Gitblit v1.8.0