From 7a93f4097430703dc60c4aee0240ed348a0ab1df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 06 一月 2025 18:12:00 +0800
Subject: [PATCH] 核算重构
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 138418e..40c57fc 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;
@@ -59,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}")
@@ -193,11 +195,12 @@
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
// 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
- //TODO锛氶渶瑕佹妸娴峰悍鍜屼紭浜戠殑浠诲姟鐨勬椂闂磋皟鍒皃ing涔嬪墠
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){
@@ -244,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绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
@@ -290,8 +292,10 @@
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(),
@@ -348,7 +352,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()))
--
Gitblit v1.8.0