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/module/ConfigModule.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java b/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java
index 1234d40..9d9d17a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java
+++ b/ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java
@@ -4,6 +4,7 @@
import com.ruoyi.device.dhsdk.lib.ToolKits;
import com.sun.jna.Structure;
import com.sun.jna.ptr.IntByReference;
+import lombok.extern.slf4j.Slf4j;
import static com.ruoyi.device.dhsdk.lib.ToolKits.getErrorCodePrint;
@@ -13,6 +14,7 @@
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�10鏈�14鏃�14:57:01
**/
+@Slf4j(topic = "dhSdk")
public class ConfigModule {
public static NetSDKLib netsdk = NetSDKLib.NETSDK_INSTANCE;
public static NetSDKLib configsdk = NetSDKLib.CONFIG_INSTANCE;
@@ -39,7 +41,7 @@
IntByReference intRetLen = new IntByReference();
stuInfo.write();
if (!netsdk.CLIENT_QueryRemotDevState(hLoginHandle, nType, nChn, stuInfo.getPointer(), stuInfo.size(), intRetLen, 3000)) {
- System.err.println("Config Failed!" + ToolKits.getErrorCodePrint());
+ log.error("Config Failed!" + ToolKits.getErrorCodePrint());
return false;
}
stuInfo.read();
@@ -67,11 +69,11 @@
cmdObject.read();
result = true;
} else {
- System.err.println("Parse " + strCmd + " Config Failed!" + ToolKits.getErrorCodePrint());
+ log.error("Parse " + strCmd + " Config Failed!" + ToolKits.getErrorCodePrint());
result = false;
}
} else {
- System.err.printf("Get %s Config Failed!Last Error = %s\n", strCmd, getErrorCodePrint());
+ log.error("Get %s Config Failed!Last Error = %s\n", strCmd, getErrorCodePrint());
result = false;
}
@@ -88,7 +90,7 @@
if (bRet) {
cmdObject.read();
} else {
- System.err.printf("Get %s Config Failed!Last Error = %s\n", strCmd, getErrorCodePrint());
+ log.error("Get %s Config Failed!Last Error = %s\n", strCmd, getErrorCodePrint());
result = false;
}
return result;
@@ -102,7 +104,7 @@
cmdObject.read();
result=true;
} else {
- System.err.println("GetConfig Failed!" + getErrorCodePrint());
+ log.error("GetConfig Failed!" + getErrorCodePrint());
result=false;
}
return result;
@@ -129,11 +131,11 @@
if (netsdk.CLIENT_SetNewDevConfig(hLoginHandle, strCmd, nChn, szBuffer, nBufferLen, error, restart, 3000)) {
result = true;
} else {
- System.err.printf("Set %s Config Failed! Last Error = %s\n", strCmd, getErrorCodePrint());
+ log.error("Set %s Config Failed! Last Error = %s\n", strCmd, getErrorCodePrint());
result = false;
}
} else {
- System.err.println("Packet " + strCmd + " Config Failed!" + getErrorCodePrint());
+ log.error("Packet " + strCmd + " Config Failed!" + getErrorCodePrint());
result = false;
}
--
Gitblit v1.9.3