From 1d43e01376590a26a8e976a398b4744b6906cab4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 02 九月 2024 18:16:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index c1500fc..96de59e 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -11,9 +11,7 @@
import com.ycl.platform.service.ICheckIndexFaceService;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.mapper.SysConfigMapper;
-import constant.ApiConstants;
-import constant.CheckConstants;
-import constant.CheckSnapCountConstants;
+import constant.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@@ -38,7 +36,6 @@
*/
@Component
@Slf4j
-//TODD:绯荤粺閰嶇疆閲岀殑鍖哄垎浜鸿劯鍜岃溅杈嗐�佺疮鍔犳鏁扮殑姒傚康銆佸尯鍘夸笉灏戜簬40璺紝涓嶈揪鏍囧競宸炵殑褰撴湀璇ラ」鎴愮哗涓嶈兘寰楀垎銆�
public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@@ -78,7 +75,7 @@
// 鍒ゆ柇浠婂ぉ鏄惁鏄湰鏈堢殑绗竴澶�
if (today.equals(firstDayOfMonth)) {
// 濡傛灉鏄紝鍒欐竻闄edis涓褰曚腑鏂鏁扮殑鏁版嵁
- redisTemplate.delete(ApiConstants.Check_Face_ViewConnect);
+ redisTemplate.delete(RedisConstant.Check_Face_ViewConnect);
}
for (SnapshotDataMonitorResult result : list) {
TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
@@ -141,7 +138,7 @@
return null;
}
//璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
- if (stats.totalSites >= ApiConstants.Check_Face_SiteOnline) {
+ if (stats.totalSites >= CheckThreadConstants.Check_Face_SiteOnline) {
Map<String, Object> siteOnlineParam = new HashMap<>();
siteOnlineParam.put("totalSites", stats.totalSites);
siteOnlineParam.put("onlineSites", stats.onlineSites);
@@ -152,7 +149,7 @@
}
//瑙嗗浘搴撳鎺ョǔ瀹氭��
//Redis璁板綍璇ュ尯鍘垮綋鏈堟棤鏁版嵁涓婁紶娆℃暟
- Integer noDateCount = (Integer) redisTemplate.opsForHash().get(ApiConstants.Check_Face_ViewConnect, key);
+ Integer noDateCount = (Integer) redisTemplate.opsForHash().get(RedisConstant.Check_Face_ViewConnect, key);
// 濡傛灉鍊间负null锛屽垯鍒濆鍖栦负0
if (noDateCount == null) {
noDateCount = 0;
@@ -170,7 +167,7 @@
noDateCount++;
}
// 灏嗘柊鐨勫�兼斁鍥濰ash涓�
- redisTemplate.opsForHash().put(ApiConstants.Check_Face_ViewConnect, key, noDateCount);
+ redisTemplate.opsForHash().put(RedisConstant.Check_Face_ViewConnect, key, noDateCount);
return checkIndexFace;
}
}
--
Gitblit v1.8.0