From 13575e2a109e607f3daffcb65103ed0233fa7621 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:12:26 +0800
Subject: [PATCH] 点位在线定时任务卡死修复
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 2
ycl-server/src/main/java/com/ycl/task/MonitorTask.java | 2
ycl-server/src/main/java/com/ycl/task/UYTask.java | 98 ++++++++++++++++++++++++++++++++++--------------
ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java | 1
ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java | 4 +
5 files changed, 74 insertions(+), 33 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index 81e0698..0d7e5db 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -777,7 +777,7 @@
FFmpegFrameGrabber grabber = FFmpegFrameGrabber.createDefault(rtspUrl);
if (StringUtils.hasText(rtspUrl)) {
try {
- grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
+// grabber.setOption("rtsp_transport", "tcp"); // 浣跨敤tcp鐨勬柟寮忥紝涓嶇劧浼氫涪鍖呭緢涓ラ噸
grabber.setImageWidth(1920);
grabber.setImageHeight(1080);
grabber.setFrameRate(25);
diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index f09bb64..5b153b7 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -80,7 +80,7 @@
public void synchronize() {
log.info("寮�濮嬪悓姝ongodb涓�鏈轰竴妗ｅ埌鏁版嵁搴�");
Date yesterday = DateUtils.addDays(new Date(), -1);
- Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
//mongo鍝佺墝鏁版嵁
Query OSDQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
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 5504f50..b610016 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -3,15 +3,16 @@
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.entity.YwPoint;
-import com.ycl.platform.domain.param.UY.*;
+import com.ycl.platform.domain.param.UY.ImageDetectionParam;
+import com.ycl.platform.domain.param.UY.MonitorQualifyParam;
+import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+import com.ycl.platform.domain.param.UY.VideoOnlineParam;
import com.ycl.platform.domain.result.SYS.TMonitorResult;
+import com.ycl.platform.domain.result.UY.ImageDetectionResult;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.result.UY.*;
-import com.ycl.platform.domain.vo.OnlineThreadVO;
-import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.result.UY.VideoOnlineResult;
import com.ycl.platform.domain.vo.UpdateOnlineVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
@@ -22,10 +23,10 @@
import com.ycl.thread.OnlineCheckThread;
import com.ycl.utils.CheckPointUtil;
import com.ycl.utils.DateUtils;
-import com.ycl.utils.http.HttpUtils;
-import com.ycl.utils.http.SelfHttpUtil;
import constant.ApiConstants;
import constant.RedisConstant;
+import enumeration.ErrorType;
+import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -33,26 +34,20 @@
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.HttpStatusCode;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import java.io.IOException;
-import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
//浼樹簯瀵规帴鏁版嵁浠诲姟
@Slf4j
@Component("UYTask")
@RequiredArgsConstructor
public class UYTask {
-
+ private final RedisTemplate redisTemplate;
private final MongoTemplate mongoTemplate;
private final UYClient uyClient;
private final UYErrorTypeCheckService uyErrorTypeCheckService;
@@ -192,17 +187,66 @@
}
// 鍏堟煡鍑鸿澶嘔P闆嗗悎
List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
- List<Future<TMonitorResult>> futureList = new ArrayList<>(48);
+// List<Future<TMonitorResult>> futureList = new ArrayList<>(48);
List<TMonitorResult> dataList = new ArrayList<>(48);
- for (TMonitorResult monitor : monitorList) {
- OnlineCheckThread thread = new OnlineCheckThread(monitor,checkPointUtil,times);
- Future<TMonitorResult> future = executorService.submit(thread);
- futureList.add(future);
- }
- for (Future<TMonitorResult> future : futureList) {
- dataList.add(future.get()); // get鏂规硶浼氶樆濉烇紝鐭ラ亾鎷垮埌缁撴灉鎵嶇户缁墽琛宖or
+// for (TMonitorResult monitor : monitorList) {
+// OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, times);
+// Future<TMonitorResult> future = executorService.submit(thread);
+// futureList.add(future);
+// }
+// for (Future<TMonitorResult> future : futureList) {
+// dataList.add(future.get()); // get鏂规硶浼氶樆濉烇紝鐭ラ亾鎷垮埌缁撴灉鎵嶇户缁墽琛宖or
+// }
+ Integer time = times;
+ List<CompletableFuture<TMonitorResult>> futureList = monitorList.stream()
+ .map(monitor -> CompletableFuture.supplyAsync(() -> {
+ OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time);
+ return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛
+ }, executorService)
+ .orTimeout(30, TimeUnit.SECONDS)
+ .exceptionally(ex -> {
+ if (ex instanceof TimeoutException) {
+ log.error("浠诲姟鎵ц瓒呮椂:");
+ } else {
+ log.error("浠诲姟鎵ц寮傚父:" + ex);
+ }
+ int checkTimes = 1;
+ int offLineTimes = 1;
+ Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstant.ONLINE_KEY, monitor.getIp());
+ if (!CollectionUtils.isEmpty(map)) {
+ checkTimes = (Integer) map.get("checkTimes") + 1;
+ offLineTimes = (Integer) map.get("offLineTimes");
+ }
+ monitor.setOnline(Boolean.FALSE);
+ monitor.setCheckCount(checkTimes);
+ monitor.setOffLineCount(offLineTimes);
+ if (monitor.getOffLineCount() >= time) {
+ WorkOrder workOrder = new WorkOrder();
+ workOrder.setSerialNumber(monitor.getNo());
+ List<String> errList = new ArrayList<>();
+ errList.add(ErrorType.DEVICE_OFFLINE.getValue());
+ workOrder.setErrorTypeList(errList);
+ workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
+ monitor.setWorkOrder(workOrder);
+ }
+ return monitor; // 杩斿洖澶辫触鐨勭粨鏋�
+ }))
+ .collect(Collectors.toList());
+
+ // 绛夊緟鎵�鏈変换鍔″畬鎴愶紝浣嗕笉浼氭棤闄愭湡绛夊緟
+ CompletableFuture<Void> allOf = CompletableFuture.allOf(
+ futureList.toArray(new CompletableFuture[0])
+ );
+ try {
+ allOf.get(35, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉
+ } catch (TimeoutException e) {
+ log.warn("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�");
}
+ dataList = futureList.stream()
+ .map(CompletableFuture::join)
+ .filter(result -> result != null)
+ .collect(Collectors.toList());
// 鏇存柊point琛ㄧ殑鍦ㄧ嚎鏍囪瘑
Date now = new Date();
List<UpdateOnlineVO> willUpdateList = dataList.stream().map(item -> {
@@ -213,16 +257,14 @@
return vo;
}).collect(Collectors.toList());
monitorMapper.updateOnline(willUpdateList);
-
// 宸ュ崟
List<WorkOrder> workOrderList = dataList.stream()
.filter(item -> Objects.nonNull(item.getWorkOrder()))
.map(TMonitorResult::getWorkOrder)
.collect(Collectors.toList());
- if (CollectionUtils.isEmpty(workOrderList)) {
- return;
+ if (!CollectionUtils.isEmpty(workOrderList)) {
+ workOrderService.innerAddWorkOrder(workOrderList);
}
- workOrderService.innerAddWorkOrder(workOrderList);
//瀛樻斁鍒癿ongo
if (!CollectionUtils.isEmpty(dataList)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -230,7 +272,6 @@
DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(dataList);
- log.info("缁撴潫鍚屾鐐逛綅鍦ㄧ嚎鐜囧埌mongo");
}
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
}
@@ -320,7 +361,6 @@
// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
-
}
diff --git a/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java b/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java
index 5228eae..520a575 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OnlineCheckThread.java
@@ -29,6 +29,7 @@
private TMonitorResult monitor;
private CheckPointUtil checkPointUtil;
private Integer times;
+
public OnlineCheckThread(TMonitorResult monitor, CheckPointUtil checkPointUtil,Integer times) {
this.monitor = monitor;
this.checkPointUtil = checkPointUtil;
@@ -60,7 +61,7 @@
}
@Override
- public TMonitorResult call() throws Exception {
+ public TMonitorResult call() {
TMonitorResult result = checkPointUtil.check(monitor);
// 涓�澶╁唴鐩戞祴鍒扮绾�1娆′互涓婏紝鐢熸垚宸ュ崟
if (result.getOffLineCount() >= times) {
@@ -72,6 +73,7 @@
workOrder.setStatus(WorkOrderStatusEnum.DISTRIBUTED);
result.setWorkOrder(workOrder);
}
+ log.info("鐩戞祴瀵硅薄锛�"+result);
return result;
}
diff --git a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
index e74f2c9..d86e37c 100644
--- a/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
+++ b/ycl-server/src/main/java/com/ycl/utils/CheckPointUtil.java
@@ -51,7 +51,6 @@
} catch (Exception e) {
monitor.setOnline(Boolean.FALSE);
}
-
// 濡傛灉http寰楀埌鐨勪笉鍦ㄧ嚎锛岄偅涔堝啀ping涓�涓�
boolean reachable = false;
Integer checkTimes = 1;
--
Gitblit v1.8.0