From 2927bb498574a0e30bcbb3a9f7ee9468636cf0d8 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Thu, 15 Aug 2024 11:31:33 +0800
Subject: [PATCH] 优化无人机状态更新，更新照片角度附属信息
---
src/main/java/com/dji/sample/manage/controller/LiveStreamController.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 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..c3a72cf 100644
--- a/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
+++ b/src/main/java/com/dji/sample/manage/controller/LiveStreamController.java
@@ -1,8 +1,8 @@
package com.dji.sample.manage.controller;
-import com.dji.sample.common.model.CustomClaim;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.ChannelName;
+import com.dji.sample.manage.model.dto.CapacityCameraDTO;
import com.dji.sample.manage.model.dto.CapacityDeviceDTO;
import com.dji.sample.manage.model.dto.LiveTypeDTO;
import com.dji.sample.manage.model.receiver.LiveCapacityReceiver;
@@ -14,10 +14,8 @@
import org.springframework.messaging.MessageHeaders;
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;
/**
* @author sean.zhou
@@ -46,6 +44,44 @@
liveStreamService.saveLiveCapacity(liveCapacity, headers.getTimestamp());
}
+
+ /**
+ * 获取直播地址
+ * @param workspaceId 项目id
+ * @param sn 设备号
+ * @return
+ */
+ @GetMapping("/getLiveUrl/{workspace_id}")
+ public ResponseResult getLiveUrl(@PathVariable("workspace_id") String workspaceId, String sn) {
+ List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(workspaceId,sn);
+
+ if (null == liveCapacity || liveCapacity.isEmpty()) {
+ return ResponseResult.error(-1,"暂无直播或者设备未开机");
+ }
+ CapacityDeviceDTO deviceDTO = liveCapacity.get(0);
+
+ if (null == deviceDTO.getCamerasList() || deviceDTO.getCamerasList().isEmpty()) {
+ return ResponseResult.error(-1,"暂无直播地址");
+ }
+
+ List<CapacityCameraDTO> camerasList = deviceDTO.getCamerasList();
+ if (null == camerasList || camerasList.isEmpty()) {
+ return ResponseResult.error(-1,"获取相机信息失败");
+ }
+
+ CapacityCameraDTO cameraDTO = camerasList.get(0);
+
+ String videoIndex = cameraDTO.getVideosList().get(0).getIndex();
+
+ LiveTypeDTO liveParam = new LiveTypeDTO();
+ String videoId = deviceDTO.getSn() + "-" + cameraDTO.getIndex() + "-" + videoIndex;
+ liveParam.setUrl("rtmp://www.ainfo.top:735/uav/" + videoId);
+ liveParam.setUrlType(1);
+ liveParam.setVideoId(deviceDTO.getSn() + "/" + cameraDTO.getIndex() + "/" + videoIndex);
+ liveParam.setVideoQuality(0);
+ return liveStreamService.liveStart(liveParam);
+ }
+
/**
* Get live capability data of all drones in the current user's workspace from the database.
* 从数据库中获取当前工作区中所有无人机的实时性能数据。
@@ -58,7 +94,6 @@
// CustomClaim customClaim = (CustomClaim)request.getAttribute(TOKEN_CLAIM);
List<CapacityDeviceDTO> liveCapacity = liveStreamService.getLiveCapacity(workspaceId,sn);
-
return ResponseResult.success(liveCapacity);
}
@@ -74,8 +109,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