From 97b1e0d4820606bef726f60e459b66afb1e8eab1 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 十一月 2025 11:50:51 +0800
Subject: [PATCH] 优化与日志
---
ycl-server/src/main/java/com/ycl/task/UYTask.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 a84bb9e..295ecff 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -193,7 +193,6 @@
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
-
// 鍏堟煡鍑鸿澶嘔P闆嗗悎,鍓旈櫎鎺夊湪绾挎儏鍐垫槸鏈煡鐨�,骞朵笖鍙娴嬫鍦ㄨ�冩牳鐨勮澶囬伩鍏嶅浣欏伐鍗�
List<TMonitorResult> monitorList = monitorMapper.getDistinctIP();
//琛ュ厖閿欒鏃堕棿鐐�
@@ -252,6 +251,10 @@
//鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧
// List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList());
dataList.forEach(item->{
+// if ("DX_闀垮緛澶ч亾璐″叴璺矾鍙ｄ笢鍗楁柟鍚慱鏋満_缁嗚妭".equals(item.getName())){
+// log.info("2.鏁版嵁娴佸叆:{}",item);
+// log.info("鎵撳嵃鐘舵�乸ingOnline锛歿}",item.getPingOnline());
+// }
if(item.getPingOnline()) {
onLineList.add(item.getIp());
} else if(!item.getPingOnline()) {
@@ -261,14 +264,17 @@
unKnownList.add(item.getIp());
}
});
- log.error("unKnownList:{}",unKnownList);
+
+ log.error("閫氳繃pingOnline鏈煡鐐逛綅鐨勯泦鍚堝ぇ灏�:{}",unKnownList.size());
+ log.error("閫氳繃pingOnline淇敼绂荤嚎绾跨殑鐐逛綅闆嗗悎澶у皬:{}",offLineList.size());
+ log.error("閫氳繃pingOnline淇敼鍦ㄧ嚎鐨勭偣浣嶉泦鍚堝ぇ灏�:{}",onLineList.size());
if(!CollectionUtils.isEmpty(offLineList)) {
- log.error("淇敼绂荤嚎鐨勭偣浣嶉泦鍚�:{}",offLineList);
monitorMapper.batchUpdateOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
+ monitorMapper.batchUpdatePingOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
}
if(!CollectionUtils.isEmpty(onLineList)) {
- log.error("淇敼鍦ㄧ嚎鐨勭偣浣嶉泦鍚�:{}",onLineList);
monitorMapper.batchUpdateOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
+ monitorMapper.batchUpdatePingOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
}
//瀛樻斁鍒癿ongo
if (!CollectionUtils.isEmpty(dataList)) {
@@ -288,6 +294,10 @@
mongoData.setProvinceTag(mongoData.getProvinceTagCar());
}else if("3".equals(type)){
mongoData.setProvinceTag(mongoData.getProvinceTagFace());
+ }
+ //淇敼绾夸笂
+ if(mongoData.getPingOnline()){
+ mongoData.setOnline(1);
}
mongoList.add(mongoData);
}
@@ -314,6 +324,13 @@
.values()
.stream()
.map(TMonitorResult::getWorkOrder)
+ .collect(Collectors.toMap(
+ WorkOrder::getSerialNumber, // 鎸塻erialNumber鍘婚噸
+ Function.identity(),
+ (existing, replacement) -> replacement // 閲嶅鏃朵繚鐣欐渶鍚庝竴涓紝鍙牴鎹笟鍔¤皟鏁�
+ ))
+ .values()
+ .stream()
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(workOrderList)) {
log.error("pointOnline鑾峰緱鎻掑叆宸ュ崟:{}",workOrderList);
@@ -363,6 +380,31 @@
vo.setUpdateTime(now);
return vo;
}).collect(Collectors.toList());
+ log.info("鎵撳嵃鐐逛綅鍦ㄧ嚎(浼樹簯)闇�瑕佷慨鏀圭殑鐘舵��:{}",willUpdateList);
+ log.info("鎵撳嵃鐐逛綅鍦ㄧ嚎(浼樹簯)闇�瑕佷慨鏀圭殑澶у皬:{}",willUpdateList.size());
+ Map<Integer, Long> statusCountMap = willUpdateList.stream()
+ .collect(Collectors.groupingBy(
+ item -> {
+ int online = item.getOnline();
+ // 鑷畾涔夊垎缁勮鍒欙細-1銆�1 鍗曠嫭鍒嗙粍锛屽叾浠栧綊涓� 0锛堟垨鍏朵粬鏍囪瘑锛�
+ if (online == -1) {
+ return -1;
+ } else if (online == 1) {
+ return 1;
+ } else {
+ return 0; // 鐢� 0 浠ｈ〃鍏朵粬鐘舵��
+ }
+ },
+ Collectors.counting() // 缁熻姣忎釜鍒嗙粍鐨勬暟閲�
+ ));
+
+ // 浠巑ap涓幏鍙栧悇鐘舵�佺殑鏁伴噺锛堥粯璁ゅ�间负0锛岄伩鍏嶇┖鎸囬拡锛�
+ long offlineCount = statusCountMap.getOrDefault(-1, 0L); // -1鐘舵�佺殑鏁伴噺
+ long onlineCount = statusCountMap.getOrDefault(1, 0L); // 1鐘舵�佺殑鏁伴噺
+ long otherCount = statusCountMap.getOrDefault(0, 0L); // 鍏朵粬鐘舵�佺殑鏁伴噺
+ log.info("鎵撳嵃鐐逛綅鍦ㄧ嚎(浼樹簯)闇�瑕佷慨鏀圭绾垮ぇ灏�:{}",offlineCount);
+ log.info("鎵撳嵃鐐逛綅鍦ㄧ嚎(浼樹簯)闇�瑕佷慨鏀瑰湪绾垮ぇ灏�:{}",onlineCount);
+ log.info("鎵撳嵃鐐逛綅鍦ㄧ嚎(浼樹簯)闇�瑕佷慨鏀瑰叾浠栫姸鎬佸ぇ灏�:{}",otherCount);
monitorMapper.updateOnlineFromUyOrHk(willUpdateList);
//绂荤嚎鐢熸垚宸ュ崟,涓�涓猧p鍙敓鎴愪竴涓伐鍗�
List<VideoOnlineResult> workOrders = new ArrayList<>(records.stream()
@@ -416,8 +458,10 @@
instance.setTime(new Date());
instance.add(Calendar.DAY_OF_MONTH, -1);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
String yesterday = format.format(instance.getTime());
param.setStatTime(yesterday);
+ log.error("寮�濮嬪悓姝ongodb褰曞儚鍙敤鏁版嵁鏃ユ湡涓簕}",yesterday);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
double minTime = getSySMinTime();
AtomicReference<Integer> count = new AtomicReference<>(0);
--
Gitblit v1.8.0