From 6f7cc7c14b4532120e9e6827ca0feb2c9aa4c2c7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 24 一月 2025 04:10:16 +0800
Subject: [PATCH] 利旧设备Osd，ping任务离线时间点取最近两条，工单审核bug，重点指挥图像调整
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 83c71f5..5f4f8b9 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -11,6 +11,7 @@
import com.ycl.api.HK.HKApi;
import com.ycl.api.YS.YSApi;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.BaseResult;
import com.ycl.platform.domain.result.OSDResult;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
@@ -142,8 +143,19 @@
//濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
Query pyQuery = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(pyQuery, OsdCheckResult.class);
+ List<OsdCheckResult> osdCheckResults = mongoTemplate.find(pyQuery, OsdCheckResult.class);
pointService.setDeviceTagByGB(checkResults, CheckConstants.Rule_Category_Video);
+ //娣诲姞鏃ф暟鎹繘鍘�
+ List<String> resultNos = checkResults.stream().map(BaseResult::getNo).collect(Collectors.toList());
+ if (!CollectionUtils.isEmpty(osdCheckResults)) {
+ for (OsdCheckResult mongoResult : osdCheckResults) {
+ //濡傛灉鏂扮殑缁撴灉涓病鏈夋棫鏁版嵁閭ｄ箞鍔犺繘鍘�
+ if (!resultNos.contains(mongoResult.getNo())) {
+ checkResults.add(mongoResult);
+ }
+ }
+ }
+ DeleteResult result = mongoTemplate.remove(pyQuery, OsdCheckResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(checkResults);
// 宸ュ崟鐢熸垚
@@ -231,7 +243,9 @@
public void test() throws ExecutionException, InterruptedException {
log.info("娴嬭瘯鑾峰彇OSD");
- OSDResult osd3 = DHApi.getOsd("51030446001320141102","51.95.68.3", DHUserName, DHPassword);
- log.info("澶у崕缁撴灉鏁版嵁:{}",osd3);
+ OSDResult osd3 = DHApi.getOsdOld("51030340001320207201", "51.95.34.20", DHUserName, DHPassword);
+ log.info("osd3:{}", osd3);
+ OSDResult osd4 = DHApi.getOsdOld("51030342001320173201", "51.95.33.174", DHUserName, DHPassword);
+ log.info("osd4:{}", osd4);
}
}
--
Gitblit v1.8.0