From 1f7962d0545de446e96ccaa81b33bbf71a69b41b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 06 九月 2023 12:29:26 +0800
Subject: [PATCH] 增加sdk接口getGisInfo 调整ptz的websocket上传增加视场角

---
 ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java |   35 +++++++++++++++++++++++++++--------
 1 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
index ab13ecc..95464a3 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java
@@ -2,13 +2,14 @@
 
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.channel.domain.ArdChannel;
 
-import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 
 /**
  * @ClassName: sdkClinet
- * @Description:娴峰悍鎿嶄綔瀹㈡埛绔帴鍙g被
+ * @Description: 娴峰悍鎿嶄綔瀹㈡埛绔帴鍙g被
  * @Author: Administrator
  * @Date: 2023骞�01鏈�17鏃� 15:59
  * @Version: 1.0
@@ -17,7 +18,7 @@
     void loadHCNetSDKLib();
 
     //鐧诲綍
-    ArdCameras login(ArdCameras cameras);
+    void login(ArdCameras cameras);
 
     //鐧诲綍鎵�鏈夌浉鏈�
     void loginAll();
@@ -29,13 +30,13 @@
     boolean isOnLine(CameraCmd cmd);
 
     //浜戝彴鎺у埗
-    boolean PTZControlWithSpeed(CameraCmd cmd);
+    boolean pTZControlWithSpeed(CameraCmd cmd);
 
     //璁剧疆鑱氱劍鍊�
     boolean setFocusPos(CameraCmd cmd);
 
     //鑾峰彇鑱氱劍鍊�
-    Map getFocusPos(CameraCmd cmd);
+    Map<String,Object> getFocusPos(CameraCmd cmd);
 
     //璁剧疆棰勭疆浣�
     boolean setPreset(CameraCmd cmd);
@@ -55,6 +56,9 @@
     //鑱氱劍妯″紡
     boolean controlFocusMode(CameraCmd cmd);
 
+    //鑾峰彇鑱氱劍妯″紡
+    String getFocusMode(CameraCmd cmd);
+
     //浜戝彴鍔犵儹
     boolean controlPTHeateRpwron(CameraCmd cmd);
 
@@ -63,6 +67,9 @@
 
     //閰嶇疆閿佸畾
     boolean controlLock(CameraCmd cmd);
+
+    //閰嶇疆瑙i攣
+    boolean controlUnLock(CameraCmd cmd);
 
     //鑾峰彇浜戝彴閿佸畾淇℃伅
     int getPTZLockInfo(CameraCmd cmd);
@@ -87,9 +94,21 @@
     //鎵嬪姩褰曞儚
     String record(CameraCmd cmd);
 
-    //鎵嬪姩褰曞儚
-    void recordToMinio(CameraCmd cmd);
 
     //寮曞鐩爣浣嶇疆
-    boolean setTargetPosition(CameraCmd cmd);
+    boolean guideTargetPosition(CameraCmd cmd);
+
+    //寮�濮嬪綍鍍�
+    void recordStart(CameraCmd cmd);
+
+    //鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
+    String recordStopToMinio(CameraCmd cmd);
+
+    //鍋滄褰曞儚-涓嶄笂浼爉inio
+    void recordStopNotToMinio(CameraCmd cmd);
+
+    //鑾峰彇鐩告満閫氶亾淇℃伅
+    public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+    //鑾峰彇GIS淇℃伅鏁版嵁
+    public Map<String,Object> getGisInfo(CameraCmd cmd);
 }

--
Gitblit v1.9.3