‘liusuyi’
2024-04-02 b802e81da449baa2cb4ec23deb02055d3a8f8f5c
修复相机密码脱敏导致的bug
已修改3个文件
14 ■■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/sdk/dhsdk/service/impl/DahuaSDK.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/impl/HikvisionSDK.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 {
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());
        }
    }
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());
        }
    }