From 628b80d0452602c5c02cec9ddbbee266f89d60c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 118 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 34 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 c070048..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,13 +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.result.UY.VideoOnlineResult;
import com.ycl.platform.domain.vo.UpdateOnlineVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
@@ -18,11 +21,12 @@
import com.ycl.system.domain.SysConfig;
import com.ycl.system.mapper.SysConfigMapper;
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;
@@ -30,36 +34,28 @@
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;
private final YwPointService pointService;
private final TMonitorMapper monitorMapper;
- private final SelfHttpUtil selfHttpUtil;
- private final RedisTemplate redisTemplate;
private final WorkOrderService workOrderService;
private final SysConfigMapper sysConfigMapper;
-
+ private final CheckPointUtil checkPointUtil;
@Value("${youYun.tenantId}")
private String tenantId;
@Value("${youYun.apikey}")
@@ -190,18 +186,67 @@
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
// 鍏堟煡鍑鸿澶嘔P闆嗗悎
- List<TMonitor> monitorList = monitorMapper.getDistinctIP();
- List<Future<OnlineThreadVO>> futureList = new ArrayList<>(48);
- List<OnlineThreadVO> dataList = new ArrayList<>(48);
- for (TMonitor monitor : monitorList) {
- OnlineCheckThread thread = new OnlineCheckThread(monitor, redisTemplate, selfHttpUtil, times);
- Future<OnlineThreadVO> future = executorService.submit(thread);
- futureList.add(future);
- }
- for (Future<OnlineThreadVO> future : futureList) {
- dataList.add(future.get()); // get鏂规硶浼氶樆濉烇紝鐭ラ亾鎷垮埌缁撴灉鎵嶇户缁墽琛宖or
+ List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
+// 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
+// }
+ 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 -> {
@@ -212,20 +257,26 @@
return vo;
}).collect(Collectors.toList());
monitorMapper.updateOnline(willUpdateList);
-
// 宸ュ崟
List<WorkOrder> workOrderList = dataList.stream()
.filter(item -> Objects.nonNull(item.getWorkOrder()))
- .map(OnlineThreadVO::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)) {
+ //濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ 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涓�
+ mongoTemplate.insertAll(dataList);
+ }
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
}
- //鐐逛綅鍦ㄧ嚎鐜�
+ //锛堝純鐢級鐐逛綅鍦ㄧ嚎鐜�
public void videoOnlineTask() {
//瑙嗛鍥惧儚璐ㄩ噺
log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�");
@@ -310,7 +361,6 @@
// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
-
}
--
Gitblit v1.8.0