From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/service/ITyService.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 fb43af9..d21a331 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
@@ -3,6 +3,7 @@
import com.ard.work.domain.dto.BoxHistoryDTO;
import com.ard.work.domain.dto.BoxPhotosDTO;
import com.ard.work.domain.dto.BoxSettingsDTO;
+import com.ard.work.domain.dto.BoxVideosDTO;
import com.ard.work.domain.dto.camera.*;
import com.ard.work.domain.dto.manual.*;
import com.ard.work.domain.dto.speaker.*;
@@ -32,12 +33,14 @@
/**
* 获取边缘服务器token信息
+ *
* @return
*/
- AccessTokenReceiver getAccessToken(String ServerId);
+ AccessTokenReceiver getAccessToken(String serverId);
/**
* 获取全部服务器云盒列表
+ *
* @return
*/
List<BoxInfoReceiver> getBoxList();
@@ -51,42 +54,56 @@
/**
* 获取直播地址
+ *
* @return
*/
BoxStreamUrlReceiver getBoxLiveUrl(@Var("boxSn") String boxSn);
/**
* 获取飞行历史
+ *
* @return
*/
List<BoxHistoryReceiver> getBoxHistory(BoxHistoryDTO boxHistoryDTO);
/**
- * 获取盒子图片
+ * 获取任务图片
+ *
* @return
*/
List<BoxPhotosReceiver> getBoxPhotos(BoxPhotosDTO boxPhotosDTO);
/**
+ * 获取任务视频
+ *
+ * @return
+ */
+ List<BoxVideosReceiver> getBoxVideos(BoxVideosDTO boxVideosDTO);
+
+ /**
* 修改云盒设置
+ *
* @return
*/
Boolean updateBoxSettings(BoxSettingsDTO boxSettingsDTO);
/**
* 设置返航高度
+ *
* @return
*/
Boolean updateReturnHeight(ReturnHeightSettingDTO returnHeightSettingDTO);
/**
* 设置视频码流
+ *
* @return
*/
Boolean updateVideoStream(VideoStreamSettingDTO videoStreamSettingDTO);
/**
* 设置返航点
+ *
* @return
*/
Boolean updateReturnPoint(ReturnPointSettingDTO returnPointSettingDTO);
@@ -205,7 +222,6 @@
* 停止指点飞行控制
*/
Boolean flyPointControlCancel(FlyPointControlCancelDTO flyPointControlCancelDTO);
-
/**
* 环绕飞行控制
--
Gitblit v1.9.3