From cbbb9003b44d7c9d7adc80188343f0065732b0ce Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 19 Jun 2024 14:31:31 +0800
Subject: [PATCH] 航线定时任务调整，视频播放接口返回地址修改
---
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
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 9886a63..7fc5f09 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
@@ -53,13 +53,14 @@
private IDeviceRedisService deviceRedisService;
@Override
- public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId) {
+ public List<CapacityDeviceDTO> getLiveCapacity(String workspaceId,String sn) {
// Query all devices in this workspace.
//查询该工作区中的所有设备。
List<DeviceDTO> devicesList = deviceService.getDevicesByParams(
DeviceQueryParam.builder()
.workspaceId(workspaceId)
+ .deviceSn(sn)
.domains(List.of(DeviceDomainEnum.SUB_DEVICE.getVal(), DeviceDomainEnum.DOCK.getVal()))
.build());
@@ -116,7 +117,17 @@
//相机已经在直播中，请勿重复开启直播
if(receiveReply.getResult() == 513003) {
LiveDTO live = new LiveDTO();
- live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
+// live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
+ LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
+ live.setUrl(new StringBuilder()
+ .append("http://")
+ .append(gb28181.getServerIP())
+ .append(":8880/rtp/")
+ .append(gb28181.getAgentID())
+ .append("_")
+ .append(gb28181.getChannel())
+ .append(".live.flv")
+ .toString());
return ResponseResult.success(live);
}
@@ -133,15 +144,27 @@
// live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
live.setUrl(liveParam.getUrl().replace("rtmp", "https").replace("735","700") + ".flv");
break;
+// case GB28181:
+// LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
+// live.setUrl(new StringBuilder()
+// .append("webrtc://")
+// .append(gb28181.getServerIP())
+// .append("/live/")
+// .append(gb28181.getAgentID())
+// .append("@")
+// .append(gb28181.getChannel())
+// .toString());
+// break;
case GB28181:
LiveUrlGB28181DTO gb28181 = urlToGB28181(liveParam.getUrl());
live.setUrl(new StringBuilder()
- .append("webrtc://")
+ .append("http://")
.append(gb28181.getServerIP())
- .append("/live/")
+ .append(":8880/rtp/")
.append(gb28181.getAgentID())
- .append("@")
+ .append("_")
.append(gb28181.getChannel())
+ .append(".live.flv")
.toString());
break;
case RTSP:
--
Gitblit v1.9.3