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 | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 insertions(+), 20 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 9f2cdf5..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
@@ -4,7 +4,6 @@
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.CommonTopicResponse;
import com.dji.sample.component.mqtt.model.ServiceReply;
-import com.dji.sample.component.mqtt.model.StateDataEnum;
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
@@ -16,10 +15,7 @@
import com.dji.sample.manage.model.param.DeviceQueryParam;
import com.dji.sample.manage.model.receiver.CapacityDeviceReceiver;
import com.dji.sample.manage.model.receiver.LiveCapacityReceiver;
-import com.dji.sample.manage.service.ICapacityCameraService;
-import com.dji.sample.manage.service.IDeviceService;
-import com.dji.sample.manage.service.ILiveStreamService;
-import com.dji.sample.manage.service.IWorkspaceService;
+import com.dji.sample.manage.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,19 +49,25 @@
@Autowired
private IMessageSenderService messageSender;
+ @Autowired
+ 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());
// Query the live capability of each drone.
return devicesList.stream()
- .filter(device -> RedisOpsUtils.checkExist(RedisConst.DEVICE_ONLINE_PREFIX + device.getDeviceSn()))
+ //过滤出在线设备
+ .filter(device -> deviceRedisService.checkDeviceOnline(device.getDeviceSn()))
.map(device -> CapacityDeviceDTO.builder()
.name(Objects.requireNonNullElse(device.getNickname(), device.getDeviceName()))
.sn(device.getDeviceSn())
@@ -79,7 +81,7 @@
// Solve timing problems
for (CapacityDeviceReceiver capacityDeviceReceiver : liveCapacityReceiver.getDeviceList()) {
long last = (long) Objects.requireNonNullElse(
- RedisOpsUtils.get(StateDataEnum.LIVE_CAPACITY + RedisConst.DELIMITER + capacityDeviceReceiver.getSn()), 0L);
+ RedisOpsUtils.get(RedisConst.LIVE_CAPACITY + capacityDeviceReceiver.getSn()), 0L);
if (last > timestamp) {
return;
}
@@ -91,7 +93,13 @@
@Override
public ResponseResult liveStart(LiveTypeDTO liveParam) {
+
+// String streamId_2 = liveParam.getVideoId().replace("/","_");
+// String streamId_1 = liveParam.getVideoId().replace("_","/");
+// liveParam.setVideoId(streamId_2);
+
// Check if this lens is available live.
+ //检查镜头是否可用
ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
return responseResult;
@@ -99,9 +107,29 @@
DeviceDTO data = (DeviceDTO)responseResult.getData();
// target topic
+ //thing/product/{gateway_sn}/services 云平台向设备发送的服务
String respTopic = THING_MODEL_PRE + PRODUCT +
data.getDeviceSn() + SERVICES_SUF;
+
+ //获取返回结果
ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
+
+ //相机已经在直播中，请勿重复开启直播
+ if(receiveReply.getResult() == 513003) {
+ LiveDTO live = new LiveDTO();
+// 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);
+ }
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
@@ -110,23 +138,37 @@
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
LiveDTO live = new LiveDTO();
+ //对不同的协议类型做处理
switch (urlType) {
case RTMP:
- live.setUrl(liveParam.getUrl().replace("rtmp", "webrtc"));
+// 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:
- String url = receiveReply.getInfo().toString();
+ String url = receiveReply.getOutput().toString();
this.resolveUrlUser(url, live);
break;
case UNKNOWN:
@@ -143,7 +185,10 @@
return responseResult;
}
+ //thing/product/{gateway_sn}/services
String respTopic = THING_MODEL_PRE + PRODUCT + responseResult.getData().getDeviceSn() + SERVICES_SUF;
+
+ videoId = videoId.replace("_","/");
ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
if (receiveReply.getResult() != 0) {
@@ -186,7 +231,7 @@
if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
return responseResult;
}
- if (DeviceDomainEnum.GATEWAY.getDesc().equals(responseResult.getData().getDomain())) {
+ if (DeviceDomainEnum.GATEWAY.getVal() == responseResult.getData().getDomain()) {
return ResponseResult.error(LiveErrorEnum.FUNCTION_NOT_SUPPORT);
}
@@ -208,11 +253,12 @@
response.setMethod(LiveStreamMethodEnum.LIVE_LENS_CHANGE.getMethod());
response.setData(liveParam);
- return messageSender.publishWithReply(respTopic, response);
+ return messageSender.publishWithReply(ServiceReply.class, respTopic, response);
}
/**
* Check if this lens is available live.
+ * 检查镜头是否可用
* @param videoId
* @return
*/
@@ -232,7 +278,7 @@
return ResponseResult.error(LiveErrorEnum.NO_AIRCRAFT);
}
- if (deviceOpt.get().getDomain().equals(DeviceDomainEnum.DOCK.getDesc())) {
+ if (DeviceDomainEnum.DOCK.getVal() == deviceOpt.get().getDomain()) {
return ResponseResult.success(deviceOpt.get());
}
List<DeviceDTO> gatewayList = deviceService.getDevicesByParams(
@@ -294,6 +340,7 @@
/**
* Send a message to the pilot via mqtt to start the live streaming.
+ *通过mqtt向飞行员发送消息以启动直播。
* @param topic
* @param liveParam
* @return
@@ -305,7 +352,7 @@
response.setData(liveParam);
response.setMethod(LiveStreamMethodEnum.LIVE_START_PUSH.getMethod());
- return messageSender.publishWithReply(topic, response);
+ return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
/**
@@ -324,7 +371,7 @@
response.setMethod(LiveStreamMethodEnum.LIVE_SET_QUALITY.getMethod());
response.setData(data);
- return messageSender.publishWithReply(respTopic, response);
+ return messageSender.publishWithReply(ServiceReply.class, respTopic, response);
}
/**
@@ -341,7 +388,7 @@
response.setData(data);
response.setMethod(LiveStreamMethodEnum.LIVE_STOP_PUSH.getMethod());
- return messageSender.publishWithReply(topic, response);
+ return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3