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/FaceInFoAccuracyCalculation.java |   54 ++++++++++++++++++++++--------------------------------
 1 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
index 3eef548..fa01638 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
@@ -1,9 +1,12 @@
 package com.ycl.calculate;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ycl.platform.domain.entity.CheckIndexCar;
 import com.ycl.platform.domain.entity.CheckIndexFace;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult;
 import com.ycl.platform.domain.result.HK.MonitoringDetailResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.mapper.CheckIndexFaceMapper;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexFaceService;
@@ -11,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;
@@ -23,19 +27,17 @@
 
 /**
  * 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�  璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘
+ * 閲囬泦璁惧灞炴�х洃娴嬫帴鍙�
  * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
  * 鏇存柊鎴栨柊澧�
  */
 @Component
+@Slf4j
 public class FaceInFoAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<MonitoringDetailResult> {
     @Autowired
     private CheckIndexFaceMapper checkIndexFaceMapper;
     @Autowired
     private ICheckIndexFaceService checkIndexFaceService;
-    @Autowired
-    private SysConfigMapper sysConfigMapper;
-    @Autowired
-    private ITMonitorService monitorService;
     @Autowired
     private TMonitorMapper monitorMapper;
 
@@ -48,19 +50,18 @@
     @Override
     public void calculate(List<MonitoringDetailResult> 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(MonitoringDetailResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(MonitoringDetailResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
 
         for (MonitoringDetailResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
@@ -69,7 +70,7 @@
 
             // 澶勭悊鐪佸巺鏁版嵁
             if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
-                String provinceKey = "Province_" + deptId;
+                String provinceKey = ApiConstants.Province + deptId;
                 updateAreaStats(areaStatsMap, provinceKey, result);
             }
         }
@@ -80,7 +81,9 @@
         areaStatsMap.forEach((deptId, stats) -> {
             if (stats.totalSites > 0) {
                 CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList);
-                checkIndexFaces.add(checkIndexFace);
+                if (checkIndexFace != null) {
+                    checkIndexFaces.add(checkIndexFace);
+                }
             }
         });
 
@@ -101,31 +104,18 @@
     }
 
     /**
-     * 杞﹁締淇℃伅閲囬泦姝g‘鐜�
+     * 浜鸿劯淇℃伅閲囬泦姝g‘鐜�
      */
     private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) {
-        CheckIndexFace checkIndexFace;
-
-        // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
-        Optional<CheckIndexFace> existingFace = checkIndexFaceList.stream()
-                .filter(car -> key.equals(car.getDeptId().toString()) &&
-                        (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(car.getExamineTag())
-                                : CheckConstants.Examine_Tag_County.equals(car.getExamineTag())))
-                .findFirst();
-
-        if (existingFace.isPresent()) {
-            checkIndexFace = existingFace.get();
-        } else {
-            checkIndexFace = new CheckIndexFace();
-            checkIndexFace.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
-            checkIndexFace.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
-            checkIndexFace.setCreateTime(new Date());
+        CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
+        if (checkIndexFace == null) {
+            return null;
         }
         //璋冪敤璁$畻鏂规硶
-        Map<String, Object> siteOnlineParam = new HashMap<>();
-        siteOnlineParam.put("totalSites", stats.totalSites);
-        siteOnlineParam.put("qualifySite", stats.qualifySite);
-        BigDecimal infoAccuracy = infoAccuracy(siteOnlineParam);
+        Map<String, Object> param = new HashMap<>();
+        param.put("totalSites", stats.totalSites);
+        param.put("qualifySite", stats.qualifySite);
+        BigDecimal infoAccuracy = infoAccuracy(param);
         checkIndexFace.setFaceInformationCollectionAccuracy(infoAccuracy);
         return checkIndexFace;
     }

--
Gitblit v1.8.0