From 16fed342914874759626ac5dcbcb3b69abce5a76 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Sep 2023 16:41:41 +0800
Subject: [PATCH] 修改视频查询接口
---
src/main/java/com/dji/sample/manage/service/ILiveStreamService.java | 1 +
src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java | 1 +
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 15 ++++++++-------
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 3 ++-
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java b/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java
index 40dada5..65c5e67 100644
--- a/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java
+++ b/src/main/java/com/dji/sample/component/mqtt/config/MqttInboundConfiguration.java
@@ -56,6 +56,7 @@
/**
* Define a default channel to handle messages that have no effect.
+ * 定义默认通道处理无效消息
* @return
*/
@Bean
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..bdaee49 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -48,15 +48,16 @@
/**
* 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) {
+ // 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);
return ResponseResult.success(liveCapacity);
}
@@ -96,4 +97,4 @@
return liveStreamService.liveLensChange(liveParam);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java b/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java
index 2fb7a4f..40723d5 100644
--- a/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java
+++ b/src/main/java/com/dji/sample/manage/service/ILiveStreamService.java
@@ -16,6 +16,7 @@
/**
* Get all the drone data that can be broadcast live in this workspace.
+ * 获取所有可以在这个工作区中直播的无人机数据。
* @param workspaceId
* @return
*/
diff --git a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
index 94ece0d..ad55ad6 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -56,6 +56,7 @@
public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId) {
// Query all devices in this workspace.
+ //查询该工作区中的所有设备。
List<DeviceDTO> devicesList = deviceService.getDevicesByParams(
DeviceQueryParam.builder()
.workspaceId(workspaceId)
@@ -358,4 +359,4 @@
return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3