From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数
---
ycl-server/src/main/java/com/ycl/api/DH/utils/DHApi.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 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 83a6a5c..c25df84 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
@@ -1,5 +1,6 @@
package com.ycl.api.DH.utils;
+import com.ycl.api.DH.lib.NetSDKLib;
import com.ycl.api.DH.module.LoginModule;
import com.ycl.platform.domain.result.OSDResult;
import lombok.extern.slf4j.Slf4j;
@@ -8,10 +9,29 @@
@Slf4j
public class DHApi {
- public static OSDResult getOsd(String ip, String userName, String password){
- LoginModule.login(ip, 80, userName, password);
- OSDResult osd = LoginModule.getOsd();
- LoginModule.logout();
+ public static OSDResult getOsd(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);
+ osd.setOSD1(osdOld.getOSD1());
+ osd.setOSD2(osdOld.getOSD2());
+ osd.setOSD3(osdOld.getOSD3());
+ osd.setName(osdOld.getName());
+ }
+ LoginModule.logout(loginId);
return osd;
}
+ public static OSDResult getOsdOld(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);
+ LoginModule.logout(loginId);
+ return osdOld;
+ }
}
--
Gitblit v1.8.0