From 04b45b8c22594cc5535b164380738a80b0e8cbe2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:57 +0800
Subject: [PATCH] 修改大屏录像可用率指标
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index 81fc81c..1e2e4d6 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -22,6 +22,7 @@
import com.ycl.platform.service.YwPointService;
import com.ycl.system.domain.SysConfig;
import com.ycl.system.mapper.SysConfigMapper;
+import com.ycl.system.service.ISysConfigService;
import com.ycl.thread.OnlineCheckThread;
import com.ycl.utils.CheckPointUtil;
import com.ycl.utils.DateUtils;
@@ -76,7 +77,7 @@
private static final ExecutorService executorService = new ThreadPoolExecutor(16,
64,
- 5000,
+ 60,
TimeUnit.SECONDS,
new ArrayBlockingQueue<>(1000),
new ThreadPoolExecutor.CallerRunsPolicy()
@@ -194,6 +195,8 @@
} else {
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
+
+
// 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
//琛ュ厖閿欒鏃堕棿鐐�
@@ -230,6 +233,7 @@
CompletableFuture<Void> allOf = CompletableFuture.allOf(
futureList.toArray(new CompletableFuture[0])
);
+
try {
allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉
} catch (TimeoutException e) {
@@ -243,9 +247,11 @@
.filter(Objects::nonNull)
.collect(Collectors.toList());
+
Date now = new Date();
List<String> offLineList = new ArrayList<>();
List<String> onLineList = new ArrayList<>();
+ List<String> unKnownList = new ArrayList<>();
//鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧
// List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
dataList.forEach(item->{
@@ -254,12 +260,17 @@
} else if(!item.getPingOnline()) {
//绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
offLineList.add(item.getIp());
+ }else {
+ unKnownList.add(item.getIp());
}
});
+ log.error("unKnownList:{}",unKnownList);
if(!CollectionUtils.isEmpty(offLineList)) {
+ log.error("淇敼绂荤嚎鐨勭偣浣嶉泦鍚�:{}",offLineList);
monitorMapper.batchUpdateOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
}
if(!CollectionUtils.isEmpty(onLineList)) {
+ log.error("淇敼鍦ㄧ嚎鐨勭偣浣嶉泦鍚�:{}",onLineList);
monitorMapper.batchUpdateOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
}
//瀛樻斁鍒癿ongo
@@ -289,6 +300,8 @@
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
+
+ log.error("瀛樺叆鍚屾鍦ㄧ嚎mongo鏁版嵁{}" , mongoList );
mongoTemplate.insertAll(mongoList);
}
//宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級
@@ -306,6 +319,7 @@
.map(TMonitorResult::getWorkOrder)
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(workOrderList)) {
+ log.error("pointOnline鑾峰緱鎻掑叆宸ュ崟:{}",workOrderList);
workOrderService.innerAddWorkOrder(workOrderList);
}
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
@@ -378,6 +392,21 @@
// uyErrorTypeCheckService.videoOnlineCheck(mongoTemplate.find(query, VideoOnlineResult.class));
log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾");
}
+ private final ISysConfigService configService;
+
+ public double getSySMinTime(){
+ //鑾峰彇绯荤粺鍙傛暟
+ String dictLabel = configService.selectConfigByKey("recording_min_time");
+ double recordingMinTime;
+ try {
+ recordingMinTime = Double.parseDouble(dictLabel) / 60; // 濡傛灉 dictLabel 鏄互灏忔椂涓哄崟浣嶏紝鍒欐棤闇�闄や互 60
+ } catch (Exception e) {
+ log.error("閰嶇疆鐨勫垹闄ゆ椂闂磋寖鍥存牸寮忎笉姝ｇ‘: {}", dictLabel, e);
+ return 12.0; // 榛樿 12 灏忔椂锛堜互灏忔椂涓哄崟浣嶏級
+ }
+
+ return recordingMinTime;
+ }
//褰曞儚鍙敤
public void recordMetaDSumTask() {
@@ -392,6 +421,7 @@
String yesterday = format.format(instance.getTime());
param.setStatTime(yesterday);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
+ double minTime = getSySMinTime();
if (jsonObject != null) {
if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
@@ -404,6 +434,14 @@
if (Objects.nonNull(item.getDeviceId())) {
item.setNo(item.getDeviceId());
}
+ //鍒ゆ柇 骞朵慨鏀瑰綍鍍忕己灏戠姸鎬�
+ if (item.getRecordStatus() != -1){
+ if (item.getMissDuration() > minTime){
+ item.setRecordStatus(0);
+ }else if (item.getMissDuration() < minTime){
+ item.setRecordStatus(1);
+ }
+ }
});
//鎵撴爣绛�
pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
--
Gitblit v1.8.0