From f905f4377db462640a4fdd53dc5daa1adfc8c542 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 14 Oct 2025 18:30:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/forest/TyClient.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/forest/TyClient.java b/ard-work/src/main/java/com/ard/work/component/forest/TyClient.java
index cc39ed4..a5f3c23 100644
--- a/ard-work/src/main/java/com/ard/work/component/forest/TyClient.java
+++ b/ard-work/src/main/java/com/ard/work/component/forest/TyClient.java
@@ -15,43 +15,44 @@
* @author liusuyi
* @date 2024年10月21日14:45
**/
+@Address(source = MyAddressSource.class)
public interface TyClient {
/**
* 获取云盒TOKEN
*/
- @Post("{baseUrl}" + TyConst.POST_TOKEN)
- TyHttpCommonReceiver<AccessTokenReceiver> getToken(@Var("baseUrl") String baseUrl, @JSONBody TokenDTO tokenDTO);
+ @Post(TyConst.POST_TOKEN)
+ TyHttpCommonReceiver<AccessTokenReceiver> getToken(@Var("serverId") String serverId, @JSONBody TokenDTO tokenDTO);
/**
* 获取云盒列表
*/
- @Get(value = "{baseUrl}" + TyConst.GET_BOX_LIST, interceptor = TokenInterceptor.class)
- TyHttpCommonReceiver<List<BoxInfoReceiver>> getBoxList(@Var("baseUrl") String baseUrl);
+ @Get(value = TyConst.GET_BOX_LIST, interceptor = TokenInterceptor.class)
+ TyHttpCommonReceiver<List<BoxInfoReceiver>> getBoxList(@Var("serverId") String serverId);
/**
* 获取直播地址
*/
- @Get(value = "{baseUrl}" + TyConst.GET_BOX_LIVE_URL, interceptor = TokenInterceptor.class)
- TyHttpCommonReceiver<BoxStreamUrlReceiver> getBoxLiveUrl(@Var("baseUrl") String baseUrl,
+ @Get(value = TyConst.GET_BOX_LIVE_URL, interceptor = TokenInterceptor.class)
+ TyHttpCommonReceiver<BoxStreamUrlReceiver> getBoxLiveUrl(@Var("serverId") String serverId,
@Var("boxSn") String boxSn);
/**
* 获取飞行历史
*/
- @Post(value = "{baseUrl}" + TyConst.POST_BOX_HISTORY, interceptor = TokenInterceptor.class)
- TyHttpCommonReceiver<List<BoxHistoryReceiver>> getBoxHistory(@Var("baseUrl") String baseUrl,
+ @Post(value = TyConst.POST_BOX_HISTORY, interceptor = TokenInterceptor.class)
+ TyHttpCommonReceiver<List<BoxHistoryReceiver>> getBoxHistory(@Var("serverId") String serverId,
@JSONBody BoxHistoryDTO boxHistoryDTO);
/**
* 获取任务照片
*/
- @Post(value = "{baseUrl}" + TyConst.POST_BOX_PHOTOS, interceptor = TokenInterceptor.class)
- TyHttpCommonReceiver<List<BoxPhotosReceiver>> getBoxPhotos(@Var("baseUrl") String baseUrl,
+ @Post(value = TyConst.POST_BOX_PHOTOS, interceptor = TokenInterceptor.class)
+ TyHttpCommonReceiver<List<BoxPhotosReceiver>> getBoxPhotos(@Var("serverId") String serverId,
@JSONBody BoxPhotosDTO boxPhotosDTO);
/**
* 修改云盒设置
*/
- @Post(value = "{baseUrl}" + TyConst.POST_BOX_UPDATE, interceptor = TokenInterceptor.class)
- TyHttpCommonReceiver<?> updateBoxSettings(@Var("baseUrl") String baseUrl, @JSONBody BoxSettingsDTO boxSettingsDTO);
+ @Post(value = TyConst.POST_BOX_UPDATE, interceptor = TokenInterceptor.class)
+ TyHttpCommonReceiver<?> updateBoxSettings(@Var("serverId") String serverId, @JSONBody BoxSettingsDTO boxSettingsDTO);
}
\ No newline at end of file
--
Gitblit v1.9.3