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/CarDeviceSampleCalculation.java |   39 ++++++++++++++++++++++-----------------
 1 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index f8d9300..f4b1ed6 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -1,15 +1,13 @@
 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.TMonitor;
-import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
 import com.ycl.platform.domain.result.HK.VehicleDeviceSamplingResult;
 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 constant.ApiConstants;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -25,12 +23,13 @@
 import java.util.stream.Collectors;
 
 /**
- * 璁$畻杞﹁締灞炴�ц瘑鍒噯纭巼銆乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 璁$畻杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
  * 杞﹁締鏁版嵁鎶芥鎺ュ彛
  * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
  * 鏇存柊鎴栨柊澧�
  */
 @Component
+@Slf4j
 public class CarDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceSamplingResult> {
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
@@ -56,6 +55,7 @@
     @Override
     public void calculate(List<VehicleDeviceSamplingResult> list) {
         if (CollectionUtils.isEmpty(list)) {
+            log.info("鏁版嵁涓虹┖");
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
@@ -108,7 +108,7 @@
             stats.accuracySites++;
         }
         //閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬�
-        if (importantIds.contains(key)) {
+        if (importantIds.contains(result.getExternalIndexCode())) {
             stats.importantTotalSites++;
             if (vehDiff.getImportantConPercent() >= 0.9) {
                 stats.importantAccuracySites++;
@@ -118,25 +118,28 @@
         if (bigUseful.getBigUsefulPercent() >= 0.9) {
             stats.picUsabilitySites++;
         }
-        //鍥剧墖璁块棶姝e父閲� = 鎶芥閲�-寮傚父閲�
-        BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
-        //鍥剧墖鎶芥閲�
-        BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
-        //鍥剧墖璁块棶鐜�>=90% 瑙嗕负鍚堟牸
-        if (picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP).compareTo(new BigDecimal("0.9")) >= 0) {
-            stats.urlUsabilitySites++;
+        if (bigUseful.getSampleCount() != 0) {
+            //鍥剧墖璁块棶姝e父閲� = 鎶芥閲�-寮傚父閲�
+            BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
+            //鍥剧墖鎶芥閲�
+            BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
+            //鍥剧墖璁块棶鐜�>=90% 瑙嗕负鍚堟牸
+            if (picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP).compareTo(new BigDecimal("0.9")) >= 0) {
+                stats.urlUsabilitySites++;
+            }
         }
     }
 
     /**
-     * 杞﹁締淇℃伅閲囬泦姝g‘鐜囥�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+     * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
      */
     private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
         CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
         if (checkIndexCar == null) {
             return null;
         }
-        //璋冪敤淇℃伅閲囬泦姝g‘鐜囪绠楁柟娉�
+        log.info("key:{},杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬э細totalSites锛歿}锛宨mportantTotalSites:{}锛宎ccuracySites:{}锛宨mportantAccuracySites:{}",key,stats.totalSites,stats.importantTotalSites,stats.accuracySites,stats.importantAccuracySites);
+        //璋冪敤杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬ц绠楁柟娉�
         Map<String, Object> accuracyParam = new HashMap<>();
         accuracyParam.put("totalSites", stats.totalSites);
         accuracyParam.put("importantTotalSites", stats.importantTotalSites);
@@ -144,16 +147,18 @@
         accuracyParam.put("importantAccuracySites", stats.importantAccuracySites);
         BigDecimal dataAccuracy = dataAccuracy(accuracyParam);
         checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy);
+        log.info("url鍙敤鎬�: totalSites:{},urlQualifySites:{}",stats.totalSites,stats.urlUsabilitySites);
         //璋冪敤url鍙敤鎬ц绠楁柟娉�
         Map<String, Object> urlParam = new HashMap<>();
         urlParam.put("totalSites", stats.totalSites);
         urlParam.put("urlQualifySites", stats.urlUsabilitySites);
         BigDecimal urlUsability = urlUsability(urlParam);
         checkIndexCar.setVehicleUrlAvailability(urlUsability);
+        log.info("澶у浘鍙敤鎬�: totalSites:{},picUsabilitySites:{}",stats.totalSites,stats.picUsabilitySites);
         //璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
         Map<String, Object> usabilityParam = new HashMap<>();
-        urlParam.put("totalSites", stats.totalSites);
-        urlParam.put("picUsabilitySites", stats.picUsabilitySites);
+        usabilityParam.put("totalSites", stats.totalSites);
+        usabilityParam.put("picUsabilitySites", stats.picUsabilitySites);
         BigDecimal picUsability = picUsability(usabilityParam);
         checkIndexCar.setVehiclePictureAvailability(picUsability);
         return checkIndexCar;

--
Gitblit v1.8.0