From dea580dae4fe148acf766b68fd99f87510164b36 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 12:22:00 +0800
Subject: [PATCH] 录像翻译行政区域
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 49ea8ea..2f92fa3 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -186,7 +186,7 @@
} else {
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
- // 鍏堟煡鍑哄湪绾跨殑璁惧IP闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
+ // 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
List<TMonitorResult> dataList = new ArrayList<>(48);
Integer time = times;
@@ -196,6 +196,7 @@
return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛
}, executorService)
.orTimeout(60, TimeUnit.SECONDS)
+ //鍑虹幇寮傚父
.exceptionally(ex -> {
if (ex instanceof TimeoutException) {
log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp());
@@ -245,20 +246,12 @@
Date now = new Date();
List<UpdateOnlineVO> willUpdateList = dataList.stream().filter(result->!result.getPingOnline()).map(item -> {
UpdateOnlineVO vo = new UpdateOnlineVO();
- vo.setOnline(item.getPingOnline()?ApiConstants.UY_OnlineSite_Online:ApiConstants.UY_OnlineSite_Offline);
+ vo.setOnline(ApiConstants.UY_OnlineSite_Offline);
vo.setIp(item.getIp());
vo.setUpdateTime(now);
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)) {
- workOrderService.innerAddWorkOrder(workOrderList);
- }
//瀛樻斁鍒癿ongo
if (!CollectionUtils.isEmpty(dataList)) {
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
@@ -266,6 +259,14 @@
DeleteResult result = mongoTemplate.remove(query, TMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(dataList);
+ }
+ //宸ュ崟
+ List<WorkOrder> workOrderList = dataList.stream()
+ .filter(item -> Objects.nonNull(item.getWorkOrder()))
+ .map(TMonitorResult::getWorkOrder)
+ .collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(workOrderList)) {
+ workOrderService.innerAddWorkOrder(workOrderList);
}
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
}
@@ -362,8 +363,8 @@
pointService.setDeviceTagByGB(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
- // 宸ュ崟鐢熸垚
- uyErrorTypeCheckService.recordMetaDSumCheck(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.recordMetaDSumCheck(records);
}
} else {
log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
--
Gitblit v1.8.0