From f2c909e42b81bb7b589c956bfcf90dba3e16d0a8 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 26 Nov 2025 10:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-work/src/main/java/com/ard/work/service/ITyService.java |   57 ++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/service/ITyService.java b/ard-work/src/main/java/com/ard/work/service/ITyService.java
index a4caeb3..fb43af9 100644
--- a/ard-work/src/main/java/com/ard/work/service/ITyService.java
+++ b/ard-work/src/main/java/com/ard/work/service/ITyService.java
@@ -31,17 +31,23 @@
 public interface ITyService {
 
     /**
-     * 获取六合token信息
+     * 获取边缘服务器token信息
      * @return
      */
     AccessTokenReceiver getAccessToken(String ServerId);
 
-
     /**
-     * 获取云盒列表
+     * 获取全部服务器云盒列表
      * @return
      */
     List<BoxInfoReceiver> getBoxList();
+
+    /**
+     * 获取指定服务器云盒列表
+     *
+     * @return List<BoxInfoReceiver>
+     */
+    List<BoxInfoReceiver> getBoxList(String serverId);
 
     /**
      * 获取直播地址
@@ -104,6 +110,11 @@
      * 云台转动(基于速度)
      */
     Boolean speedControl(SpeedControlDTO speedControlDto);
+
+    /**
+     * 格式化存储卡
+     */
+    Boolean formatSdCard(FormatSdCardDTO formatSdCardDTO);
 
     /**
      * 设置相机模式
@@ -195,6 +206,17 @@
      */
     Boolean flyPointControlCancel(FlyPointControlCancelDTO flyPointControlCancelDTO);
 
+
+    /**
+     * 环绕飞行控制
+     */
+    Boolean FlyRoundControl(FlyRoundControlDTO flyRoundControlDTO);
+
+    /**
+     * 停止环绕飞行
+     */
+    Boolean FlyRoundControlCancel(FlyRoundControlCancelDTO flyRoundControlCancelDTO);
+
     /**
      * 紧急制动
      */
@@ -218,66 +240,71 @@
     /**
      * 喊话模式切换
      */
-    void speakModeSwitch(SpeakModeSwitchDTO speakModeSwitchDTO);
+    Boolean speakModeSwitch(SpeakModeSwitchDTO speakModeSwitchDTO);
 
     /**
      * 文字喊话
      */
-    void textSpeak(TextSpeakDTO textSpeakDTO);
+    Boolean textSpeak(TextSpeakDTO textSpeakDTO);
 
     /**
      * 实时喊话
      */
-    void realSpeak(RealSpeakDTO realSpeakDTO);
+    Boolean realSpeak(RealSpeakDTO realSpeakDTO);
 
     /**
      * 录音喊话
      */
-    void recordSpeak(RecordSpeakDTO recordSpeakDTO);
+    Boolean recordSpeak(RecordSpeakDTO recordSpeakDTO);
 
     /**
      * 设置音量
      */
-    void volumeSetting(VolumeSettingDTO volumeSettingDTO);
+    Boolean volumeSetting(VolumeSettingDTO volumeSettingDTO);
 
     /**
      * 设置循环播放
      */
-    void loopSetting(LoopSettingDTO loopSettingDTO);
+    Boolean loopSetting(LoopSettingDTO loopSettingDTO);
 
     /**
      * 停止喊话
      */
-    void stopSpeak(StopSpeakDTO stopSpeakDTO);
+    Boolean stopSpeak(StopSpeakDTO stopSpeakDTO);
 
     /**
      * 上传航线
      */
-    void wayLineUpload(WayLineUploadDTO wayLineUploadDTO);
+    Boolean wayLineUpload(WayLineUploadDTO wayLineUploadDTO);
 
     /**
      * 开始航线
      */
-    void wayLineBegin(WayLineBeginDTO wayLineBeginDTO);
+    Boolean wayLineBegin(WayLineBeginDTO wayLineBeginDTO);
 
     /**
      * 暂停航线
      */
-    void wayLinePause(WayLinePauseDTO wayLinePauseDTO);
+    Boolean wayLinePause(WayLinePauseDTO wayLinePauseDTO);
 
     /**
      * 恢复航线
      */
-    void wayLineResume(WayLineResumeDTO wayLineResumeDTO);
+    Boolean wayLineResume(WayLineResumeDTO wayLineResumeDTO);
 
     /**
      * 结束航线
      */
-    void wayLineEnd(WayLineEndDTO wayLineEndDTO);
+    Boolean wayLineEnd(WayLineEndDTO wayLineEndDTO);
 
     /**
      * 处理回复消息
      */
     void processReplyMessage(String key, BaseCmd tyMessage);
 
+    /**
+     * 根据[服务器id]获取边缘服务器盒子列表
+     */
+    List<BoxInfoReceiver> getBoxSnToList(String id);
+
 }

--
Gitblit v1.9.3