From 1b677c6dc79b8e3b650acd94da7fc770c3d2718d Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 04 六月 2021 16:31:45 +0800
Subject: [PATCH] 增加zlm代理的secret自动添加， 增加配置文件的默认值，缺少非关键参数不会无法启动，简化配置文件给新手带来的压力，前端使用wvp代理流。
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 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 c6286c5..a77371f 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
@@ -1,9 +1,11 @@
package com.genersoft.iot.vmp.service.impl;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
@@ -13,6 +15,9 @@
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 瑙嗛浠ｇ悊涓氬姟
@@ -38,14 +43,18 @@
@Autowired
private PlatformGbStreamMapper platformGbStreamMapper;
+ @Autowired
+ private IGbStreamService gbStreamService;
+
@Override
public String save(StreamProxyItem param) {
- MediaServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
param.getStream() );
param.setDst_url(dstUrl);
StringBuffer result = new StringBuffer();
+ boolean streamLive = false;
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
if (videoManagerStorager.updateStreamProxy(param)) {
@@ -62,9 +71,11 @@
}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);
@@ -73,6 +84,15 @@
}
}
+ if (param.getPlatformGbId() != null && streamLive) {
+ List<GbStream> gbStreams = new ArrayList<>();
+ gbStreams.add(param);
+ if (gbStreamService.addPlatformInfo(gbStreams, param.getPlatformGbId())){
+ result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]鎴愬姛");
+ }else {
+ result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]澶辫触");
+ }
+ }
return result.toString();
}
--
Gitblit v1.8.0