From 5c82602d54928cc414177084ab6d81cef4c11d15 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 11 三月 2025 09:33:25 +0800
Subject: [PATCH] getosd数组下标越界问题 以及 离线时间
---
ycl-server/src/main/java/com/ycl/api/DH/utils/DHApi.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/api/DH/utils/DHApi.java b/ycl-server/src/main/java/com/ycl/api/DH/utils/DHApi.java
index c25df84..f1c6fac 100644
--- a/ycl-server/src/main/java/com/ycl/api/DH/utils/DHApi.java
+++ b/ycl-server/src/main/java/com/ycl/api/DH/utils/DHApi.java
@@ -9,14 +9,14 @@
@Slf4j
public class DHApi {
- public static OSDResult getOsd(String serialNumber,String ip, String userName, String password){
+ public static OSDResult getOsd(String name,String serialNumber,String ip, String userName, String password){
NetSDKLib.LLong loginId = LoginModule.login(ip, 80, userName, password);
if(loginId.longValue() ==0){
return null;
}
OSDResult osd = LoginModule.getOsd(serialNumber,loginId);
if(osd!=null && osd.getOSD1() ==null &&osd.getOSD2()==null && osd.getOSD3()==null &&osd.getName()==null) {
- OSDResult osdOld = LoginModule.getOsdOld(serialNumber, loginId);
+ OSDResult osdOld = LoginModule.getOsdOld(name,serialNumber, loginId);
osd.setOSD1(osdOld.getOSD1());
osd.setOSD2(osdOld.getOSD2());
osd.setOSD3(osdOld.getOSD3());
@@ -25,12 +25,12 @@
LoginModule.logout(loginId);
return osd;
}
- public static OSDResult getOsdOld(String serialNumber,String ip, String userName, String password){
+ public static OSDResult getOsdOld(String name,String serialNumber,String ip, String userName, String password){
NetSDKLib.LLong loginId = LoginModule.login(ip, 80, userName, password);
if(loginId.longValue() ==0){
return null;
}
- OSDResult osdOld = LoginModule.getOsdOld(serialNumber, loginId);
+ OSDResult osdOld = LoginModule.getOsdOld(name,serialNumber, loginId);
LoginModule.logout(loginId);
return osdOld;
}
--
Gitblit v1.8.0