From efb0d6f50d446e56949e23f3f8cb230d719a7b2d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Jul 2024 17:21:12 +0800
Subject: [PATCH] 增加国标直播接口,完成人工图片与图斑绑定,修改图片获取接口,获取前更新人工图片的图斑绑定
---
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
index c8bd144..b8f12bf 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -48,21 +48,23 @@
/**
* Get live capability data of all drones in the current user's workspace from the database.
- * @param request
+ * 从数据库中获取当前工作区中所有无人机的实时性能数据。
+ * @param workspaceId
* @return live capability
*/
- @GetMapping("/capacity")
- public ResponseResult<List<CapacityDeviceDTO>> getLiveCapacity(HttpServletRequest request) {
- // Get information about the current user.
- CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
+ @GetMapping("/capacity/{workspace_id}")
+ public ResponseResult<List<CapacityDeviceDTO>> getLiveCapacity(@PathVariable("workspace_id") String workspaceId,String sn) {
+ // Get information about the current user. 获取当前登录用户的信息
+// CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
- List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(customClaim.getWorkspaceId());
+ List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(workspaceId,sn);
return ResponseResult.success(liveCapacity);
}
/**
* Live streaming according to the parameters passed in from the web side.
+ * 根据从web端传入的参数进行直播。
* @param liveParam Live streaming parameters.
* @return
*/
@@ -71,8 +73,14 @@
return liveStreamService.liveStart(liveParam);
}
+ @PostMapping("/streams/address")
+ public ResponseResult liveAddress(@RequestParam String deviceSn,@RequestParam String deviceId) {
+ return liveStreamService.liveAddress(deviceSn,deviceId);
+ }
+
/**
* Stop live streaming according to the parameters passed in from the web side.
+ * 根据从web端传入的参数停止直播。
* @param liveParam Live streaming parameters.
* @return
*/
@@ -82,8 +90,8 @@
}
/**
- * Set the quality of the live streaming according to the parameters passed in from the web side.
- * @param liveParam Live streaming parameters.
+ * 根据从web端传入的参数设置直播的质量。
+ * @param liveParam 直播参数
* @return
*/
@PostMapping("/streams/update")
@@ -96,4 +104,4 @@
return liveStreamService.liveLensChange(liveParam);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3