From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/manage/service/impl/LiveStreamServiceImpl.java | 130 +++++++++++++++++++++++++++++++++++++------
1 files changed, 112 insertions(+), 18 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 94ece0d..01aa519 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,9 @@
package com.dji.sample.manage.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+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 +11,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;
@@ -16,22 +22,29 @@
import com.dji.sample.manage.model.receiver.CapacityDeviceReceiver;
import com.dji.sample.manage.model.receiver.LiveCapacityReceiver;
import com.dji.sample.manage.service.*;
+import com.dji.sample.patches.utils.DistrictCodeUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+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;
import org.springframework.util.StringUtils;
+import java.io.IOException;
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.*;
/**
* @author sean.zhou
- * @date 2021/11/22
* @version 0.1
+ * @date 2021/11/22
*/
@Service
@Transactional
@@ -42,6 +55,8 @@
@Autowired
private IDeviceService deviceService;
+ @Autowired
+ private IDeviceSetMapper deviceSetMapper;
@Autowired
private IWorkspaceService workspaceService;
@@ -53,17 +68,19 @@
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 -> deviceRedisService.checkDeviceOnline(device.getDeviceSn()))
.map(device -> CapacityDeviceDTO.builder()
.name(Objects.requireNonNullElse(device.getNickname(), device.getDeviceName()))
@@ -96,21 +113,35 @@
// 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;
}
- DeviceDTO data = (DeviceDTO)responseResult.getData();
+ 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");
+ LiveDTO live = new LiveDTO();
+ live.setVideoId(liveParam.getVideoId());
+ //相机已经在直播中，请勿重复开启直播
+ if (receiveReply.getResult() == 513003) {
+
+ 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);
}
@@ -119,22 +150,32 @@
}
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", "https").replace("735","700") + ".flv");
+ 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:
@@ -144,8 +185,49 @@
case UNKNOWN:
return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
}
-
return ResponseResult.success(live);
+
+ }
+
+ @Override
+ public ResponseResult liveAddress(String deviceSn, String deviceName) throws IOException {
+ DeviceSetEntity deviceSet = deviceSetMapper.selectOne(new LambdaQueryWrapper<DeviceSetEntity>()
+ .eq(DeviceSetEntity::getDeviceSn, deviceSn)
+ .eq(DeviceSetEntity::getDeviceName, deviceName)
+ );
+ String workspaceId = getIdBySn(deviceSn);
+ String url = "serverIP=" + deviceSet.getServerIp() + "&serverPort=" + deviceSet.getServerPort() + "&agentID=" + deviceSet.getAgentId()
+ + "&agentPassword=" + deviceSet.getAgentPassword() + "&localPort=" + deviceSet.getLocalPort() + "&serverID=" + deviceSet.getGbServerId() + "&channel=" + deviceSet.getChannel();
+ LiveTypeDTO liveParam = new LiveTypeDTO();
+ liveParam.setUrl(url);
+ liveParam.setUrlType(3);
+ liveParam.setVideoId(getVedioId(getLiveCapacity(workspaceId, deviceSn), deviceSn,deviceName));
+ liveParam.setVideoQuality(0);
+ return liveStart(liveParam);
+ }
+
+ public static String getVedioId(List<CapacityDeviceDTO> data, String sn,String name) throws IOException {
+ return findAndConcatenateIndexes(data, sn,name);
+ }
+
+ public static String findAndConcatenateIndexes(List<CapacityDeviceDTO> devices, String sn, String cameraName) {
+ for (CapacityDeviceDTO device : devices) {
+ if (device.getSn().equals(sn)) {
+ StringBuilder result = new StringBuilder();
+ for (CapacityCameraDTO camera : device.getCamerasList()) {
+ if (camera.getName().equals(cameraName)) {
+ result.append(device.getSn())
+ .append("/")
+ .append(camera.getIndex())
+ .append("/")
+ .append(camera.getVideosList().get(0).getIndex()) // Assuming we take the first video index
+ .append(" "); // Add a space separator or customize as needed
+ }
+ }
+ return result.toString().trim(); // Trim to remove trailing space
+ }
+ }
+ return ""; // Handle case where sn or cameraName is not found
}
@Override
@@ -154,10 +236,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("_","/");
+ videoId = videoId.replace("_", "/");
ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
if (receiveReply.getResult() != 0) {
@@ -227,6 +308,8 @@
/**
* Check if this lens is available live.
+ * 检查镜头是否可用
+ *
* @param videoId
* @return
*/
@@ -262,6 +345,7 @@
/**
* When using rtsp live, the account and password are parsed from the information returned by the pilot.
+ *
* @param url
* @param live
*/
@@ -282,6 +366,7 @@
/**
* When using GB28181 live, url parameters are resolved into objects.
+ *
* @param url
* @return
*/
@@ -308,6 +393,8 @@
/**
* Send a message to the pilot via mqtt to start the live streaming.
+ * 通过mqtt向飞行员发送消息以启动直播。
+ *
* @param topic
* @param liveParam
* @return
@@ -322,8 +409,14 @@
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
* @param liveParam
* @return
@@ -343,6 +436,7 @@
/**
* Send a message to the pilot via mqtt to stop the live streaming.
+ *
* @param topic
* @param videoId
* @return
@@ -358,4 +452,4 @@
return messageSender.publishWithReply(ServiceReply.class, topic, response);
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3