From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 10 +++++++---
1 files changed, 7 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 a6f4dcb..d654649 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -33,8 +33,6 @@
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@Autowired
- private TMonitorMapper monitorMapper;
- @Autowired
private ICheckIndexVideoService checkIndexVideoService;
@Autowired
private RedisTemplate redisTemplate;
@@ -61,6 +59,8 @@
if(!CollectionUtils.isEmpty(list)){
monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
}
+ //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
+ List<String> provinceIds = getProvince();
//鏈敞鍐岃澶�
Map<String,TMonitor> newMonitorMap = new HashMap<>();
//Mongo涓�鏈轰竴妗ｅ悓姝ysql鏃舵斁鍏edis
@@ -81,7 +81,11 @@
String deptId = monitor.getDeptId().toString();
updateAreaStats(areaStatsMap, deptId, result,newMonitorMap,todayMonitor);
-
+ // 澶勭悊鐪佸巺鏁版嵁
+ if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
+ String provinceKey = ApiConstants.Province + deptId;
+ updateAreaStats(areaStatsMap, provinceKey, result,newMonitorMap,todayMonitor);
+ }
}
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
--
Gitblit v1.8.0