From c33a9e7923e24b3fd8bad1a9e2cd2d1cf385105b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 02 四月 2024 08:54:28 +0800
Subject: [PATCH] 修复相机密码脱敏导致的bug
---
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 9eb2008..4aa2d0c 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
@@ -6,6 +6,7 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
import com.ruoyi.common.constant.CameraConstants;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.domain.DeptAndCamerasDto;
@@ -130,8 +131,10 @@
}
int i = ardCamerasService.updateArdCameras(camera);
if (i > 0) {
- cameraSdkService.logout(camera.getId());
- cameraSdkService.login(camera);
+ if(StringUtils.isNotNull(camera.getPassword())) {
+ cameraSdkService.logout(camera.getId());
+ cameraSdkService.login(camera);
+ }
}
return toAjax(i);
}
--
Gitblit v1.9.3