From b802e81da449baa2cb4ec23deb02055d3a8f8f5c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 02 四月 2024 14:11:23 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 2 ++
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java | 6 +++---
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index b5727f2..2b7d10e 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -116,6 +116,7 @@
camera.setState("0");
int i = ardCamerasService.insertArdCameras(camera);
if (i > 0) {
+ cameraSdkService.logout(camera.getId());
AjaxResult result = cameraSdkService.login(camera);
return success(result.get("msg"));
} else {
@@ -140,6 +141,7 @@
camera.setState("0");
int i = ardCamerasService.updateArdCameras(camera);
if (i > 0) {
+ cameraSdkService.logout(camera.getId());
AjaxResult result = cameraSdkService.login(camera);
return success(result.get("msg"));
} else {
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
index 990676d..e7ce57e 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java
@@ -171,10 +171,10 @@
//鍚姩闃熷垪澶勭悊鍣�
queueHandler.process(camera.getId());
}
- return AjaxResult.success("鐧诲綍鎴愬姛");
+ return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
- log.error("鐧诲綍寮傚父:" + ex.getMessage());
- return AjaxResult.error("鐧诲綍寮傚父:" + ex.getMessage());
+ log.error("璁惧鐧诲綍寮傚父:" + ex.getMessage());
+ return AjaxResult.error("璁惧鐧诲綍寮傚父:" + ex.getMessage());
}
}
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 1193b37..3f8969b 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
@@ -121,7 +121,7 @@
ardChannelService.deleteArdChannelByDeviceId(camera.getId());
ardCamerasService.updateArdCameras(camera);
log.error("璁惧[" + camera.getIp() + ":" + camera.getPort() + "]鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
- return AjaxResult.error("鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
+ return AjaxResult.error("璁惧鐧诲綍澶辫触: errorCode:" + errorCode + " errorInfo:" + SdkErrorCodeEnum.getDescByCode(errorCode));
}
log.debug("Login Success [ " + camera.getIp() + ":" + camera.getPort() + " ]");
@@ -168,8 +168,8 @@
ardCamerasService.updateArdCameras(camera);
return AjaxResult.success("璁惧鐧诲綍鎴愬姛");
} catch (Exception ex) {
- log.error("娉ㄥ唽璁惧寮傚父", ex);
- return AjaxResult.error("娉ㄥ唽璁惧寮傚父" + ex.getMessage());
+ log.error("璁惧鐧诲綍寮傚父", ex);
+ return AjaxResult.error("璁惧鐧诲綍寮傚父" + ex.getMessage());
}
}
--
Gitblit v1.9.3