From d864bab0b2104b35e8424084d6174efbc5538f32 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 15 一月 2025 16:28:08 +0800
Subject: [PATCH] 视频考核：优云的数据筛选出视频设备、资产管理、取消海康在线工单
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 d1fbf3d..2fab0ee 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -62,6 +62,7 @@
public String YSPassword;
/**
* 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
+ * 绛涢�夎棰戣澶�
* 閫氳繃璁惧ip銆佸搧鐗岃皟鐢ㄤ笉鍚宎pi鑾峰彇osd淇℃伅
* 姣斿mongoDB涓�鏈轰竴妗ｄ俊鎭紝鏁寸悊鎴恟esult瀛樺叆mongo
* 鍚屾鍝佺墝鍒癿ysql
@@ -94,12 +95,17 @@
new ThreadPoolExecutor.CallerRunsPolicy()
);
List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
- //杩囨护ip
- monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
+ //杩囨护鎺夋棤鏁坕p骞剁瓫閫夊嚭瑙嗛璁惧
+ monitors = monitors.stream()
+ .filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) &&
+ !"127.0.0.1".equals(monitor.getIp()) &&
+ monitor.getCameraFunType()!=null &&
+ monitor.getCameraFunType().contains("1"))
+ .collect(Collectors.toList());
List<Future<OSDResult>> futureList = new ArrayList<>(48);
List<OSDResult> osdResultList = new ArrayList<>();
for (TMonitor monitor : monitors) {
- OSDCheckThread thread = new OSDCheckThread(monitor,HKUserName,HKPassword,DHUserName,DHPassword,YSUserName,YSPassword);
+ OSDCheckThread thread = new OSDCheckThread(monitor);
Future<OSDResult> future = executorService.submit(thread);
futureList.add(future);
}
@@ -160,7 +166,7 @@
if (osdResult.getCheckTime() != null && osdResult.getOsdTime() != null) {
long checkTime = osdResult.getCheckTime().getTime();
long osdTime = osdResult.getOsdTime().getTime();
- long timeDiff = (checkTime - osdTime) / 1000;
+ long timeDiff = Math.abs((checkTime - osdTime) / 1000);
if (timeDiff <= 60) {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Correct);
} else {
--
Gitblit v1.8.0