From 55a4112533c958492078a5a94c90667e6cf5969c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 13 四月 2024 10:39:22 +0800
Subject: [PATCH] 修改获取附近车辆bug 修改默认所有相机启动引导队列

---
 ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java |   61 ++++++++++++++++++------------
 1 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
index 9bbcc39..c1d51b5 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
@@ -1,8 +1,11 @@
 package com.ruoyi.device.camera.factory;
 
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
 import com.ruoyi.device.channel.domain.ArdChannel;
+
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -14,10 +17,10 @@
 public interface CameraSDK {
 
     //鍚屾鐧诲綍
-    boolean login(ArdCameras cameras);
+    AjaxResult login(ArdCameras cameras);
 
     //寮傛鐧诲綍
-    void asyncLogin(ArdCameras cameras);
+    AjaxResult asyncLogin(ArdCameras cameras);
 
     //娉ㄩ攢
     boolean logout(String cameraId);
@@ -26,67 +29,72 @@
     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);
 
     //鑾峰彇浜戝彴閿佸畾淇℃伅
-    int getPTZLockInfo(CameraCmd cmd);
+    AjaxResult getPTZLockInfo(CameraCmd cmd);
 
-    //鎶撳浘-杩旂粰鍓嶇浜岃繘鍒舵祦
-    String captureJPEGPicture(CameraCmd cmd);
+    //鏈湴鎶撳浘
+    AjaxResult localCapture(CameraCmd cmd);
 
     //鎶撳浘
     String picCutCate(CameraCmd cmd);
+    //鑾峰彇ptz
+    AjaxResult getPtz(CameraCmd cmd);
 
-    //ptz 涓夊潗鏍�
-    Map<String, Object> getPtz(CameraCmd cmd);
+    //鑾峰彇楂樼簿搴TZ
+    AjaxResult getPtzHigh(CameraCmd cmd);
 
     //鑾峰彇ptz鑼冨洿
-    Map<String, Object> getPtzScope(CameraCmd cmd);
+    AjaxResult getPtzScope(CameraCmd cmd);
 
-    //璁剧疆ptz
-    boolean setPtz(CameraCmd cmd);
+    //璁剧疆ptz(涓嶆敮鎸�2閫氶亾鐨刏鍊艰缃拰鑾峰彇)
+    AjaxResult setPtz(CameraCmd cmd);
+
+    //璁剧疆ptz(楂樼簿搴tz璁剧疆)
+    AjaxResult setPtzHigh(CameraCmd cmd);
 
     //璁剧疆闆舵柟浣嶈
-    boolean setZeroPtz(CameraCmd cmd);
+    AjaxResult setZeroPtz(CameraCmd cmd);
 
     //鎵嬪姩褰曞儚
     String record(CameraCmd cmd);
 
     //寮曞鐩爣浣嶇疆
-    boolean guideTargetPosition(CameraCmd cmd);
+    AjaxResult guideTargetPosition(CameraCmd cmd);
 
     //寮�濮嬪綍鍍�
     boolean recordStart(CameraCmd cmd);
@@ -101,5 +109,10 @@
     List<ArdChannel> getIPChannelInfo(ArdCameras camera);
 
     //鑾峰彇GIS淇℃伅鏁版嵁
-    Map<String, Object> getGisInfo(CameraCmd cmd);
+    AjaxResult getGisInfo(CameraCmd cmd);
+
+    //鏈湴褰曞儚寮�濮�
+    AjaxResult localRecordStart(CameraCmd cmd);
+    //鏈湴褰曞儚鍋滄
+    AjaxResult localRecordStop(CameraCmd cmd);
 }

--
Gitblit v1.9.3