From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 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 a50e42a..76e3edd 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -47,6 +47,18 @@
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淇℃伅
@@ -75,7 +87,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);
}
@@ -88,12 +100,14 @@
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);
+ log.info("鏍￠獙缁撴灉锛歿}", osdCheckResult);
+ checkResults.add(osdCheckResult);
+ }
}
log.info("缁撴灉鏁版嵁澶у皬:{}", checkResults.size());
//缁撴灉瀛樺叆mongo
--
Gitblit v1.8.0