From 2a2885f45160b4048a27e75d5be03ba9232c7363 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 10 九月 2024 17:34:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 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 222a915..0c493a9 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -64,14 +64,9 @@
* 姣斿mongoDB涓�鏈轰竴妗ｄ俊鎭紝鏁寸悊鎴恟esult瀛樺叆mongo
* 鍚屾鍝佺墝鍒癿ysql
*/
+ //TODO锛氬ぇ鍗庡姩鎬佸簱linux鎹綅缃�
public void getOSD() {
log.info("寮�濮嬭幏鍙朞SD");
- //鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎
- List<String> hkList = new ArrayList<>();
- //鎵归噺淇敼澶у崕鍝佺墝闆嗗悎
- List<String> dhList = new ArrayList<>();
- //鎵归噺淇敼瀹囪鍝佺墝闆嗗悎
- List<String> ysList = new ArrayList<>();
List<OSDResult> osdResultList = new ArrayList<>();
//鏌ヤ竴鏈轰竴妗onitor
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -79,8 +74,8 @@
//闇�瑕佽�冩牳鐨勬暟鎹�
List<String> serialNumbers = oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(serialNumbers)) {
- ExecutorService executorService = new ThreadPoolExecutor(8,
- 24,
+ ExecutorService executorService = new ThreadPoolExecutor(16,
+ 128,
5000,
TimeUnit.SECONDS,
new ArrayBlockingQueue<>(1000),
@@ -114,7 +109,7 @@
}
}
//鏈煡鍝佺墝鎴栬�卆pi璋冪敤澶辫触锛屾尐涓墽琛屾墍鏈塧pi
- OSDResult osd = tryAllApi(monitor, hkList, dhList, ysList);
+ OSDResult osd = tryAllApi(monitor);
if (osd != null) {
synchronized (osdResultList) {
osdResultList.add(osd);
@@ -158,16 +153,6 @@
// 宸ュ崟鐢熸垚
uyErrorTypeCheckService.osdCheck(checkResults);
}
- //淇敼鏁版嵁搴撳搧鐗�
- if (!CollectionUtils.isEmpty(hkList)) {
- monitorMapper.batchUpdateDeviceType(hkList, DeviceType.HK.getType());
- }
- if (!CollectionUtils.isEmpty(dhList)) {
- monitorMapper.batchUpdateDeviceType(dhList, DeviceType.DH.getType());
- }
- if (!CollectionUtils.isEmpty(ysList)) {
- monitorMapper.batchUpdateDeviceType(ysList, DeviceType.YS.getType());
- }
}
log.info("缁撴潫鑾峰彇OSD");
}
@@ -184,6 +169,7 @@
osdCheckResult.setOsdPart(osdResult.getOSD3());
osdCheckResult.setOsdLB(osdResult.getOSD4());
osdCheckResult.setOsdName(osdResult.getName());
+ osdCheckResult.setDeviceBrand(osdResult.getDeviceBrand());
return osdCheckResult;
}
@@ -248,15 +234,12 @@
}
}
- private OSDResult tryAllApi(TMonitor monitor, List<String> hkList, List<String> dhList, List<String> ysList) {
+ private OSDResult tryAllApi(TMonitor monitor) {
//灏濊瘯娴峰悍鐨刟pi
OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
if (hkosd != null) {
hkosd.setSerialNumber(monitor.getSerialNumber());
log.info("娴峰悍璋冪敤鎴愬姛" + hkosd);
- synchronized (hkList) {
- hkList.add(monitor.getSerialNumber());
- }
return hkosd;
}
//灏濊瘯澶у崕鐨刟pi
@@ -264,9 +247,6 @@
if (dhosd != null) {
dhosd.setSerialNumber(monitor.getSerialNumber());
log.info("澶у崕璋冪敤鎴愬姛" + dhosd);
- synchronized (dhList) {
- dhList.add(monitor.getSerialNumber());
- }
return dhosd;
}
//瀹囪api
@@ -274,9 +254,6 @@
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
log.info("瀹囪璋冪敤鎴愬姛" + ysosd);
- synchronized (ysList) {
- ysList.add(monitor.getSerialNumber());
- }
return ysosd;
}
return null;
--
Gitblit v1.8.0