From fea22e82e7e49691f6e0c20a29b228d0ab3173e9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 29 十月 2025 17:08:38 +0800
Subject: [PATCH] 修改问题

---
 ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java |   75 ++++---------------------------------
 1 files changed, 8 insertions(+), 67 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 083a301..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,21 +13,9 @@
 @Slf4j
 public class OSDCheckThread implements Callable<OSDResult> {
     private TMonitor monitor;
-    public String HKUserName;
-    public String HKPassword;
-    public String DHUserName;
-    public String DHPassword;
-    public String YSUserName;
-    public String YSPassword;
 
-    public OSDCheckThread(TMonitor monitor, String HKUserName, String HKPassword, String DHUserName, String DHPassword, String YSUserName, String YSPassword) {
+    public OSDCheckThread(TMonitor monitor) {
         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,59 +26,11 @@
         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.getSerialNumber(),monitor.getIp(), HKUserName, HKPassword);
+            OSDResult osd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
             OSDResult osdResult = checkSuccess(monitor, osd);
             if (osdResult!=null) {
                 return osd;
@@ -99,7 +39,7 @@
             }
         } else if (DeviceType.DH.getType().equals(monitor.getDeviceType())) {
             //澶у崕
-            OSDResult osd = DHApi.getOsd(monitor.getSerialNumber(),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) {
                 return osd;
@@ -108,7 +48,8 @@
             }
         } 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) {
                 return osd;
@@ -123,19 +64,19 @@
 
     private OSDResult tryAllApi(TMonitor monitor) {
         //灏濊瘯娴峰悍鐨刟pi
-        OSDResult hkosd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(), HKUserName, HKPassword);
+        OSDResult hkosd = HKApi.getOsdByIP(monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
         if (hkosd != null) {
             hkosd.setSerialNumber(monitor.getSerialNumber());
             return hkosd;
         }
         //灏濊瘯澶у崕鐨刟pi
-        OSDResult dhosd = DHApi.getOsd(monitor.getSerialNumber(),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());
             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());
             return ysosd;

--
Gitblit v1.8.0