From 381b3d15caa30e99c75f58a366b3b75cbbf01450 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 07 十二月 2021 11:40:17 +0800
Subject: [PATCH] 修复未结束的推流无法下载
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 3ffc68e..0541124 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -3,15 +3,19 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
+import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
import com.genersoft.iot.vmp.storager.dao.PlatformGbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
import com.genersoft.iot.vmp.service.IStreamProxyService;
@@ -21,6 +25,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -52,6 +57,9 @@
private PlatformGbStreamMapper platformGbStreamMapper;
@Autowired
+ private ParentPlatformMapper parentPlatformMapper;
+
+ @Autowired
private IGbStreamService gbStreamService;
@Autowired
@@ -79,46 +87,41 @@
StringBuffer result = new StringBuffer();
boolean streamLive = false;
param.setMediaServerId(mediaInfo.getId());
+ boolean saveResult;
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
- if (videoManagerStorager.updateStreamProxy(param)) {
- result.append("淇濆瓨鎴愬姛");
- if (param.isEnable()){
- JSONObject jsonObject = addStreamProxyToZlm(param);
- if (jsonObject == null) {
- result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
- param.setEnable(false);
- videoManagerStorager.updateStreamProxy(param);
- }else {
- StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
- mediaInfo, param.getApp(), param.getStream(), null);
- wvpResult.setData(streamInfo);
- }
- }
- }
+ saveResult = videoManagerStorager.updateStreamProxy(param);
}else { // 鏂板
- if (videoManagerStorager.addStreamProxy(param)){
- result.append("淇濆瓨鎴愬姛");
- streamLive = true;
- if (param.isEnable()) {
- JSONObject jsonObject = addStreamProxyToZlm(param);
- if (jsonObject == null) {
- streamLive = false;
- result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
- param.setEnable(false);
- videoManagerStorager.updateStreamProxy(param);
- }else {
+ saveResult = videoManagerStorager.addStreamProxy(param);
+ }
+ if (saveResult) {
+ result.append("淇濆瓨鎴愬姛");
+ if (param.isEnable()) {
+ JSONObject jsonObject = addStreamProxyToZlm(param);
+ if (jsonObject == null) {
+ streamLive = false;
+ result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
+ param.setEnable(false);
+ videoManagerStorager.updateStreamProxy(param);
+ }else {
+ Integer code = jsonObject.getInteger("code");
+ if (code == 0) {
+ streamLive = true;
StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
mediaInfo, param.getApp(), param.getStream(), null);
wvpResult.setData(streamInfo);
+ }else {
+ result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
+ param.setEnable(false);
+ videoManagerStorager.updateStreamProxy(param);
}
- }
- }else {
- result.append("淇濆瓨澶辫触");
- }
+ }
+ }
+ }else {
+ result.append("淇濆瓨澶辫触");
}
- if (param.getPlatformGbId() != null && streamLive) {
+ if ( !StringUtils.isEmpty(param.getPlatformGbId()) && streamLive) {
List<GbStream> gbStreams = new ArrayList<>();
gbStreams.add(param);
if (gbStreamService.addPlatformInfo(gbStreams, param.getPlatformGbId())){
@@ -127,6 +130,18 @@
result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]澶辫触");
}
}
+ // 鏌ユ壘寮�鍚簡鍏ㄩ儴鐩存挱娴佸叡浜殑涓婄骇骞冲彴
+ List<ParentPlatform> parentPlatforms = parentPlatformMapper.selectAllAhareAllLiveStream();
+ if (parentPlatforms.size() > 0) {
+ for (ParentPlatform parentPlatform : parentPlatforms) {
+ param.setPlatformId(parentPlatform.getServerGBId());
+ String stream = param.getStream();
+ StreamProxyItem streamProxyItems = platformGbStreamMapper.selectOne(param.getApp(), stream, parentPlatform.getServerGBId());
+ if (streamProxyItems == null) {
+ platformGbStreamMapper.add(param);
+ }
+ }
+ }
wvpResult.setMsg(result.toString());
return wvpResult;
}
--
Gitblit v1.8.0