From efb0d6f50d446e56949e23f3f8cb230d719a7b2d Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 02 Jul 2024 17:21:12 +0800
Subject: [PATCH] 增加国标直播接口，完成人工图片与图斑绑定，修改图片获取接口，获取前更新人工图片的图斑绑定
---
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 148 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 129 insertions(+), 19 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 8b441ba..cf288b2 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
@@ -1,5 +1,6 @@
package com.dji.sample.manage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.dji.sample.common.error.LiveErrorEnum;
import com.dji.sample.common.model.ResponseResult;
import com.dji.sample.component.mqtt.model.CommonTopicResponse;
@@ -7,7 +8,9 @@
import com.dji.sample.component.mqtt.service.IMessageSenderService;
import com.dji.sample.component.redis.RedisConst;
import com.dji.sample.component.redis.RedisOpsUtils;
+import com.dji.sample.manage.dao.IDeviceSetMapper;
import com.dji.sample.manage.model.dto.*;
+import com.dji.sample.manage.model.entity.DeviceSetEntity;
import com.dji.sample.manage.model.enums.DeviceDomainEnum;
import com.dji.sample.manage.model.enums.LiveStreamMethodEnum;
import com.dji.sample.manage.model.enums.LiveUrlTypeEnum;
@@ -15,10 +18,9 @@
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 com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -27,6 +29,8 @@
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import static com.dji.sample.component.mqtt.model.TopicConst.*;
@@ -45,6 +49,8 @@
@Autowired
private IDeviceService deviceService;
+ @Autowired
+ private IDeviceSetMapper deviceSetMapper;
@Autowired
private IWorkspaceService workspaceService;
@@ -52,19 +58,24 @@
@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())
@@ -90,7 +101,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;
@@ -98,9 +115,27 @@
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("https://wrj.shuixiongit.com/zb/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()));
@@ -109,31 +144,99 @@
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(gb28181.getServerIP())
- .append("/live/")
+ .append("https://wrj.shuixiongit.com/zb/rtp/")
.append(gb28181.getAgentID())
- .append("@")
+ .append("_")
.append(gb28181.getChannel())
+ .append(".live.flv")
.toString());
break;
case RTSP:
- Object url = Objects.requireNonNullElse(receiveReply.getOutput(), receiveReply.getInfo());
- this.resolveUrlUser(String.valueOf(url), live);
+ String url = receiveReply.getOutput().toString();
+ this.resolveUrlUser(url, live);
break;
case UNKNOWN:
return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
}
return ResponseResult.success(live);
+
}
+
+ @Override
+ public ResponseResult liveAddress(String deviceSn,String deviceId) {
+ DeviceSetEntity deviceSet= deviceSetMapper.selectOne(new LambdaQueryWrapper<DeviceSetEntity>()
+ .eq(DeviceSetEntity::getDeviceSn,deviceSn)
+ .eq(DeviceSetEntity::getDeviceId,deviceId)
+ );
+ String workspaceId=getIdBySn(deviceSn);
+ List<CapacityDeviceDTO> dto=getLiveCapacity(workspaceId,deviceSn);
+ String vedioId=deviceSn+"/165-0-7/normal-0";
+ String url="https://"+deviceSet.getServerIp()+"/zb/rtp/"+deviceSet.getAgentId()+"_"+deviceSet.getChannel()+".live.flv";
+ LiveTypeDTO liveParam=new LiveTypeDTO();
+ liveParam.setUrl(url);
+ liveParam.setUrlType(3);
+ liveParam.setVideoId(vedioId);
+ liveParam.setVideoQuality(0);
+ ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
+ if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
+ return responseResult;
+ }
+
+ DeviceDTO data = (DeviceDTO)responseResult.getData();
+ String respTopic = THING_MODEL_PRE + PRODUCT +
+ data.getDeviceSn() + SERVICES_SUF;
+
+ //获取返回结果
+ ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
+ System.out.println(receiveReply.getResult());
+ LiveDTO live = new LiveDTO();
+ live.setUrl(url);
+ //相机已经在直播中，请勿重复开启直播
+ if(receiveReply.getResult() == 513003) {
+ return ResponseResult.success(live);
+ }
+ return ResponseResult.success(live);
+ }
+
+
+ public static String getVedioId(String data,String sn) {
+ return findDeviceBySn(data, sn);
+ }
+
+ public static String findDeviceBySn(String dtoListString, String snToFind) {
+ String regex = "CapacityDeviceDTO\\(sn=" + snToFind + ", .*? index=([\\w\\-]+).*? index=([\\w\\-]+).*?\\)";
+ Pattern pattern = Pattern.compile(regex);
+ Matcher matcher = pattern.matcher(dtoListString);
+
+ if (matcher.find()) {
+ String index1 = matcher.group(1);
+ String index2 = matcher.group(2);
+ return snToFind + "/" + index1 + "/" + index2;
+ }
+
+ return null; // 如果未找到匹配的sn，则返回null或者适当的默认值
+ }
@Override
public ResponseResult liveStop(String videoId) {
@@ -141,8 +244,9 @@
if (responseResult.getCode() != 0) {
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) {
@@ -207,11 +311,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
*/
@@ -293,6 +398,7 @@
/**
* Send a message to the pilot via mqtt to start the live streaming.
+ *通过mqtt向飞行员发送消息以启动直播。
* @param topic
* @param liveParam
* @return
@@ -304,9 +410,13 @@
response.setData(liveParam);
response.setMethod(LiveStreamMethodEnum.LIVE_START_PUSH.getMethod());
- return messageSender.publishWithReply(topic, response);
+ return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
+ private String getIdBySn(String dockSn){
+ DeviceSetEntity entity=deviceSetMapper.selectOne(new LambdaQueryWrapper<DeviceSetEntity>().eq(DeviceSetEntity::getDeviceSn,dockSn));
+ return entity.getWorkspaceId();
+ }
/**
* Send a message to the pilot via mqtt to set quality.
* @param respTopic
@@ -323,7 +433,7 @@
response.setMethod(LiveStreamMethodEnum.LIVE_SET_QUALITY.getMethod());
response.setData(data);
- return messageSender.publishWithReply(respTopic, response);
+ return messageSender.publishWithReply(ServiceReply.class, respTopic, response);
}
/**
@@ -340,7 +450,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