From 1c247583c3f23b877a2daeb456260298c8efd670 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 06 五月 2025 10:47:34 +0800
Subject: [PATCH] 订单下发接口更新
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 cfa9685..1014aee 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -76,7 +76,7 @@
private static final ExecutorService executorService = new ThreadPoolExecutor(16,
64,
- 5000,
+ 60,
TimeUnit.SECONDS,
new ArrayBlockingQueue<>(1000),
new ThreadPoolExecutor.CallerRunsPolicy()
@@ -194,6 +194,8 @@
} else {
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
+
+
// 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
//琛ュ厖閿欒鏃堕棿鐐�
@@ -214,7 +216,7 @@
OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time);
return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛
}, executorService)
- .orTimeout(60, TimeUnit.SECONDS)
+ .orTimeout(180, TimeUnit.SECONDS)
.exceptionally(ex -> {
if (ex instanceof TimeoutException) {
log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp());
@@ -230,6 +232,7 @@
CompletableFuture<Void> allOf = CompletableFuture.allOf(
futureList.toArray(new CompletableFuture[0])
);
+
try {
allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉
} catch (TimeoutException e) {
@@ -243,9 +246,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 +259,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 +299,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 +318,7 @@
.map(TMonitorResult::getWorkOrder)
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(workOrderList)) {
+ log.error("pointOnline鑾峰緱鎻掑叆宸ュ崟:{}",workOrderList);
workOrderService.innerAddWorkOrder(workOrderList);
}
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
--
Gitblit v1.8.0