From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志,修改大屏为查看当前月平均

---
 ycl-server/src/main/java/com/ycl/calculate/CarOnlineCalculation.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarOnlineCalculation.java
index f4911ca..79640bf 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarOnlineCalculation.java
@@ -33,7 +33,7 @@
  */
 @Component
 @Slf4j
-public class CarOnlineCalculation extends IndexCalculationServe<TMonitorResult, CarOnlineCalculation.AreaStats> implements CalculationStrategy<TMonitorResult> {
+public class CarOnlineCalculation extends IndexCalculationServe<SnapshotDataMonitorResult, CarOnlineCalculation.AreaStats> implements CalculationStrategy<SnapshotDataMonitorResult> {
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
@@ -46,9 +46,9 @@
     }
 
     @Override
-    public void calculate(List<TMonitorResult> list) {
+    public void calculate(List<SnapshotDataMonitorResult> list) {
         //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
-        Map<String, CarOnlineCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+        Map<String, CarOnlineCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
         if (areaStatsMap == null) return;
 
         // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
@@ -70,12 +70,11 @@
      * 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
      */
     @Override
-    public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorResult result) {
+    public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
         //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
         AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
         stats.totalSites++;
-
-        if (result.getOnline()!=null && result.getOnline()) {
+        if (ApiConstants.HK_SnapCount_ResultType_Null != result.getResultType()) {
             stats.onlineSites++;
         }
     }

--
Gitblit v1.8.0