From dbf1793b62b69f824a401242cfd5430dd4992fa8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 十一月 2024 12:01:14 +0800
Subject: [PATCH] 运行监控导出
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 205 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 157 insertions(+), 48 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..68237f3 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -5,11 +5,15 @@
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 +22,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 +35,29 @@
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.function.Function;
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}")
@@ -176,7 +174,7 @@
}
/**
- * 鐐逛綅鍦ㄧ嚎妫�娴�
+ * 鐐逛綅鍦ㄧ嚎PING妫�娴�
*/
public void pointOnline() throws ExecutionException, InterruptedException {
log.info("寮�濮嬫娴嬬偣浣嶅湪绾�");
@@ -189,43 +187,130 @@
} else {
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);
+ // 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
+ List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
+ //琛ュ厖閿欒鏃堕棿鐐�
+ Query onlineQuery = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ Map<String, TMonitorResult> mongoMap = mongoTemplate.find(onlineQuery, TMonitorResult.class).stream().collect(Collectors.toMap(TMonitorResult::getNo, Function.identity()));
+ for (TMonitorResult result : monitorList) {
+ TMonitorResult mongoData = mongoMap.get(result.getNo());
+ if(mongoData!=null){
+ result.setOffLineTimeStr(mongoData.getOffLineTimeStr());
+ }
}
- for (Future<OnlineThreadVO> future : futureList) {
- dataList.add(future.get()); // get鏂规硶浼氶樆濉烇紝鐭ラ亾鎷垮埌缁撴灉鎵嶇户缁墽琛宖or
+ List<TMonitorResult> dataList = new ArrayList<>(48);
+ 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(60, TimeUnit.SECONDS)
+ .exceptionally(ex -> {
+ if (ex instanceof TimeoutException) {
+ log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp());
+ } else {
+ log.error("浠诲姟鎵ц寮傚父:"+monitor.getIp() +ex);
+ ex.printStackTrace();
+ }
+ return null;
+// int checkTimes = 1;
+// int offLineTimes = 1;
+// Map<String, Object> map = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstant.ONLINE_KEY, monitor.getNo());
+// if (!CollectionUtils.isEmpty(map)) {
+// checkTimes = (Integer) map.get("checkTimes") + 1;
+// offLineTimes = (Integer) map.get("offLineTimes");
+// }else {
+// map = new HashMap<>();
+// }
+// monitor.setPingOnline(Boolean.FALSE);
+// monitor.setCheckCount(checkTimes);
+// monitor.setOffLineCount(offLineTimes);
+// List<Date> offLineTime = monitor.getOffLineTime();
+// if(CollectionUtils.isEmpty(offLineTime)) offLineTime = new ArrayList<>();
+// offLineTime.add(new Date());
+// monitor.setOffLineTime(offLineTime);
+// 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);
+// }
+// map.put("checkTimes", checkTimes);
+// map.put("offLineTimes", offLineTimes);
+// redisTemplate.opsForHash().put(RedisConstant.ONLINE_KEY, monitor.getNo(), map);
+// return monitor; // 杩斿洖澶辫触鐨勭粨鏋�
+
+ }))
+ .collect(Collectors.toList());
+
+ // 绛夊緟鎵�鏈変换鍔″畬鎴愶紝浣嗕笉浼氭棤闄愭湡绛夊緟
+ CompletableFuture<Void> allOf = CompletableFuture.allOf(
+ futureList.toArray(new CompletableFuture[0])
+ );
+ try {
+ allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉
+ } catch (TimeoutException e) {
+ log.error("閮ㄥ垎浠诲姟鏈湪鎸囧畾鏃堕棿鍐呭畬鎴�");
+ } catch (Exception e2){
+ log.error("鏁版嵁鏀堕泦寮傚父"+e2);
}
- // 鏇存柊point琛ㄧ殑鍦ㄧ嚎鏍囪瘑
+ dataList = futureList.stream()
+ .map(CompletableFuture::join)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+
Date now = new Date();
- List<UpdateOnlineVO> willUpdateList = dataList.stream().map(item -> {
- UpdateOnlineVO vo = new UpdateOnlineVO();
- vo.setOnline(item.getOnline());
- vo.setIp(item.getIp());
- vo.setUpdateTime(now);
- return vo;
- }).collect(Collectors.toList());
- monitorMapper.updateOnline(willUpdateList);
-
- // 宸ュ崟
+ List<String> offLineList = new ArrayList<>();
+ List<String> onLineList = new ArrayList<>();
+ //鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧
+ List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
+ dataList.forEach(item->{
+ //鏇存柊绾溅杈嗘垨绾汉鑴哥殑璁惧鐨勫湪绾跨姸鎬�(杩欓儴鍒嗚澶囦笉浼氭媺娴佹娴�)
+ if(item.getPingOnline() && !CollectionUtils.isEmpty(serialNumbers) && serialNumbers.contains(item.getNo())) {
+ onLineList.add(item.getIp());
+ } else if(!item.getPingOnline()) {
+ //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
+ offLineList.add(item.getIp());
+ }
+ });
+ if(!CollectionUtils.isEmpty(offLineList)) {
+ monitorMapper.batchUpdateOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
+ }
+ if(!CollectionUtils.isEmpty(onLineList)) {
+ monitorMapper.batchUpdateOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
+ }
+ //瀛樻斁鍒癿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);
+ }
+ //宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級
List<WorkOrder> workOrderList = dataList.stream()
.filter(item -> Objects.nonNull(item.getWorkOrder()))
- .map(OnlineThreadVO::getWorkOrder)
+ .collect(Collectors.toMap(
+ TMonitorResult::getIp,
+ Function.identity(),
+ (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓� TMonitorResult 瀵硅薄
+ ))
+ .values()
+ .stream()
+ .map(TMonitorResult::getWorkOrder)
.collect(Collectors.toList());
- if (CollectionUtils.isEmpty(workOrderList)) {
- return;
+ if (!CollectionUtils.isEmpty(workOrderList)) {
+ workOrderService.innerAddWorkOrder(workOrderList);
}
- workOrderService.innerAddWorkOrder(workOrderList);
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
}
- //鐐逛綅鍦ㄧ嚎鐜�
+ //鐐逛綅鍦ㄧ嚎鐜囷紙浼樹簯锛�
public void videoOnlineTask() {
//瑙嗛鍥惧儚璐ㄩ噺
log.info("寮�濮嬫墽琛岀偣浣嶅湪绾挎暟鎹悓姝�");
@@ -247,10 +332,34 @@
Query query = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, VideoOnlineResult.class);
+ //鎵撴爣绛�
+ records.forEach(item -> {
+ if (Objects.nonNull(item.getDeviceId())) {
+ item.setNo(item.getDeviceId());
+ }
+ });
+ pointService.setDeviceTagByGB(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
- // 宸ュ崟鐢熸垚
- uyErrorTypeCheckService.videoOnlineCheck(records);
+ //鏇存柊point琛ㄥ湪绾跨姸鎬�
+ Date now = new Date();
+ List<UpdateOnlineVO> willUpdateList = records.stream().map(item -> {
+ UpdateOnlineVO vo = new UpdateOnlineVO();
+ vo.setOnline(item.getStatus());
+ vo.setIp(item.getIpAddr());
+ vo.setUpdateTime(now);
+ return vo;
+ }).collect(Collectors.toList());
+ monitorMapper.updateOnline(willUpdateList);
+ //绂荤嚎鐢熸垚宸ュ崟,涓�涓猧p鍙敓鎴愪竴涓伐鍗�
+ List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream()
+ .filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()))
+ .collect(Collectors.toMap(
+ VideoOnlineResult::getIpAddr,
+ Function.identity(),
+ (existing, replacement) -> existing // 濡傛灉閬囧埌鐩稿悓鐨� IP锛屼繚鐣欑涓�涓紙existing锛�
+ )).values());
+ uyErrorTypeCheckService.videoOnlineCheck(workOrders);
} else {
log.error("鐐逛綅鍦ㄧ嚎缁撴灉鏁版嵁涓虹┖{}", data);
}
@@ -295,11 +404,12 @@
item.setNo(item.getDeviceId());
}
});
+ //鎵撴爣绛�
pointService.setDeviceTagByGB(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
- // 宸ュ崟鐢熸垚
- uyErrorTypeCheckService.recordMetaDSumCheck(records);
+// // 宸ュ崟鐢熸垚
+// uyErrorTypeCheckService.recordMetaDSumCheck(records);
}
} else {
log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
@@ -310,7 +420,6 @@
// uyErrorTypeCheckService.recordMetaDSumCheck(mongoTemplate.find(query, RecordMetaDSumResult.class));
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
-
}
--
Gitblit v1.8.0