From d6f915ecc8ee7efd5fcd3a205b57ef490b918fa5 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 21 八月 2024 14:27:59 +0800
Subject: [PATCH] feat：数据中心数字增加中文字段
---
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 70b9707..5c04496 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -10,6 +10,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
import constant.ApiConstants;
+import constant.CheckThreadConstants;
import constant.RedisConstant;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,18 +60,18 @@
}
//鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
Map<String, TMonitorVO> monitorMap = new HashMap<>();
- if(!CollectionUtils.isEmpty(list)){
+ if (!CollectionUtils.isEmpty(list)) {
monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
}
//鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
List<String> provinceIds = getProvince();
//鏈敞鍐岃澶�
- Map<String,TMonitor> newMonitorMap = new HashMap<>();
+ Map<String, TMonitor> newMonitorMap = new HashMap<>();
//Mongo涓�鏈轰竴妗ｅ悓姝ysql鏃舵斁鍏edis
String json = (String) redisTemplate.opsForValue().get(RedisConstant.New_Monitor_Set);
if (!StringUtils.isEmpty(json)) {
List<TMonitor> newMonitors = JSONArray.parseArray(json, TMonitor.class);
- if(!CollectionUtils.isEmpty(newMonitors)){
+ if (!CollectionUtils.isEmpty(newMonitors)) {
newMonitorMap = newMonitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
}
}
@@ -83,11 +84,11 @@
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result,newMonitorMap,todayMonitor);
+ 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);
+ updateAreaStats(areaStatsMap, provinceKey, result, newMonitorMap, todayMonitor);
}
}
@@ -109,15 +110,15 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟銆佹寚鎸ュ浘鍍忔暟銆佹寚鎸ュ浘鍍忓湪绾挎暟
*/
- 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> todayMonitor) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
stats.allFiles++;
- if(newMonitors.containsKey(result.getSerialNumber())){
+ if (newMonitors.containsKey(result.getSerialNumber())) {
stats.newSites++;
}
- if(todayMonitor.contains(result.getSerialNumber())){
+ if (todayMonitor.contains(result.getSerialNumber())) {
stats.todayFiles++;
}
}
@@ -141,7 +142,12 @@
archiveParam.put("allFiles", stats.allFiles);
archiveParam.put("todayFiles", stats.todayFiles);
BigDecimal archivesRate = archivesRate(archiveParam);
- checkIndexVideo.setArchivesRate(archivesRate);
+ //濡傛灉妗ｆ鑰冩牳姣斾綆浜�0.9涓嶅緱鍒�
+ if (new BigDecimal(CheckThreadConstants.Check_Video_Archive).compareTo(archivesRate) <= 0) {
+ checkIndexVideo.setArchivesRate(archivesRate);
+ } else {
+ checkIndexVideo.setArchivesRate(BigDecimal.ZERO);
+ }
return checkIndexVideo;
}
--
Gitblit v1.8.0