From 27bf1aad170bc78af274a596ce5c89caaa903ce3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 03:34:45 +0800
Subject: [PATCH] 合同积分回显
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 42 +++++++++---------------------------------
1 files changed, 9 insertions(+), 33 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 ae12191..4fe81b8 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -66,12 +66,6 @@
*/
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())));
@@ -114,7 +108,7 @@
}
}
//鏈煡鍝佺墝鎴栬�卆pi璋冪敤澶辫触锛屾尐涓墽琛屾墍鏈塧pi
- OSDResult osd = tryAllApi(monitor, hkList, dhList, ysList);
+ OSDResult osd = tryAllApi(monitor);
if (osd != null) {
synchronized (osdResultList) {
osdResultList.add(osd);
@@ -158,16 +152,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 +168,7 @@
osdCheckResult.setOsdPart(osdResult.getOSD3());
osdCheckResult.setOsdLB(osdResult.getOSD4());
osdCheckResult.setOsdName(osdResult.getName());
+ osdCheckResult.setDeviceBrand(osdResult.getDeviceBrand());
return osdCheckResult;
}
@@ -193,7 +178,7 @@
long checkTime = osdResult.getCheckTime().getTime();
long osdTime = osdResult.getOsdTime().getTime();
long timeDiff = (checkTime - osdTime) / 1000;
- if (timeDiff <=60) {
+ if (timeDiff <= 60) {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Correct);
} else {
osdCheckResult.setOsdTimeCorrect(ApiConstants.OSD_Error);
@@ -202,10 +187,10 @@
//妫�鏌ラ�氶亾鍚嶆槸鍚︽纭�
//鏍￠獙瑙勫垯锛岃繖閲屾殏鏃朵笉姣旇緝鍏ㄦ櫙鍜岀粏鑺備袱瀛椼��
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()) || monitor.getName().replace("鍏ㄦ櫙", "缁嗚妭").equals(osdResult.getName()) || monitor.getName().replace("缁嗚妭", "鍏ㄦ櫙").equals(osdResult.getName())) {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Correct);
osdCheckResult.setOsdName(osdResult.getName());
- }else {
+ } else {
osdCheckResult.setOsdNameCorrect(ApiConstants.OSD_Error);
}
}
@@ -248,35 +233,26 @@
}
}
- 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());
- }
+ log.info("娴峰悍璋冪敤鎴愬姛" + hkosd);
return hkosd;
}
//灏濊瘯澶у崕鐨刟pi
OSDResult dhosd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
if (dhosd != null) {
dhosd.setSerialNumber(monitor.getSerialNumber());
- log.info("澶у崕璋冪敤鎴愬姛"+dhosd);
- synchronized (dhList) {
- dhList.add(monitor.getSerialNumber());
- }
+ log.info("澶у崕璋冪敤鎴愬姛" + dhosd);
return dhosd;
}
//瀹囪api
OSDResult ysosd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
- log.info("瀹囪璋冪敤鎴愬姛"+ysosd);
- synchronized (ysList) {
- ysList.add(monitor.getSerialNumber());
- }
+ log.info("瀹囪璋冪敤鎴愬姛" + ysosd);
return ysosd;
}
return null;
--
Gitblit v1.8.0