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 | 181 +++++++++++++++++++++++++++++++++------------
1 files changed, 133 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 bd06ad5..295ecff 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -3,7 +3,6 @@
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.param.UY.ImageDetectionParam;
import com.ycl.platform.domain.param.UY.MonitorQualifyParam;
@@ -16,20 +15,22 @@
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;
import com.ycl.system.domain.SysConfig;
import com.ycl.system.mapper.SysConfigMapper;
+import com.ycl.system.service.ISysConfigService;
import com.ycl.thread.OnlineCheckThread;
import com.ycl.utils.CheckPointUtil;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
-import constant.RedisConstant;
-import enumeration.ErrorType;
-import enumeration.general.WorkOrderStatusEnum;
+import constant.CheckConstants;
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;
@@ -41,6 +42,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -56,6 +58,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 +73,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 +105,7 @@
item.setNo(item.getDeviceId());
}
});
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records, CheckConstants.Rule_Category_Video);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
// 宸ュ崟鐢熸垚
@@ -151,7 +154,7 @@
item.setNo(item.getSerialNumber().getShowValue());
}
});
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Or);
pointService.setNew(records);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
@@ -189,11 +192,14 @@
} else {
log.error("璇烽厤缃绾挎鏁帮紝姝ゆ璁剧疆涓洪粯璁ゅ��2");
}
+
// 鍏堟煡鍑鸿澶嘔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()));
+ 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){
@@ -207,7 +213,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());
@@ -216,36 +222,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());
@@ -253,6 +229,7 @@
CompletableFuture<Void> allOf = CompletableFuture.allOf(
futureList.toArray(new CompletableFuture[0])
);
+
try {
allOf.get(60, TimeUnit.SECONDS); // 缁欎簣棰濆鐨�5绉掓潵鏀堕泦缁撴灉
} catch (TimeoutException e) {
@@ -266,37 +243,79 @@
.filter(Objects::nonNull)
.collect(Collectors.toList());
+
Date now = new Date();
List<String> offLineList = new ArrayList<>();
List<String> onLineList = new ArrayList<>();
+ List<String> unKnownList = 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 ("DX_闀垮緛澶ч亾璐″叴璺矾鍙ｄ笢鍗楁柟鍚慱鏋満_缁嗚妭".equals(item.getName())){
+// log.info("2.鏁版嵁娴佸叆:{}",item);
+// log.info("鎵撳嵃鐘舵�乸ingOnline锛歿}",item.getPingOnline());
+// }
+ if(item.getPingOnline()) {
onLineList.add(item.getIp());
} else if(!item.getPingOnline()) {
//绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎
offLineList.add(item.getIp());
+ }else {
+ unKnownList.add(item.getIp());
}
});
+
+ log.error("閫氳繃pingOnline鏈煡鐐逛綅鐨勯泦鍚堝ぇ灏�:{}",unKnownList.size());
+ log.error("閫氳繃pingOnline淇敼绂荤嚎绾跨殑鐐逛綅闆嗗悎澶у皬:{}",offLineList.size());
+ log.error("閫氳繃pingOnline淇敼鍦ㄧ嚎鐨勭偣浣嶉泦鍚堝ぇ灏�:{}",onLineList.size());
if(!CollectionUtils.isEmpty(offLineList)) {
monitorMapper.batchUpdateOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
+ monitorMapper.batchUpdatePingOnline(offLineList, now, ApiConstants.UY_OnlineSite_Offline);
}
if(!CollectionUtils.isEmpty(onLineList)) {
monitorMapper.batchUpdateOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
+ monitorMapper.batchUpdatePingOnline(onLineList, now, ApiConstants.UY_OnlineSite_Online);
}
//瀛樻斁鍒癿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());
+ }
+ //淇敼绾夸笂
+ if(mongoData.getPingOnline()){
+ mongoData.setOnline(1);
+ }
+ 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);
+
+ log.error("瀛樺叆鍚屾鍦ㄧ嚎mongo鏁版嵁{}" , mongoList );
+ 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(),
@@ -305,8 +324,16 @@
.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);
workOrderService.innerAddWorkOrder(workOrderList);
}
log.info("鐐逛綅鍦ㄧ嚎鐩戞祴瀹屾垚");
@@ -340,7 +367,8 @@
item.setNo(item.getDeviceId());
}
});
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
+ log.error("鐐逛綅鍦ㄧ嚎鐜囨彃鍏ユ暟鎹ぇ灏弡}",records.size());
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
//鏇存柊point琛ㄥ湪绾跨姸鎬�
@@ -352,7 +380,32 @@
vo.setUpdateTime(now);
return vo;
}).collect(Collectors.toList());
- monitorMapper.updateOnline(willUpdateList);
+ 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()
.filter(item -> ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()))
@@ -379,6 +432,21 @@
// uyErrorTypeCheckService.videoOnlineCheck(mongoTemplate.find(query, VideoOnlineResult.class));
log.info("缁撴潫鎵ц鐐逛綅鍦ㄧ嚎鏁版嵁鍚屾");
}
+ private final ISysConfigService configService;
+
+ public double getSySMinTime(){
+ //鑾峰彇绯荤粺鍙傛暟
+ String dictLabel = configService.selectConfigByKey("recording_min_time");
+ double recordingMinTime;
+ try {
+ recordingMinTime = Double.parseDouble(dictLabel) / 60; // 濡傛灉 dictLabel 鏄互灏忔椂涓哄崟浣嶏紝鍒欐棤闇�闄や互 60
+ } catch (Exception e) {
+ log.error("閰嶇疆鐨勫垹闄ゆ椂闂磋寖鍥存牸寮忎笉姝ｇ‘: {}", dictLabel, e);
+ return 12.0; // 榛樿 12 灏忔椂锛堜互灏忔椂涓哄崟浣嶏級
+ }
+
+ return recordingMinTime;
+ }
//褰曞儚鍙敤
public void recordMetaDSumTask() {
@@ -390,9 +458,13 @@
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);
if (jsonObject != null) {
if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
@@ -405,10 +477,23 @@
if (Objects.nonNull(item.getDeviceId())) {
item.setNo(item.getDeviceId());
}
+
+ //鍒ゆ柇 骞朵慨鏀瑰綍鍍忕己灏戠姸鎬�
+ if (item.getRecordStatus() != -1){
+
+ count.getAndSet(count.get() + 1);
+ if (item.getMissDuration() > minTime){
+ item.setRecordStatus(0);
+ }else if (item.getMissDuration() < minTime){
+ item.setRecordStatus(1);
+ }
+ }
});
//鎵撴爣绛�
- pointService.setDeviceTagByGB(records);
+ pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video);
+ log.error("鍙戠敓鐘舵�佹敼鍙樻暟閲�:{}",count);
//瀛樻斁鍦╩ongo涓�
+ log.error("鏂板mongodb鏁版嵁澶у皬锛歿}",records.size());
mongoTemplate.insertAll(records);
// // 宸ュ崟鐢熸垚
// uyErrorTypeCheckService.recordMetaDSumCheck(records);
--
Gitblit v1.8.0