From 3bd5f68b6db251dfa9bf377758faa6315b3a372d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:11:50 +0800
Subject: [PATCH] 人脸合格、图片可用

---
 ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java |   36 +++++++++++-------------------------
 1 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
index f1d31d6..f764ffe 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
@@ -27,6 +27,7 @@
 
 /**
  * 璁$畻杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�  璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘
+ * 閲囩敤鍗″彛灞炴�х洃娴嬫帴鍙�
  * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
  * 鏇存柊鎴栨柊澧�
  */
@@ -35,11 +36,7 @@
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private SysConfigMapper sysConfigMapper;
-    @Autowired
     private ITMonitorService monitorService;
-    @Autowired
-    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -84,7 +81,9 @@
         areaStatsMap.forEach((deptId, stats) -> {
             if (stats.totalSites > 0) {
                 CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
-                checkIndexCars.add(checkIndexCar);
+                if (checkIndexCar != null) {
+                    checkIndexCars.add(checkIndexCar);
+                }
             }
         });
 
@@ -108,28 +107,15 @@
      * 杞﹁締淇℃伅閲囬泦姝g‘鐜�
      */
     private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
-        CheckIndexCar checkIndexCar;
-
-        // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
-        Optional<CheckIndexCar> existingCar = checkIndexCarList.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 (existingCar.isPresent()) {
-            checkIndexCar = existingCar.get();
-        } else {
-            checkIndexCar = new CheckIndexCar();
-            checkIndexCar.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
-            checkIndexCar.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
-            checkIndexCar.setCreateTime(new Date());
+        CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+        if (checkIndexCar == 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);
         checkIndexCar.setVehicleInformationCollectionAccuracy(infoAccuracy);
         return checkIndexCar;
     }

--
Gitblit v1.8.0