From bfebb3257d57c7b1906a09ac3b76af1bc9e62d25 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 09 三月 2024 17:18:58 +0800
Subject: [PATCH] 优化sdk日志 关闭定时任务日志remark不为空开启日志写入
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java | 5 +++++
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 2 +-
ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java | 3 ++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java
index fdd08ce..0895a90 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/common/SdkErrorCodeEnum.java
@@ -12,7 +12,8 @@
NET_DVR_PASSWORD_ERROR(1, "鐢ㄦ埛鍚嶅瘑鐮侀敊璇�傛敞鍐屾椂杈撳叆鐨勭敤鎴峰悕鎴栬�呭瘑鐮侀敊璇�"),
NET_DVR_NOINIT(3, "SDK鏈垵濮嬪寲"),
- NET_DVR_NETWORK_FAIL_CONNECT(7, "杩炴帴璁惧澶辫触銆傝澶囦笉鍦ㄧ嚎鎴栫綉缁滃師鍥犲紩璧风殑杩炴帴瓒呮椂绛�");
+ NET_DVR_NETWORK_FAIL_CONNECT(7, "杩炴帴璁惧澶辫触銆傝澶囦笉鍦ㄧ嚎鎴栫綉缁滃師鍥犲紩璧风殑杩炴帴瓒呮椂绛�"),
+ NET_DVR_NETWORK_RECV_TIMEOUT(10, "浠庤澶囨帴鏀舵暟鎹秴鏃�");
/**
* 鏋氫妇鐮�
*/
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
index 61a578e..bc691b3 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java
@@ -1323,7 +1323,7 @@
boolean bool = hCNetSDK.NET_DVR_SetDVRConfig(userId, NET_DVR_SET_CCDPARAMCFG_EX, chanNo, point, struDayNigh.size());
if (!bool) {
int code = hCNetSDK.NET_DVR_GetLastError();
- log.error("璁剧疆澶滆澶辫触,璇风◢鍚庨噸璇�" + code);
+ log.error("璁剧疆澶滆澶辫触 ErrorCode:{},ErrorInfo:{}",code, SdkErrorCodeEnum.getDescByCode(code));
} else {
log.debug("璁剧疆澶滆鎴愬姛");
}
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
index 731a5eb..be6bfcf 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
@@ -70,6 +70,11 @@
*/
protected void after(JobExecutionContext context, SysJob sysJob, Exception e)
{
+ //鍏抽棴鏃ュ織
+ if(sysJob.getRemark()==null)
+ {
+ return;
+ }
Date startTime = threadLocal.get();
threadLocal.remove();
--
Gitblit v1.9.3