From fea22e82e7e49691f6e0c20a29b228d0ab3173e9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 29 十月 2025 17:08:38 +0800
Subject: [PATCH] 修改问题
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 1014aee..fb1bf59 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
-import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.entity.WorkOrder;
import com.ycl.platform.domain.param.UY.ImageDetectionParam;
import com.ycl.platform.domain.param.UY.MonitorQualifyParam;
@@ -22,14 +21,12 @@
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;
import constant.ApiConstants;
import constant.CheckConstants;
-import constant.RedisConstant;
-import enumeration.ErrorType;
-import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -45,6 +42,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -184,6 +182,8 @@
* online瀛楁鏉ヨ嚜浜庝紭浜戯紝pingOnline涓轰富鍔╬ing妫�娴嬬殑銆傚瓨鍏ongo缁欐暟鎹腑蹇冩煡闃�
*/
public void pointOnline() throws ExecutionException, InterruptedException {
+
+
log.info("寮�濮嬫娴嬬偣浣嶅湪绾�");
Integer times = 2;
SysConfig config = new SysConfig();
@@ -263,6 +263,11 @@
unKnownList.add(item.getIp());
}
});
+
+ if(!CollectionUtils.isEmpty(onLineList)){
+ log.error("鍦ㄧ嚎鐐逛綅闆嗗悎:{}",onLineList);
+ }
+
log.error("unKnownList:{}",unKnownList);
if(!CollectionUtils.isEmpty(offLineList)) {
log.error("淇敼绂荤嚎鐨勭偣浣嶉泦鍚�:{}",offLineList);
@@ -290,6 +295,10 @@
mongoData.setProvinceTag(mongoData.getProvinceTagCar());
}else if("3".equals(type)){
mongoData.setProvinceTag(mongoData.getProvinceTagFace());
+ }
+ //淇敼绾夸笂
+ if(mongoData.getPingOnline()){
+ mongoData.setOnline(1);
}
mongoList.add(mongoData);
}
@@ -353,6 +362,7 @@
}
});
pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
+ log.error("鐐逛綅鍦ㄧ嚎鐜囨彃鍏ユ暟鎹ぇ灏弡}",records.size());
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
//鏇存柊point琛ㄥ湪绾跨姸鎬�
@@ -391,6 +401,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() {
@@ -402,9 +427,13 @@
instance.setTime(new Date());
instance.add(Calendar.DAY_OF_MONTH, -1);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
String yesterday = format.format(instance.getTime());
param.setStatTime(yesterday);
+ log.error("寮�濮嬪悓姝ongodb褰曞儚鍙敤鏁版嵁鏃ユ湡涓簕}",yesterday);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
+ double minTime = getSySMinTime();
+ AtomicReference<Integer> count = new AtomicReference<>(0);
if (jsonObject != null) {
if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
@@ -417,10 +446,23 @@
if (Objects.nonNull(item.getDeviceId())) {
item.setNo(item.getDeviceId());
}
+
+ //鍒ゆ柇 骞朵慨鏀瑰綍鍍忕己灏戠姸鎬�
+ if (item.getRecordStatus() != -1){
+
+ count.getAndSet(count.get() + 1);
+ if (item.getMissDuration() > minTime){
+ item.setRecordStatus(0);
+ }else if (item.getMissDuration() < minTime){
+ item.setRecordStatus(1);
+ }
+ }
});
//鎵撴爣绛�
pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
+ log.error("鍙戠敓鐘舵�佹敼鍙樻暟閲�:{}",count);
//瀛樻斁鍦╩ongo涓�
+ log.error("鏂板mongodb鏁版嵁澶у皬锛歿}",records.size());
mongoTemplate.insertAll(records);
// // 宸ュ崟鐢熸垚
// uyErrorTypeCheckService.recordMetaDSumCheck(records);
--
Gitblit v1.8.0