From 6decb63d865de6b551324fd9782555786132170e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 07 十一月 2023 16:11:22 +0800
Subject: [PATCH] 1、修改相机异步登录 2、sdk切换更改为策略模式 3、修复手动巡检停止录像bug
---
ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java | 215 ++++++++++++++++++++++++++---------------------------
1 files changed, 106 insertions(+), 109 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/IHikClientService.java b/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
similarity index 86%
rename from ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/IHikClientService.java
rename to ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
index ecd6d25..3c9e278 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/sdk/hiksdk/service/IHikClientService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
@@ -1,109 +1,106 @@
-package com.ruoyi.utils.sdk.hiksdk.service;
-
-import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.device.camera.domain.CameraCmd;
-import com.ruoyi.device.channel.domain.ArdChannel;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @ClassName: IHikClientService
- * @Description: 娴峰悍鎿嶄綔瀹㈡埛绔帴鍙ｇ被
- * @Author: Administrator
- * @Date: 2023骞�01鏈�17鏃� 15:59
- * @Version: 1.0
- **/
-public interface IHikClientService {
-
- //鍚屾鐧诲綍
- void login(ArdCameras cameras);
-
- //寮傛鐧诲綍
- void asyncLogin(ArdCameras cameras);
-
- //娉ㄩ攢
- boolean logout(String cameraId);
-
- //鍦ㄧ嚎鐘舵��
- boolean isOnLine(CameraCmd cmd);
-
- //浜戝彴鎺у埗
- boolean pTZControlWithSpeed(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);
-
- //鑾峰彇浜戝彴閿佸畾淇℃伅
- 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);
-
- //璁剧疆ptz
- boolean setPtz(CameraCmd cmd);
-
- //璁剧疆闆舵柟浣嶈
- boolean setZeroPtz(CameraCmd cmd);
-
- //鎵嬪姩褰曞儚
- String record(CameraCmd cmd);
-
-
- //寮曞鐩爣浣嶇疆
- boolean guideTargetPosition(CameraCmd cmd);
-
- //寮�濮嬪綍鍍�
- boolean recordStart(CameraCmd cmd);
-
- //鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
- String recordStopToMinio(CameraCmd cmd);
-
- //鍋滄褰曞儚-涓嶄笂浼爉inio
- boolean recordStopNotToMinio(CameraCmd cmd);
-
- //鑾峰彇鐩告満閫氶亾淇℃伅
- public List<ArdChannel> getCameraChannelList(ArdCameras camera);
-
- //鑾峰彇GIS淇℃伅鏁版嵁
- public Map<String, Object> getGisInfo(CameraCmd cmd);
-}
+package com.ruoyi.device.camera.strategy;
+
+import com.ruoyi.device.camera.domain.ArdCameras;
+import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.channel.domain.ArdChannel;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鐩告満SDK绛栫暐鎺ュ彛
+ * 鍒樿嫃涔�
+ * 2023/11/7 10:48:52
+ */
+public interface SdkStrategy {
+
+ //鍚屾鐧诲綍
+ boolean login(ArdCameras cameras);
+
+ //寮傛鐧诲綍
+ void asyncLogin(ArdCameras cameras);
+
+ //娉ㄩ攢
+ 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);
+
+ //鑾峰彇浜戝彴閿佸畾淇℃伅
+ 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);
+
+ //璁剧疆ptz
+ boolean setPtz(CameraCmd cmd);
+
+ //璁剧疆闆舵柟浣嶈
+ boolean setZeroPtz(CameraCmd cmd);
+
+ //鎵嬪姩褰曞儚
+ String record(CameraCmd cmd);
+
+
+ //寮曞鐩爣浣嶇疆
+ boolean guideTargetPosition(CameraCmd cmd);
+
+ //寮�濮嬪綍鍍�
+ boolean recordStart(CameraCmd cmd);
+
+ //鍋滄褰曞儚-涓婁紶minio-杩斿洖褰曞儚url
+ String recordStopToMinio(CameraCmd cmd);
+
+ //鍋滄褰曞儚-涓嶄笂浼爉inio
+ boolean recordStopNotToMinio(CameraCmd cmd);
+
+ //鑾峰彇鐩告満閫氶亾淇℃伅
+ public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+
+ //鑾峰彇GIS淇℃伅鏁版嵁
+ public Map<String, Object> getGisInfo(CameraCmd cmd);
+}
--
Gitblit v1.9.3