From 863ed88326ca250edab9a1fd46153f81319ce102 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 15 十一月 2024 11:37:11 +0800
Subject: [PATCH] 在线监测对于纯车辆人脸可以恢复在线状态
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 61 ++++++++++++++++++++++++------
1 files changed, 49 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 1e268ab..1eca90f 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -12,6 +12,7 @@
import com.ycl.platform.domain.vo.OnlineThreadVO;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.UYErrorTypeCheckService;
+import com.ycl.platform.service.YwPointService;
import com.ycl.thread.OSDCheckThread;
import com.ycl.utils.DateUtils;
import com.ycl.utils.StringUtils;
@@ -44,16 +45,40 @@
private TMonitorMapper monitorMapper;
@Autowired
private UYErrorTypeCheckService uyErrorTypeCheckService;
-
+ @Autowired
+ private YwPointService pointService;
+ @Value("${HK.userName}")
+ public String HKUserName;
+ @Value("${HK.password}")
+ public String HKPassword;
+ @Value("${DH.userName}")
+ public String DHUserName;
+ @Value("${DH.password}")
+ public String DHPassword;
+ @Value("${YS.userName}")
+ public String YSUserName;
+ @Value("${YS.password}")
+ public String YSPassword;
/**
* 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
* 閫氳繃璁惧ip銆佸搧鐗岃皟鐢ㄤ笉鍚宎pi鑾峰彇osd淇℃伅
* 姣斿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);
@@ -73,7 +98,7 @@
List<Future<OSDResult>> futureList = new ArrayList<>(48);
List<OSDResult> osdResultList = new ArrayList<>();
for (TMonitor monitor : monitors) {
- OSDCheckThread thread = new OSDCheckThread(monitor);
+ OSDCheckThread thread = new OSDCheckThread(monitor,HKUserName,HKPassword,DHUserName,DHPassword,YSUserName,YSPassword);
Future<OSDResult> future = executorService.submit(thread);
futureList.add(future);
}
@@ -86,12 +111,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
@@ -101,6 +127,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);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(checkResults);
// 宸ュ崟鐢熸垚
@@ -113,6 +140,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());
@@ -137,16 +165,19 @@
} 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())) {
@@ -155,6 +186,8 @@
} else {
osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdProvinceCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ュ競鏄惁姝ｇ‘
if (!StringUtils.isEmpty(osdResult.getOSD2())) {
@@ -163,15 +196,19 @@
} else {
osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdCityCorrect(ApiConstants.OSD_Unknown);
}
//妫�鏌ュ尯鍘挎槸鍚︽纭�
if (!StringUtils.isEmpty(osdResult.getOSD3())) {
AreaDeptEnum areaDeptEnum = AreaDeptEnum.fromCode(monitor.getSerialNumber().substring(0, 6));
- if (areaDeptEnum != null && osdResult.getOSD3().equals(areaDeptEnum.getName())) {
+ if (areaDeptEnum != null && osdResult.getOSD3().equals(areaDeptEnum.getOsdName())) {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Correct);
} else {
osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Error);
}
+ }else {
+ osdCheckResult.setOsdPartCorrect(ApiConstants.OSD_Unknown);
}
}
--
Gitblit v1.8.0