From b48eb9d4a012c504eb4388341c382ffefb3637d2 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 19 八月 2024 15:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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..70b9707 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -11,6 +11,7 @@
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
import constant.RedisConstant;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
@@ -29,11 +30,10 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class MonitorRegistrationCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
- @Autowired
- private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
@Autowired
@@ -54,6 +54,7 @@
@Override
public void calculate(List<TMonitorVO> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
//鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
@@ -61,6 +62,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,17 +84,21 @@
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琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
List<CheckIndexVideo> checkIndexVideos = new ArrayList<>();
- areaStatsMap.forEach((deptId, stats) -> {
+ areaStatsMap.forEach((key, stats) -> {
if (stats.totalSites > 0) {
- CheckIndexVideo CheckIndexVideo = createOrUpdateCheckIndexVideo(deptId, stats, checkIndexVideoList);
- if (CheckIndexVideo != null) {
- checkIndexVideos.add(CheckIndexVideo);
+ CheckIndexVideo checkIndexVideo = createOrUpdateCheckIndexVideo(key, stats, checkIndexVideoList);
+ if (checkIndexVideo != null) {
+ checkIndexVideos.add(checkIndexVideo);
}
}
});
@@ -130,10 +137,10 @@
BigDecimal monitorRegistration = monitorRegistration(param);
checkIndexVideo.setMonitorRegistration(monitorRegistration);
//璋冪敤妗ｆ鑰冩牳姣旇绠�
- Map<String, Object> importantParam = new HashMap<>();
- param.put("allFiles", stats.allFiles);
- param.put("todayFiles", stats.todayFiles);
- BigDecimal archivesRate = archivesRate(importantParam);
+ Map<String, Object> archiveParam = new HashMap<>();
+ archiveParam.put("allFiles", stats.allFiles);
+ archiveParam.put("todayFiles", stats.todayFiles);
+ BigDecimal archivesRate = archivesRate(archiveParam);
checkIndexVideo.setArchivesRate(archivesRate);
return checkIndexVideo;
--
Gitblit v1.8.0