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 |   55 +++++++++++++++++++++++++++++++------------------------
 1 files changed, 31 insertions(+), 24 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 bf0b78e..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,16 +1,19 @@
 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 {
-    //鍒濆鍖栫櫥褰�
-    void loginAll();
 
-    //鐧诲綍
-    Boolean login(ArdCameras ardCamera);
+    //鍚屾鐧诲綍
+    AjaxResult login(ArdCameras ardCamera);
+
+    //寮傛鐧诲綍
+    AjaxResult asyncLogin(ArdCameras ardCamera);
 
     //娉ㄩ攢
     boolean logout(String cameraId);
@@ -19,49 +22,49 @@
     boolean isOnLine(CameraCmd cmd);
 
     //浜戝彴鎺у埗
-    boolean pTZControl(CameraCmd cmd);
+    AjaxResult pTZControl(CameraCmd cmd);
 
     //璁剧疆鑱氱劍鍊�
-    boolean setFocusPos(CameraCmd cmd);
+    AjaxResult setFocusPos(CameraCmd cmd);
 
     //鑾峰彇鑱氱劍鍊�
-    int getFocusPos(CameraCmd cmd);
+    AjaxResult getFocusPos(CameraCmd cmd);
 
     //璁剧疆棰勭疆浣�
-    boolean setPreset(CameraCmd cmd);
+    AjaxResult setPreset(CameraCmd cmd);
 
     //璋冪敤棰勭疆浣�
-    boolean gotoPreset(CameraCmd cmd);
+    AjaxResult gotoPreset(CameraCmd cmd);
 
     //鑾峰彇鐮佹祦鍘嬬缉鍙傛暟
     Map<String, Object> getVideoCompressionCfg(CameraCmd cmd);
 
     //閫忛浘
-    boolean controlDefogcfg(CameraCmd cmd);
+    AjaxResult controlDefogcfg(CameraCmd cmd);
 
     //绾㈠
-    boolean controlInfrarecfg(CameraCmd cmd);
+    AjaxResult controlInfrarecfg(CameraCmd cmd);
 
     //鑱氱劍妯″紡
-    boolean controlFocusMode(CameraCmd cmd);
+    AjaxResult controlFocusMode(CameraCmd cmd);
 
     //鑾峰彇鑱氱劍妯″紡
-    String getFocusMode(CameraCmd cmd);
+    AjaxResult getFocusMode(CameraCmd cmd);
 
     //浜戝彴鍔犵儹
-    boolean controlPTHeateRpwron(CameraCmd cmd);
+    AjaxResult controlPTHeateRpwron(CameraCmd cmd);
 
     //闀滃ご鍔犵儹闄ゅ啺
-    boolean controlCameraDeicing(CameraCmd cmd);
+    AjaxResult controlCameraDeicing(CameraCmd cmd);
 
     //閰嶇疆閿佸畾
-    boolean controlLock(CameraCmd cmd);
+    AjaxResult controlLock(CameraCmd cmd);
 
     //閰嶇疆瑙ｉ攣
-    boolean controlUnLock(CameraCmd cmd);
+    AjaxResult controlUnLock(CameraCmd cmd);
 
     //鑾峰彇浜戝彴閿佸畾淇℃伅
-    int getPTZLockInfo(CameraCmd cmd);
+    AjaxResult getPTZLockInfo(CameraCmd cmd);
 
     //鎶撳浘-杩旂粰鍓嶇浜岃繘鍒舵祦
     String captureJPEGPicture(CameraCmd cmd);
@@ -70,18 +73,22 @@
     String picCutCate(CameraCmd cmd);
 
     //ptz 涓夊潗鏍�
-    Map<String, Object> getPtz(CameraCmd cmd);
+    AjaxResult getPtz(CameraCmd cmd);
 
     //鑾峰彇ptz鑼冨洿
-    Map<String, Object> getPtzScope(CameraCmd cmd);
+    AjaxResult getPtzScope(CameraCmd cmd);
 
-    boolean setPtz(CameraCmd cmd);
+    //璁剧疆ptz
+    AjaxResult setPtz(CameraCmd cmd);
 
     //璁剧疆闆舵柟浣嶈
-    boolean setZeroPtz(CameraCmd cmd);
+    AjaxResult setZeroPtz(CameraCmd cmd);
 
     //寮曞鐩爣浣嶇疆
-    boolean guideTargetPosition(CameraCmd cmd);
+    AjaxResult guideTargetPosition(CameraCmd cmd);
+
+    //寮曞鐩爣浜�
+    AjaxResult guideTargetWell(CameraCmd cmd);
 
     //褰曞儚
     String record(CameraCmd cmd);
@@ -96,5 +103,5 @@
     boolean recordStopNotToMinio(CameraCmd cmd);
 
     //鑾峰彇GIS淇℃伅鏁版嵁
-    Map<String, Object> getGisInfo(CameraCmd cmd);
+    AjaxResult getGisInfo(CameraCmd cmd);
 }

--
Gitblit v1.9.3