From 46c0be4ad0028db3d9a41e29d9a5b46ab46056a0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 18:17:46 +0800
Subject: [PATCH] 省厅标签拆分2
---
ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java | 14 ++++----------
1 files changed, 4 insertions(+), 10 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 f07f09f..083a301 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -90,20 +90,18 @@
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(), HKUserName, HKPassword);
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.getSerialNumber(),monitor.getIp(), DHUserName, DHPassword);
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("澶у崕璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
@@ -113,7 +111,6 @@
OSDResult osd = YSApi.getOsd(monitor.getIp(), YSUserName, YSPassword);
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
- log.info("瀹囪璋冪敤鎴愬姛" + osd);
return osd;
}else {
return null;
@@ -126,24 +123,21 @@
private OSDResult tryAllApi(TMonitor monitor) {
//灏濊瘯娴峰悍鐨刟pi
- OSDResult hkosd = HKApi.getOsdByIP(monitor.getIp(), HKUserName, HKPassword);
+ OSDResult hkosd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(), HKUserName, HKPassword);
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.getSerialNumber(),monitor.getIp(), DHUserName, DHPassword);
if (dhosd != null) {
dhosd.setSerialNumber(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);
return ysosd;
}
return null;
--
Gitblit v1.8.0