From 4806b676dbbab4675e5ee43b4018f2cd9d43797f Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 23 十月 2023 17:15:09 +0800
Subject: [PATCH] 1. 将sdk动态链接库dll集成到项目内,提升部署便捷性； 2. 增加设备断线重连回调方法，打印相关日志； 3. 删除多余依赖，减小jar包体积； 4. 处理SDK日志打印；
---
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java
index 2a20d7e..80a104c 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java
@@ -77,7 +77,7 @@
List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(ardCamera);
for (ArdCameras camera : ardCameras) {
Thread.sleep(500);
- //寮傛鐧诲綍
+ //鐧诲綍
login(camera);
}
} catch (Exception ex) {
@@ -85,15 +85,6 @@
}
}
- /**
- * sdk鍒濆鍖�
- * 鍒樿嫃涔�
- * 2023/10/17 8:28:13
- */
- @Override
- public Boolean init() {
- return LoginModule.init(disConnect, haveReConnect); // 鎵撳紑宸ョ▼锛屽垵濮嬪寲
- }
/**
* 鐧诲綍
@@ -101,8 +92,8 @@
* 2023/10/17 8:28:13
*/
@Override
- @Async
public Boolean login(ArdCameras camera) {
+ LoginModule.init(disConnect, haveReConnect);
LLong loginId = LoginModule.login(camera.getIp(), camera.getPort(), camera.getUsername(), camera.getPassword());
if (loginId.longValue() > 0) {
//log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
@@ -168,7 +159,6 @@
ardCamerasService.updateArdCameras(camera);
return false;
}
-
return true;
}
@@ -912,7 +902,7 @@
// 璁惧鏂嚎鍥炶皟: 褰撹澶囧嚭鐜版柇绾挎椂锛孲DK浼氳皟鐢ㄨ鍑芥暟
private static class DisConnect implements NetSDKLib.fDisConnect {
public void invoke(LLong m_hLoginHandle, String pchDVRIP, int nDVRPort, Pointer dwUser) {
- System.out.printf("Device[%s] Port[%d] DisConnect!\n", pchDVRIP, nDVRPort);
+ log.warn("Device["+pchDVRIP+"] Port["+nDVRPort+"] DisConnect!");
}
}
@@ -920,7 +910,7 @@
private static class HaveReConnect implements NetSDKLib.fHaveReConnect {
@Override
public void invoke(LLong lLoginID, String pchDVRIP, int nDVRPort, Pointer dwUser) {
- System.out.printf("ReConnect Device[%s] Port[%d]\n", pchDVRIP, nDVRPort);
+ log.warn("ReConnect Device["+pchDVRIP+"] Port["+nDVRPort+"]");
}
}
--
Gitblit v1.9.3