From 5ed0a5891d1598c320f10fc8feef980f181389fb Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 07 Nov 2025 16:40:38 +0800
Subject: [PATCH] 2025-11-7 zwy 机场状态信息上报时飞行器未对频时没有sn，报错是，增加判断
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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 ec9edd2..9a0aec7 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
@@ -20,11 +20,13 @@
import com.ard.sample.manage.service.ILiveStreamService;
import com.ard.vtdu.config.MediamtxConfig;
import com.ard.vtdu.domain.ArdVtdu;
-import com.ard.vtdu.service.IMediaMTXService;
+import com.ard.vtdu.service.IArdMediaService;
+import com.ard.vtdu.service.IArdVtduService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
+
import javax.annotation.Resource;
import java.lang.reflect.Field;
import java.util.*;
@@ -52,7 +54,7 @@
private IMessageSenderService messageSender;
@Resource
- private IMediaMTXService mediaService;
+ private IArdVtduService ardVtduService;
@Resource
private MediamtxConfig mediamtxConfig;
@@ -79,6 +81,11 @@
@Override
public void saveLiveCapacity(LiveCapacityReceiver liveCapacityReceiver, Long timestamp) {
// Solve timing problems
+ if(liveCapacityReceiver==null){
+ //2025-10-28 zwy，这里有个空指针异常问题，如果liveCapacityReceiver为空，则不应该执行下面的代码。
+ //机场设备在刚开机时，发送的state状态时，直播能力前三次发送的是空，可能是由于刚开机，等待各设备开机，第四次为正常数据。
+ return;
+ }
for (CapacityDeviceReceiver capacityDeviceReceiver : liveCapacityReceiver.getDeviceList()) {
long last = (long) Objects.requireNonNullElse(
RedisOpsUtils.get(RedisConst.LIVE_CAPACITY + capacityDeviceReceiver.getSn()), 0L);
@@ -93,7 +100,7 @@
@Override
public ResponseResult liveStart(LiveTypeDTO liveParam) {
- String rtmpPublishUrl="rtmp://" + mediamtxConfig.getApiHost() + ":1935/" + liveParam.getVideoId();
+ String rtmpPublishUrl = "rtmp://" + mediamtxConfig.getApiHost() + ":1935/" + liveParam.getVideoId();
liveParam.setUrl(rtmpPublishUrl);
// Check if this lens is available live.
ResponseResult responseResult = this.checkBeforeLive(liveParam.getVideoId());
@@ -116,12 +123,22 @@
switch (urlType) {
case RTMP:
- ArdVtdu vtdu = new ArdVtdu();
- vtdu.setName(liveParam.getVideoId());
- vtdu = mediaService.addPath(vtdu);
- live.setRtmpUrl(vtdu.getRtmpUrl());
- live.setRtspUrl(vtdu.getRtspUrl());
- live.setWebrtcUrl(vtdu.getWebrtcUrl());
+ String name = liveParam.getVideoId();
+ // 拼接地址
+ String rtspUrl = "rtsp://" + mediamtxConfig.getPlayHost() + ":8554" + "/" + name; // 拼接 webrtcUrl
+ String rtmpUrl = "rtmp://" + mediamtxConfig.getPlayHost() + ":1935" + "/" + name; // 拼接 webrtcUrl
+ String protocol = mediamtxConfig.isHttps() ? "https://" : "http://";
+ String webrtcUrl = protocol + mediamtxConfig.getPlayHost() + ":8889" + "/" + 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);
+ }
+
break;
case RTSP:
Object url = Objects.requireNonNullElse(receiveReply.getOutput(), receiveReply.getInfo());
@@ -147,7 +164,7 @@
if (receiveReply.getResult() != 0) {
return ResponseResult.error(LiveErrorEnum.find(receiveReply.getResult()));
}
- mediaService.removePath(videoId);
+ ardVtduService.deleteArdVtduByName(videoId);
return ResponseResult.success();
}
--
Gitblit v1.9.3