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/CarSnapshotDelayCalculation.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 7c70908..0a9c2f1 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -14,6 +14,7 @@
 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;
@@ -34,6 +35,7 @@
  * 鏇存柊鎴栨柊澧�
  */
 @Component
+@Slf4j
 public class CarSnapshotDelayCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDelayMonitorResult> {
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
@@ -45,6 +47,7 @@
     //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
     private static class AreaStats {
         int totalCount = 0;
+        int delayCount = 0;
         //0-180s
         int delayCount1 = 0;
         //180-300s
@@ -56,6 +59,7 @@
     @Override
     public void calculate(List<SnapshotDelayMonitorResult> list) {
         if (CollectionUtils.isEmpty(list)) {
+            log.info("鏁版嵁涓虹┖");
             return;
         }
 
@@ -102,6 +106,7 @@
         //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
         AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
         stats.totalCount += result.getDataCount();
+        stats.delayCount += result.getDelayCount();
         stats.delayCount1 += result.getDataDelayCount1();
         stats.delayCount2 += result.getDataDelayCount2();
         stats.delayCount3 += result.getDataDelayCount3();
@@ -119,11 +124,12 @@
         //璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉�
         Map<String, Object> param = new HashMap<>();
         param.put("totalCount", stats.totalCount);
+        param.put("delayCount", stats.delayCount);
         param.put("delayCount1", stats.delayCount1);
         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