From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 89 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 44 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 68237f3..c351a65 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -16,6 +16,7 @@
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.mapper.WorkOrderMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.platform.service.YwPointService;
@@ -25,11 +26,14 @@
import com.ycl.utils.CheckPointUtil;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
+import constant.CheckConstants;
import constant.RedisConstant;
import enumeration.ErrorType;
import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -56,6 +60,7 @@
private final YwPointService pointService;
private final TMonitorMapper monitorMapper;
private final WorkOrderService workOrderService;
+ private final WorkOrderMapper workOrderMapper;
private final SysConfigMapper sysConfigMapper;
private final CheckPointUtil checkPointUtil;
@Value("${youYun.tenantId}")
@@ -70,8 +75,8 @@
private String passwd;
private static final ExecutorService executorService = new ThreadPoolExecutor(16,
- 128,
- 5000,
+ 64,
+ 60,
TimeUnit.SECONDS,
new ArrayBlockingQueue<>(1000),
new ThreadPoolExecutor.CallerRunsPolicy()
@@ -102,7 +107,7 @@
item.setNo(item.getDeviceId());
}
});
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records, CheckConstants.Rule_Category_Video);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
// 宸ュ崟鐢熸垚
@@ -151,7 +156,7 @@
item.setNo(item.getSerialNumber().getShowValue());
}
});
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Or);
pointService.setNew(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
@@ -175,6 +180,8 @@
/**
* 鐐逛綅鍦ㄧ嚎PING妫�娴�
+ * 浠诲姟浼氬厛鎵ц涓�娆′紭浜戝悓姝ワ紝鐒跺悗鎵цping妫�娴�
+ * online瀛楁鏉ヨ嚜浜庝紭浜戯紝pingOnline涓轰富鍔╬ing妫�娴嬬殑銆傚瓨鍏ongo缁欐暟鎹腑蹇冩煡闃�
*/
public void pointOnline() throws ExecutionException, InterruptedException {
log.info("寮�濮嬫娴嬬偣浣嶅湪绾�");
@@ -191,7 +198,9 @@
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()));
+ Map<String, TMonitorResult> mongoMap = mongoTemplate.find(onlineQuery, TMonitorResult.class)
+ .stream()
+ .collect(Collectors.toMap(TMonitorResult::getNo, Function.identity(), (existing, replacement) -> replacement));
for (TMonitorResult result : monitorList) {
TMonitorResult mongoData = mongoMap.get(result.getNo());
if(mongoData!=null){
@@ -205,7 +214,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());
@@ -214,36 +223,6 @@
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());
@@ -268,10 +247,9 @@
List<String> offLineList = new ArrayList<>();
List<String> onLineList = new ArrayList<>();
//鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧
- List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
+// 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())) {
+ if(item.getPingOnline()) {
onLineList.add(item.getIp());
} else if(!item.getPingOnline()) {
//绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
@@ -286,15 +264,38 @@
}
//瀛樻斁鍒癿ongo
if (!CollectionUtils.isEmpty(dataList)) {
+ List<TMonitorResult> mongoList = new ArrayList<>();
+ dataList.forEach(item->{
+ String monitorType = item.getMonitorType();
+ //鍚屼竴涓澶囧涓被鍨嬫瘡涓被鍨嬪瓨涓�鏉℃暟鎹紝浠ユ鍦ㄤ繚鐣欐暟鎹殑鎯呭喌涓嬪尯鍒嗙渷鍘呮爣绛�
+ if(StringUtils.isNotEmpty(monitorType)){
+ String[] monitors = monitorType.split("/");
+ for (String type : monitors) {
+ TMonitorResult mongoData = new TMonitorResult();
+ BeanUtils.copyProperties(item,mongoData);
+ mongoData.setMonitorType(type);
+ if("1".equals(type)){
+ mongoData.setProvinceTag(mongoData.getProvinceTagVideo());
+ }else if("2".equals(type)){
+ mongoData.setProvinceTag(mongoData.getProvinceTagCar());
+ }else if("3".equals(type)){
+ mongoData.setProvinceTag(mongoData.getProvinceTagFace());
+ }
+ mongoList.add(mongoData);
+ }
+ }
+ });
//濡傛灉瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
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);
+ mongoTemplate.insertAll(mongoList);
}
//宸ュ崟锛堝悓涓�IP鍙敓鎴愪竴涓伐鍗曪級
+ //鏌ヨ鏁版嵁搴撳凡瀛樺湪鐨勭绾垮伐鍗曡幏鍙杋p闆嗗悎锛屽墧闄�
+ List<String> ips = workOrderMapper.getOfflineWorkOrder();
List<WorkOrder> workOrderList = dataList.stream()
- .filter(item -> Objects.nonNull(item.getWorkOrder()))
+ .filter(item -> Objects.nonNull(item.getWorkOrder()) && (CollectionUtils.isEmpty(ips) || !ips.contains(item.getIp())))
.collect(Collectors.toMap(
TMonitorResult::getIp,
Function.identity(),
@@ -338,7 +339,7 @@
item.setNo(item.getDeviceId());
}
});
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
//鏇存柊point琛ㄥ湪绾跨姸鎬�
@@ -350,7 +351,7 @@
vo.setUpdateTime(now);
return vo;
}).collect(Collectors.toList());
- monitorMapper.updateOnline(willUpdateList);
+ monitorMapper.updateOnlineFromUyOrHk(willUpdateList);
//绂荤嚎鐢熸垚宸ュ崟,涓�涓猧p鍙敓鎴愪竴涓伐鍗�
List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream()
.filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()))
@@ -405,7 +406,7 @@
}
});
//鎵撴爣绛�
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
// // 宸ュ崟鐢熸垚
--
Gitblit v1.8.0