From be7a24c1df1872236b5a80ab2735d2ad19c72051 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 17 Dec 2025 15:38:18 +0800
Subject: [PATCH] 2025-12-16 zwy 优化飞行器关机时，关闭直接并删除直播地址
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 104 insertions(+), 13 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
index 9a0aec7..e66be60 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java
@@ -1,5 +1,6 @@
package com.ard.sample.manage.service.impl;
+import com.ard.sample.common.error.CommonErrorEnum;
import com.ard.sample.common.error.LiveErrorEnum;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.CommonTopicResponse;
@@ -22,6 +23,7 @@
import com.ard.vtdu.domain.ArdVtdu;
import com.ard.vtdu.service.IArdMediaService;
import com.ard.vtdu.service.IArdVtduService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +42,7 @@
* @version 0.1
* @date 2021/11/22
*/
+@Slf4j
@Service
@Transactional
public class LiveStreamServiceImpl implements ILiveStreamService {
@@ -81,7 +84,7 @@
@Override
public void saveLiveCapacity(LiveCapacityReceiver liveCapacityReceiver, Long timestamp) {
// Solve timing problems
- if(liveCapacityReceiver==null){
+ if (liveCapacityReceiver == null) {
//2025-10-28 zwy，这里有个空指针异常问题，如果liveCapacityReceiver为空，则不应该执行下面的代码。
//机场设备在刚开机时，发送的state状态时，直播能力前三次发送的是空，可能是由于刚开机，等待各设备开机，第四次为正常数据。
return;
@@ -100,7 +103,8 @@
@Override
public ResponseResult liveStart(LiveTypeDTO liveParam) {
- String rtmpPublishUrl = "rtmp://" + mediamtxConfig.getApiHost() + ":1935/" + liveParam.getVideoId();
+ String rtmpPublishUrl =
+ "rtmp://" + mediamtxConfig.getPushHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + liveParam.getVideoId();
liveParam.setUrl(rtmpPublishUrl);
// Check if this lens is available live.
ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
@@ -115,7 +119,8 @@
ServiceReply receiveReply = this.publishLiveStart(respTopic, liveParam);
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
- return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
+ log.info("机场直播开启失败，错误码：{},错误描述：{}", receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
+ return ResponseResult.error(receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
}
LiveUrlTypeEnum urlType = LiveUrlTypeEnum.find(liveParam.getUrlType());
@@ -125,19 +130,50 @@
case RTMP:
String name = liveParam.getVideoId();
// 拼接地址
- String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554" + "/" + name; // 拼接 webrtcUrl
- String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935" + "/" + name; // 拼接 webrtcUrl
+ String rtspUrl =
+ "rtsp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtspPort() + "/" + name; //
+ // 拼接 webrtcUrl
+ String rtmpUrl =
+ "rtmp://" + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getRtmpPort() + "/" + name; //
+ // 拼接 webrtcUrl
String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
- String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889" + "/" + name; // 拼接 webrtcUrl
+ String webrtcUrl =
+ protocol + mediamtxConfig.getPlayHost() + ":" + mediamtxConfig.getWebrtcPort() + "/" + name; // 拼接
+ // webrtcUrl
// 如果没有，插入新的记录
- ArdVtdu vtdu = ArdVtdu.builder().name(name).rtspSource("publisher").rtspUrl(rtspUrl).rtmpUrl(rtmpUrl).webrtcUrl(webrtcUrl).build();
- int i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
- if (i > 0) {
- live.setRtmpUrl(rtmpUrl);
- live.setRtspUrl(rtspUrl);
- live.setWebrtcUrl(webrtcUrl);
+ ArdVtdu vtdu =
+ ArdVtdu.builder().name(name).rtspSource("publisher").rtspUrl(rtspUrl).rtmpUrl(rtmpUrl).webrtcUrl(webrtcUrl).build();
+ // 在停止直播时不删除Vtdu表记录，所以在开启直播时再插入会报错，
+ // 所以要先查询是否存在该记录，如果已经存在记录，直接返回直播地址
+ // 查询是否已经存在该记录
+ ArdVtdu ardVtdu = ardVtduService.selectArdVtduByName(vtdu.getName());
+ int i = 0;
+ log.info("机场视频插入前vtdu:{}",vtdu);
+ if(ardVtdu == null){
+ i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
+ log.info("机场视频插入后 i:{}",i);
+ if (i > 0) {
+ live.setRtmpUrl(rtmpUrl);
+ live.setRtspUrl(rtspUrl);
+ live.setWebrtcUrl(webrtcUrl);
+ }
}
+ else{
+ i = ardVtduService.updateArdVtdu(vtdu);
+ log.info("机场视频更新后 i:{}",i);
+ if (i > 0) {
+ live.setRtmpUrl(rtmpUrl);
+ live.setRtspUrl(rtspUrl);
+ live.setWebrtcUrl(webrtcUrl);
+ }
+ }
+ //int i = ardVtduService.insertArdVtdu(vtdu); // 保存到媒体表
+// if (i > 0) {
+// live.setRtmpUrl(rtmpUrl);
+// live.setRtspUrl(rtspUrl);
+// live.setWebrtcUrl(webrtcUrl);
+// }
break;
case RTSP:
@@ -148,6 +184,11 @@
return ResponseResult.error(LiveErrorEnum.URL_TYPE_NOT_SUPPORTED);
}
+ // 开始直播时发送机场相机摄像头默认信息（舱外）到所有在线用户,只取机场sn，发机场的摄像头信息
+ if(data.getChildDeviceSn()!=null) {
+ String sn = data.getDeviceSn();
+ deviceService.setRedisCameraPosition(sn, 1);
+ }
return ResponseResult.success(live);
}
@@ -162,9 +203,11 @@
ServiceReply receiveReply = this.publishLiveStop(respTopic, videoId);
if (receiveReply.getResult() != 0) {
+ log.info("机场直播停止失败，错误码：{},错误描述：{}", receiveReply.getResult(), LiveErrorEnum.find(receiveReply.getResult()).getErrorMsg());
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
- ardVtduService.deleteArdVtduByName(videoId);
+ //注释掉删除流媒体管理库中的信息
+// ardVtduService.deleteArdVtduByName(videoId);
return ResponseResult.success();
}
@@ -193,6 +236,7 @@
@Override
public ResponseResult liveLensChange(LiveTypeDTO liveParam) {
+ log.info("切换镜头参数：{}", liveParam);
ResponseResult<DeviceDTO> responseResult = this.checkBeforeLive(liveParam.getVideoId());
if (ResponseResult.CODE_SUCCESS != responseResult.getCode()) {
return responseResult;
@@ -206,10 +250,53 @@
ServiceReply receiveReply = this.publishLiveLensChange(respTopic, liveParam);
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
+ Integer code = receiveReply.getResult();
+ if(code == 325003) {
+ // 指令响应失败，请重试. 经查询官网，机场3为低配，飞行器不支持红外
+ return ResponseResult.error(325003000,LiveErrorEnum.COMMAND_FAILED.getErrorMsg()+"请确认无人机是否支持此功能！");
+ }
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
return ResponseResult.success();
+ }
+
+ @Override
+ public ResponseResult<List<String>> getLiveLens(String sn) {
+ List<String> videoTypes = new ArrayList<>();
+ // 检查设备是否在线
+ if (!deviceService.checkDeviceOnline(sn)) {
+ log.info("SN: {}-设备不在线，请检查网络连接！", sn);
+ // 抛弃出异常，给调用者处理
+ //throw new Exception("设备不在线，请检查网络连接！");
+ return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorCode(),CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
+ }
+ // 读取直播能力拼接参数
+ List<CapacityDeviceDTO> devicesList = getLiveCapacity();
+ if (devicesList == null || devicesList.isEmpty()) {
+ log.info("SN: {}-未获得设备直播能力！", sn);
+ // 抛弃出异常，给调用者处理
+ //throw new Exception("未获得设备直播能力！");
+ return ResponseResult.error(22222200,"未获得设备直播能力！");
+ }
+ for (CapacityDeviceDTO device : devicesList) {
+ if (!device.getSn().equals(sn)) {
+ continue;
+ }
+ List<CapacityCameraDTO> camerasList = device.getCamerasList();
+ for (CapacityCameraDTO camera : camerasList) {
+ // 机场3中飞行器，没有name，需要其他条件确定主摄像头参数
+ for (CapacityVideoDTO video : camera.getVideosList()) {
+ if (video.getSwitchVideoTypes().size() == 1 && camera.getName() == null) {
+ continue;
+ }
+ videoTypes = video.getSwitchVideoTypes();
+
+ }
+ }
+ }
+
+ return ResponseResult.success(videoTypes);
}
@Override
@@ -233,6 +320,10 @@
if (ResponseResult.CODE_SUCCESS != receiveReply.getResult()) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
+ // 将切换相机摄像头信息到redis
+ Integer camera_position = liveParam.getCameraPosition();
+ String sn = responseResult.getData().getDeviceSn();
+ deviceService.setRedisCameraPosition(sn, camera_position);
return ResponseResult.success();
}
--
Gitblit v1.9.3