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 |   76 +++++++++++++++++++++++++++++--------
 1 files changed, 59 insertions(+), 17 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..083a301 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -13,21 +13,21 @@
 @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) {
+    public OSDCheckThread(TMonitor monitor, String HKUserName, String HKPassword, String DHUserName, String DHPassword, String YSUserName, String YSPassword) {
         this.monitor = monitor;
+        this.HKUserName = HKUserName;
+        this.HKPassword = HKPassword;
+        this.DHUserName = DHUserName;
+        this.DHPassword = DHPassword;
+        this.YSUserName = YSUserName;
+        this.YSPassword = YSPassword;
     }
 
     public TMonitor getMonitor() {
@@ -38,24 +38,70 @@
         this.monitor = monitor;
     }
 
+    public String getHKUserName() {
+        return HKUserName;
+    }
+
+    public void setHKUserName(String HKUserName) {
+        this.HKUserName = HKUserName;
+    }
+
+    public String getHKPassword() {
+        return HKPassword;
+    }
+
+    public void setHKPassword(String HKPassword) {
+        this.HKPassword = HKPassword;
+    }
+
+    public String getDHUserName() {
+        return DHUserName;
+    }
+
+    public void setDHUserName(String DHUserName) {
+        this.DHUserName = DHUserName;
+    }
+
+    public String getDHPassword() {
+        return DHPassword;
+    }
+
+    public void setDHPassword(String DHPassword) {
+        this.DHPassword = DHPassword;
+    }
+
+    public String getYSUserName() {
+        return YSUserName;
+    }
+
+    public void setYSUserName(String YSUserName) {
+        this.YSUserName = YSUserName;
+    }
+
+    public String getYSPassword() {
+        return YSPassword;
+    }
+
+    public void setYSPassword(String YSPassword) {
+        this.YSPassword = YSPassword;
+    }
+
     @Override
     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;
@@ -65,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;
@@ -78,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