From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
index 5c04496..b192569 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -48,7 +48,7 @@
int newSites = 0;
//鍏ㄥ勾鐣欏瓨鏁�
int allFiles = 0;
- //褰撴棩妗ｆ鏁�
+ //褰撴棩妗ｆ鏁帮紙鍑屾櫒璁＄畻鐨勶紝瀹為檯鍙栧緱鏄槰鏃ョ殑涓�鏈轰竴妗ｆ暟閲忥級
int todayFiles = 0;
}
@@ -110,7 +110,7 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟銆佹寚鎸ュ浘鍍忔暟銆佹寚鎸ュ浘鍍忓湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result, Map<String, TMonitor> newMonitors, List<String> todayMonitor) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result, Map<String, TMonitor> newMonitors, List<String> yesterdayMonitor) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
@@ -118,7 +118,7 @@
if (newMonitors.containsKey(result.getSerialNumber())) {
stats.newSites++;
}
- if (todayMonitor.contains(result.getSerialNumber())) {
+ if (yesterdayMonitor.contains(result.getSerialNumber())) {
stats.todayFiles++;
}
}
--
Gitblit v1.8.0