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/ICameraSdkService.java | 207 ++++++++++++++++++++++++++-------------------------
1 files changed, 107 insertions(+), 100 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/ICameraSdkService.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/ICameraSdkService.java
index e210aad..8909eec 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/ICameraSdkService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/ICameraSdkService.java
@@ -1,100 +1,107 @@
-package com.ruoyi.device.camera.service;
-
-import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.device.camera.domain.CameraCmd;
-
-import java.util.Map;
-
-public interface ICameraSdkService {
- //sdk鍒濆鍖�
- void initSDK();
-
- //鐧诲綍
- Boolean login(ArdCameras ardCamera);
-
- //娉ㄩ攢
- boolean logout(String cameraId);
-
- //鍦ㄧ嚎鐘舵��
- boolean isOnLine(CameraCmd cmd);
-
- //浜戝彴鎺у埗
- boolean pTZControl(CameraCmd cmd);
-
- //璁剧疆鑱氱劍鍊�
- boolean setFocusPos(CameraCmd cmd);
-
- //鑾峰彇鑱氱劍鍊�
- int getFocusPos(CameraCmd cmd);
-
- //璁剧疆棰勭疆浣�
- boolean setPreset(CameraCmd cmd);
-
- //璋冪敤棰勭疆浣�
- boolean gotoPreset(CameraCmd cmd);
-
- //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
- Map<String, Object> getVideoCompressionCfg(CameraCmd cmd);
-
- //閫忛浘
- boolean controlDefogcfg(CameraCmd cmd);
-
- //绾㈠
- boolean controlInfrarecfg(CameraCmd cmd);
-
- //鑱氱劍妯″紡
- boolean controlFocusMode(CameraCmd cmd);
-
- //鑾峰彇鑱氱劍妯″紡
- String getFocusMode(CameraCmd cmd);
-
- //浜戝彴鍔犵儹
- boolean controlPTHeateRpwron(CameraCmd cmd);
-
- //闀滃ご鍔犵儹闄ゅ啺
- boolean controlCameraDeicing(CameraCmd cmd);
-
- //閰嶇疆閿佸畾
- boolean controlLock(CameraCmd cmd);
-
- //閰嶇疆瑙ｉ攣
- boolean controlUnLock(CameraCmd cmd);
-
- //鑾峰彇浜戝彴閿佸畾淇℃伅
- int getPTZLockInfo(CameraCmd cmd);
-
- //鎶撳浘-杩旂粰鍓嶇浜岃繘鍒舵祦
- String captureJPEGPicture(CameraCmd cmd);
-
- //鎶撳浘
- String picCutCate(CameraCmd cmd);
-
- //ptz 涓夊潗鏍�
- Map<String, Object> getPtz(CameraCmd cmd);
-
- //鑾峰彇ptz鑼冨洿
- Map<String, Object> getPtzScope(CameraCmd cmd);
-
- boolean setPtz(CameraCmd cmd);
-
- //璁剧疆闆舵柟浣嶈
- boolean setZeroPtz(CameraCmd cmd);
-
- //寮曞鐩爣浣嶇疆
- boolean guideTargetPosition(CameraCmd cmd);
-
- //褰曞儚
- String record(CameraCmd cmd);
-
- //鎵嬪姩寮�濮嬪綍鍍�
- boolean recordStart(CameraCmd cmd);
-
- //鎵嬪姩鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
- String recordStopToMinio(CameraCmd cmd);
-
- //鍋滄褰曞儚-涓嶄笂浼爉inio
- boolean recordStopNotToMinio(CameraCmd cmd);
-
- //鑾峰彇GIS淇℃伅鏁版嵁
- Map<String, Object> getGisInfo(CameraCmd cmd);
-}
+package com.ruoyi.device.camera.service;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.device.camera.domain.ArdCameras;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import org.springframework.scheduling.annotation.Async;
+
+import java.util.Map;
+
+public interface ICameraSdkService {
+
+ //鍚屾鐧诲綍
+ AjaxResult login(ArdCameras ardCamera);
+
+ //寮傛鐧诲綍
+ AjaxResult asyncLogin(ArdCameras ardCamera);
+
+ //娉ㄩ攢
+ boolean logout(String cameraId);
+
+ //鍦ㄧ嚎鐘舵��
+ boolean isOnLine(CameraCmd cmd);
+
+ //浜戝彴鎺у埗
+ AjaxResult pTZControl(CameraCmd cmd);
+
+ //璁剧疆鑱氱劍鍊�
+ AjaxResult setFocusPos(CameraCmd cmd);
+
+ //鑾峰彇鑱氱劍鍊�
+ AjaxResult getFocusPos(CameraCmd cmd);
+
+ //璁剧疆棰勭疆浣�
+ AjaxResult setPreset(CameraCmd cmd);
+
+ //璋冪敤棰勭疆浣�
+ AjaxResult gotoPreset(CameraCmd cmd);
+
+ //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
+ Map<String, Object> getVideoCompressionCfg(CameraCmd cmd);
+
+ //閫忛浘
+ AjaxResult controlDefogcfg(CameraCmd cmd);
+
+ //绾㈠
+ AjaxResult controlInfrarecfg(CameraCmd cmd);
+
+ //鑱氱劍妯″紡
+ AjaxResult controlFocusMode(CameraCmd cmd);
+
+ //鑾峰彇鑱氱劍妯″紡
+ AjaxResult getFocusMode(CameraCmd cmd);
+
+ //浜戝彴鍔犵儹
+ AjaxResult controlPTHeateRpwron(CameraCmd cmd);
+
+ //闀滃ご鍔犵儹闄ゅ啺
+ AjaxResult controlCameraDeicing(CameraCmd cmd);
+
+ //閰嶇疆閿佸畾
+ AjaxResult controlLock(CameraCmd cmd);
+
+ //閰嶇疆瑙ｉ攣
+ AjaxResult controlUnLock(CameraCmd cmd);
+
+ //鑾峰彇浜戝彴閿佸畾淇℃伅
+ AjaxResult getPTZLockInfo(CameraCmd cmd);
+
+ //鎶撳浘-杩旂粰鍓嶇浜岃繘鍒舵祦
+ String captureJPEGPicture(CameraCmd cmd);
+
+ //鎶撳浘
+ String picCutCate(CameraCmd cmd);
+
+ //ptz 涓夊潗鏍�
+ AjaxResult getPtz(CameraCmd cmd);
+
+ //鑾峰彇ptz鑼冨洿
+ AjaxResult getPtzScope(CameraCmd cmd);
+
+ //璁剧疆ptz
+ AjaxResult setPtz(CameraCmd cmd);
+
+ //璁剧疆闆舵柟浣嶈
+ AjaxResult setZeroPtz(CameraCmd cmd);
+
+ //寮曞鐩爣浣嶇疆
+ AjaxResult guideTargetPosition(CameraCmd cmd);
+
+ //寮曞鐩爣浜�
+ AjaxResult guideTargetWell(CameraCmd cmd);
+
+ //褰曞儚
+ String record(CameraCmd cmd);
+
+ //鎵嬪姩寮�濮嬪綍鍍�
+ boolean recordStart(CameraCmd cmd);
+
+ //鎵嬪姩鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
+ String recordStopToMinio(CameraCmd cmd);
+
+ //鍋滄褰曞儚-涓嶄笂浼爉inio
+ boolean recordStopNotToMinio(CameraCmd cmd);
+
+ //鑾峰彇GIS淇℃伅鏁版嵁
+ AjaxResult getGisInfo(CameraCmd cmd);
+}
--
Gitblit v1.9.3