From 15a1b8a6cda205c10323b25578374e20165f3ff6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 09 一月 2025 10:22:15 +0800
Subject: [PATCH] OSD导出、点位管理新增用户名密码
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 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 4829199..9971b41 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -17,6 +17,7 @@
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
import constant.ApiConstants;
+import constant.CheckConstants;
import enumeration.DeviceType;
import enumeration.general.AreaDeptEnum;
import lombok.extern.slf4j.Slf4j;
@@ -65,9 +66,20 @@
* 姣斿mongoDB涓�鏈轰竴妗ｄ俊鎭紝鏁寸悊鎴恟esult瀛樺叆mongo
* 鍚屾鍝佺墝鍒癿ysql
*/
- //TODO锛氬ぇ鍗庡姩鎬佸簱linux鎹綅缃�
public void getOSD() throws ExecutionException, InterruptedException {
log.info("寮�濮嬭幏鍙朞SD");
+// //娴峰悍璁惧娴嬭瘯
+// //鍏ㄦ櫙
+// OSDResult osd1 = HKApi.getOsdByIP("51031140001320359101","51.95.99.112", HKUserName, HKPassword);
+// log.info("娴峰悍鍏ㄦ櫙:{}",osd1);
+// //缁嗚妭
+// OSDResult osd2 = HKApi.getOsdByIP("51031140001321359101","51.95.99.112", HKUserName, HKPassword);
+// log.info("娴峰悍缁嗚妭:{}",osd2);
+// //澶у崕璁惧娴嬭瘯
+// OSDResult osd3 = DHApi.getOsd("51030244001320120201","51.95.4.3", DHUserName, DHPassword);
+// log.info("澶у崕鍏ㄦ櫙:{}",osd3);
+// OSDResult osd4 = DHApi.getOsd("51030244001321120201","51.95.4.3", DHUserName, DHPassword);
+// log.info("澶у崕缁嗚妭:{}",osd4);
//鏌ヤ竴鏈轰竴妗onitor
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
List<MonitorQualifyResult> oneMachineFileResults = mongoTemplate.find(query, MonitorQualifyResult.class);
@@ -87,7 +99,7 @@
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);
}
@@ -100,12 +112,13 @@
List<OsdCheckResult> checkResults = new ArrayList<>();
Map<String, TMonitor> monitorMap = monitors.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
for (OSDResult osdResult : osdResultList) {
- TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
- //灏佽OsdCheckResult
- OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
- checkCorrect(osdResult, monitor, osdCheckResult);
- log.info("鏍￠獙缁撴灉锛歿}",osdCheckResult);
- checkResults.add(osdCheckResult);
+ if(osdResult!=null) {
+ TMonitor monitor = monitorMap.get(osdResult.getSerialNumber());
+ //灏佽OsdCheckResult
+ OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
+ checkCorrect(osdResult, monitor, osdCheckResult);
+ checkResults.add(osdCheckResult);
+ }
}
log.info("缁撴灉鏁版嵁澶у皬:{}", checkResults.size());
//缁撴灉瀛樺叆mongo
@@ -115,7 +128,7 @@
Query pyQuery = new Query(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(pyQuery, OsdCheckResult.class);
- pointService.setDeviceTagByGB(checkResults);
+ pointService.setDeviceTagByGB(checkResults,CheckConstants.Rule_Category_Video);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(checkResults);
// 宸ュ崟鐢熸垚
@@ -128,6 +141,7 @@
private OsdCheckResult getOsdCheckResult(OSDResult osdResult, TMonitor monitor) {
OsdCheckResult osdCheckResult = new OsdCheckResult();
osdCheckResult.setDeviceNo(osdResult.getSerialNumber());
+ osdCheckResult.setNo(osdResult.getSerialNumber());
osdCheckResult.setIp(monitor.getIp());
osdCheckResult.setDeviceType(monitor.getCameraFunType());
osdCheckResult.setCheckTime(osdResult.getCheckTime());
@@ -146,22 +160,25 @@
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 {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
- //鏍￠獙瑙勫垯锛岃繖閲屾殏鏃朵笉姣旇緝鍏ㄦ櫙鍜岀粏鑺備袱瀛椼��
if (!StringUtils.isEmpty(osdResult.getName()) && !StringUtils.isEmpty(monitor.getName())) {
- if (monitor.getName().equals(osdResult.getName()) || monitor.getName().replace("鍏ㄦ櫙", "缁嗚妭").equals(osdResult.getName()) || monitor.getName().replace("缁嗚妭", "鍏ㄦ櫙").equals(osdResult.getName())) {
+ if (monitor.getName().equals(osdResult.getName())) {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Correct);
osdCheckResult.setOsdName(osdResult.getName());
} else {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ョ渷鏄惁姝ｇ‘
if (!StringUtils.isEmpty(osdResult.getOSD1())) {
@@ -170,6 +187,8 @@
} else {
osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ュ競鏄惁姝ｇ‘
if (!StringUtils.isEmpty(osdResult.getOSD2())) {
@@ -178,6 +197,8 @@
} else {
osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ュ尯鍘挎槸鍚︽纭�
if (!StringUtils.isEmpty(osdResult.getOSD3())) {
@@ -187,6 +208,8 @@
} else {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Unknown);
}
}
--
Gitblit v1.8.0