From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
index ab6dbe5..8a4c4d2 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -13,18 +13,6 @@
@Slf4j
public class OSDCheckThread implements Callable<OSDResult> {
private TMonitor monitor;
- @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;
public OSDCheckThread(TMonitor monitor) {
this.monitor = monitor;
@@ -42,30 +30,28 @@
public OSDResult call() throws Exception {
if (DeviceType.HK.getType().equals(monitor.getDeviceType())) {
//娴峰悍
- OSDResult osd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
+ OSDResult osd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("娴峰悍璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
}
} else if (DeviceType.DH.getType().equals(monitor.getDeviceType())) {
//澶у崕
- OSDResult osd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
+ OSDResult osd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("澶у崕璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
}
} else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
//瀹囪
- OSDResult osd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
+ OSDResult osd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("瀹囪璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
@@ -78,24 +64,21 @@
private OSDResult tryAllApi(TMonitor monitor) {
//灏濊瘯娴峰悍鐨刟pi
- OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
+ OSDResult hkosd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
if (hkosd != null) {
hkosd.setSerialNumber(monitor.getSerialNumber());
- log.info("娴峰悍璋冪敤鎴愬姛" + hkosd);
return hkosd;
}
//灏濊瘯澶у崕鐨刟pi
- OSDResult dhosd = DHApi.getOsd(monitor.getIp(), DHUserName, DHPassword);
+ OSDResult dhosd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
if (dhosd != null) {
dhosd.setSerialNumber(monitor.getSerialNumber());
- log.info("澶у崕璋冪敤鎴愬姛" + dhosd);
return dhosd;
}
//瀹囪api
- OSDResult ysosd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
+ OSDResult ysosd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
- log.info("瀹囪璋冪敤鎴愬姛" + ysosd);
return ysosd;
}
return null;
--
Gitblit v1.8.0