From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 b8f12bf..98f4270 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.List;
import static com.dji.sample.component.AuthInterceptor.TOKEN_CLAIM;
@@ -58,7 +59,6 @@
// CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(workspaceId,sn);
-
return ResponseResult.success(liveCapacity);
}
@@ -74,8 +74,8 @@
}
@PostMapping("/streams/address")
- public ResponseResult liveAddress(@RequestParam String deviceSn,@RequestParam String deviceId) {
- return liveStreamService.liveAddress(deviceSn,deviceId);
+ public ResponseResult liveAddress(@RequestParam String deviceSn,@RequestParam String deviceName) throws IOException {
+ return liveStreamService.liveAddress(deviceSn,deviceName);
}
/**
--
Gitblit v1.9.3