From 5b0b17d7410785aef2bedb22447bd458a3713300 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 04 十二月 2021 17:27:23 +0800
Subject: [PATCH] 添加第三方服务参与的推流直接转发到国标功能
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 54 ++++++++++++++++++++++++------------------------------
1 files changed, 24 insertions(+), 30 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..2961bc6 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
@@ -79,44 +79,38 @@
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) {
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) {
List<GbStream> gbStreams = new ArrayList<>();
--
Gitblit v1.8.0