From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
similarity index 90%
rename from ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
rename to ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
index 3c9e278..1eea46a 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/strategy/SdkStrategy.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/factory/CameraSDK.java
@@ -1,4 +1,4 @@
-package com.ruoyi.device.camera.strategy;
+package com.ruoyi.device.camera.factory;
 
 import com.ruoyi.device.camera.domain.ArdCameras;
 import com.ruoyi.device.camera.domain.CameraCmd;
@@ -11,7 +11,7 @@
  * 鍒樿嫃涔�
  * 2023/11/7 10:48:52
  */
-public interface SdkStrategy {
+public interface CameraSDK {
 
     //鍚屾鐧诲綍
     boolean login(ArdCameras cameras);
@@ -85,7 +85,6 @@
     //鎵嬪姩褰曞儚
     String record(CameraCmd cmd);
 
-
     //寮曞鐩爣浣嶇疆
     boolean guideTargetPosition(CameraCmd cmd);
 
@@ -99,8 +98,8 @@
     boolean recordStopNotToMinio(CameraCmd cmd);
 
     //鑾峰彇鐩告満閫氶亾淇℃伅
-    public List<ArdChannel> getCameraChannelList(ArdCameras camera);
+    List<ArdChannel> getCameraChannelList(ArdCameras camera);
 
     //鑾峰彇GIS淇℃伅鏁版嵁
-    public Map<String, Object> getGisInfo(CameraCmd cmd);
+    Map<String, Object> getGisInfo(CameraCmd cmd);
 }

--
Gitblit v1.9.3