From dbf1793b62b69f824a401242cfd5430dd4992fa8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 十一月 2024 12:01:14 +0800
Subject: [PATCH] 运行监控导出
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 16 +++++++++++++---
1 files changed, 13 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 1a5a659..1eca90f 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -67,6 +67,18 @@
*/
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);
@@ -104,7 +116,6 @@
//灏佽OsdCheckResult
OsdCheckResult osdCheckResult = getOsdCheckResult(osdResult, monitor);
checkCorrect(osdResult, monitor, osdCheckResult);
- log.info("鏍￠獙缁撴灉锛歿}", osdCheckResult);
checkResults.add(osdCheckResult);
}
}
@@ -158,9 +169,8 @@
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 {
--
Gitblit v1.8.0