From 2f3bbf0372e5c1f8b6b1426db2c14b3595cb0968 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 30 四月 2025 17:10:52 +0800
Subject: [PATCH] 订单下发，订单下发定时任务处理
---
ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 1d8863b..8a4c4d2 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -39,7 +39,7 @@
}
} else if (DeviceType.DH.getType().equals(monitor.getDeviceType())) {
//澶у崕
- OSDResult osd = DHApi.getOsd(monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+ OSDResult osd = DHApi.getOsd(monitor.getName(),monitor.getSerialNumber(),monitor.getIp(), monitor.getUsername(),monitor.getPassword());
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
return osd;
@@ -48,7 +48,8 @@
}
} else if (DeviceType.YS.getType().equals(monitor.getDeviceType())) {
//瀹囪
- OSDResult osd = YSApi.getOsd(monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+ OSDResult osd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
+
OSDResult osdResult = checkSuccess(monitor, osd);
if (osdResult!=null) {
return osd;
@@ -69,13 +70,13 @@
return hkosd;
}
//灏濊瘯澶у崕鐨刟pi
- OSDResult dhosd = DHApi.getOsd(monitor.getSerialNumber(),monitor.getIp(),monitor.getUsername(),monitor.getPassword());
+ 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(), monitor.getUsername(),monitor.getPassword());
+ OSDResult ysosd = YSApi.getOsd(monitor,monitor.getIp(), monitor.getUsername(),monitor.getPassword());
if (ysosd != null) {
ysosd.setSerialNumber(monitor.getSerialNumber());
return ysosd;
--
Gitblit v1.8.0