From 4a293865ac437a812eea8800cc0b04314efbd210 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 24 十月 2023 10:06:24 +0800
Subject: [PATCH] 异步登录增加延迟时间避免接口频繁 修改大华通道数量获取

---
 ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java
index 3ff2550..73e5d65 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java
@@ -18,7 +18,7 @@
     public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE;
 
     // 璁惧淇℃伅
-    public static NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
+  //  public static NetSDKLib.NET_DEVICEINFO_Ex m_stDeviceInfo = new NetSDKLib.NET_DEVICEINFO_Ex();
 
     // 鐧婚檰鍙ユ焺
     public static LLong m_hLoginHandle = new LLong(0);//
@@ -66,7 +66,6 @@
         int tryTimes = 1;    //鐧诲綍鏃跺皾璇曞缓绔嬮摼鎺�1娆�
         netsdk.CLIENT_SetConnectTime(waitTime, tryTimes);
 
-
         // 璁剧疆鏇村缃戠粶鍙傛暟锛孨ET_PARAM鐨刵Waittime锛宯ConnectTryNum鎴愬憳涓嶤LIENT_SetConnectTime
         // 鎺ュ彛璁剧疆鐨勭櫥褰曡澶囪秴鏃舵椂闂村拰灏濊瘯娆℃暟鎰忎箟鐩稿悓,鍙��
         NetSDKLib.NET_PARAM netParam = new NetSDKLib.NET_PARAM();
@@ -102,7 +101,7 @@
      * 鐧诲綍璁惧
      * \endif
      */
-    public static LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword) {
+    public static LLong login(String m_strIp, int m_nPort, String m_strUser, String m_strPassword, NetSDKLib.NET_DEVICEINFO_Ex lpDeviceInfo) {
         IntByReference nError = new IntByReference(0);
         //鍏ュ弬
         NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY pstInParam = new NET_IN_LOGIN_WITH_HIGHLEVEL_SECURITY();
@@ -111,9 +110,8 @@
         pstInParam.szPassword = m_strPassword.getBytes();
         pstInParam.szUserName = m_strUser.getBytes();
         //鍑哄弬
-        NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam = new NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY();
-        pstOutParam.stuDeviceInfo = m_stDeviceInfo;
-        LLong m_hLoginHandle = netsdk.CLIENT_LoginEx2(m_strIp, m_nPort, m_strUser, m_strPassword, 0, null, m_stDeviceInfo, nError);
+        //NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY pstOutParam = new NET_OUT_LOGIN_WITH_HIGHLEVEL_SECURITY();
+        LLong m_hLoginHandle = netsdk.CLIENT_LoginEx2(m_strIp, m_nPort, m_strUser, m_strPassword, 0, null, lpDeviceInfo, nError);
         //m_hLoginHandle=netsdk.CLIENT_LoginWithHighLevelSecurity(pstInParam, pstOutParam);
         if (m_hLoginHandle.longValue() == 0) {
             log.debug("Login Device[%s] Port[%d]Failed. %s\n", m_strIp, m_nPort, getErrorCodePrint());

--
Gitblit v1.9.3