From 6a26b1d539576a556d0f8682af7ae4317de78c7a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 02 四月 2024 13:35:35 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index 8f1a9b0..de2805a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -59,12 +59,11 @@
*/
@Override
public void run(ApplicationArguments args) {
-
try {
// 浠巃rdCamerasService涓幏鍙朅rdCameras鍒楄〃
List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
for (ArdCameras camera : ardCameras) {
- login(camera);
+ asyncLogin(camera);
}
} catch (Exception ex) {
// 鍒濆鍖栫櫥褰曠浉鏈哄紓甯革紝璁板綍閿欒鏃ュ織
@@ -73,23 +72,35 @@
}
- //鐧诲綍
+ //鍚屾鐧诲綍
@Override
- public Boolean login(ArdCameras ardCamera) {
- boolean result = false;
+ public AjaxResult login(ArdCameras ardCamera) {
try {
- if (ardCamera != null) {
- String factory = ardCamera.getFactory();
- CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
- //sdkStrategy.login(ardCamera);//鍚屾鐧诲綍
- cameraSDK.asyncLogin(ardCamera);//寮傛鐧诲綍
- result = true;
+ if (ardCamera == null) {
+ return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
}
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.login(ardCamera);//鍚屾鐧诲綍
} catch (Exception ex) {
log.error("鐧诲綍寮傚父锛�" + ex.getMessage());
- return false;
+ return AjaxResult.error("鐧诲綍寮傚父锛�" + ex.getMessage());
}
- return result;
+ }
+
+ @Override
+ public AjaxResult asyncLogin(ArdCameras ardCamera) {
+ try {
+ if (ardCamera == null) {
+ return AjaxResult.error("鐧诲綍鐩告満澶辫触锛岀浉鏈轰笉瀛樺湪");
+ }
+ String factory = ardCamera.getFactory();
+ CameraSDK cameraSDK = cameraSDKFactory.createCameraSDK(factory);
+ return cameraSDK.asyncLogin(ardCamera);//寮傛鐧诲綍
+ } catch (Exception ex) {
+ log.error("鐧诲綍寮傚父锛�" + ex.getMessage());
+ return AjaxResult.error("鐧诲綍寮傚父锛�" + ex.getMessage());
+ }
}
//娉ㄩ攢
@@ -463,7 +474,7 @@
} catch (Exception ex) {
log.error("璁剧疆ptz寮傚父锛�" + ex.getMessage());
- return AjaxResult.error("璁剧疆ptz寮傚父:" + ex.getMessage());
+ return AjaxResult.error("璁剧疆ptz寮傚父:" + ex.getMessage());
}
}
@@ -689,8 +700,7 @@
public AjaxResult controlLock(CameraCmd cmd) {
String cameraId = cmd.getCameraId();//鐢宠閿佺殑鐩告満
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
- if(ardCameras==null)
- {
+ if (ardCameras == null) {
return AjaxResult.error("璁惧鏈櫥褰�");
}
Date now = new Date();
@@ -713,8 +723,7 @@
String cameraId = cmd.getCameraId();//鐢宠瑙ｉ攣鐨勭浉鏈�
String operator = cmd.getOperator();//鐢宠鑰�
ArdCameras ardCameras = ardCamerasService.selectArdCamerasById(cameraId);
- if(ardCameras==null)
- {
+ if (ardCameras == null) {
return AjaxResult.error("璁惧鏈櫥褰�");
}
if (ardCameras.getOperatorId().equals(operator)) {
--
Gitblit v1.9.3