From be7082f5e21aaab0ef541d9a78ced7eaebcfb1f7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 25 十一月 2021 15:33:25 +0800
Subject: [PATCH] 优化多线程参数
---
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 92 +++++++++++++++++++++++++++++++++++----------
1 files changed, 71 insertions(+), 21 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 2eb99b8..3ffc68e 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,18 +1,24 @@
package com.genersoft.iot.vmp.service.impl;
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.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
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.PlatformGbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
import com.genersoft.iot.vmp.service.IStreamProxyService;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,14 +31,16 @@
@Service
public class StreamProxyServiceImpl implements IStreamProxyService {
+ private final static Logger logger = LoggerFactory.getLogger(StreamProxyServiceImpl.class);
+
@Autowired
private IVideoManagerStorager videoManagerStorager;
@Autowired
- private IRedisCatchStorage redisCatchStorage;
+ private IMediaService mediaService;
@Autowired
- private ZLMRESTfulUtils zlmresTfulUtils;
+ private ZLMRESTfulUtils zlmresTfulUtils;;
@Autowired
private StreamProxyMapper streamProxyMapper;
@@ -46,15 +54,31 @@
@Autowired
private IGbStreamService gbStreamService;
+ @Autowired
+ private IMediaServerService mediaServerService;
+
@Override
- public String save(StreamProxyItem param) {
- ZLMServerConfig mediaInfo = redisCatchStorage.getMediaInfo();
+ public WVPResult<StreamInfo> save(StreamProxyItem param) {
+ MediaServerItem mediaInfo;
+ WVPResult<StreamInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(0);
+ if ("auto".equals(param.getMediaServerId())){
+ mediaInfo = mediaServerService.getMediaServerForMinimumLoad();
+ }else {
+ mediaInfo = mediaServerService.getOne(param.getMediaServerId());
+ }
+ if (mediaInfo == null) {
+ logger.warn("淇濆瓨浠ｇ悊鏈壘鍒板湪绾跨殑ZLM...");
+ wvpResult.setMsg("淇濆瓨澶辫触");
+ return wvpResult;
+ }
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;
+ param.setMediaServerId(mediaInfo.getId());
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
if (videoManagerStorager.updateStreamProxy(param)) {
@@ -65,6 +89,10 @@
result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
param.setEnable(false);
videoManagerStorager.updateStreamProxy(param);
+ }else {
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
+ mediaInfo, param.getApp(), param.getStream(), null);
+ wvpResult.setData(streamInfo);
}
}
}
@@ -79,8 +107,14 @@
result.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
param.setEnable(false);
videoManagerStorager.updateStreamProxy(param);
+ }else {
+ StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(
+ mediaInfo, param.getApp(), param.getStream(), null);
+ wvpResult.setData(streamInfo);
}
}
+ }else {
+ result.append("淇濆瓨澶辫触");
}
}
@@ -93,17 +127,25 @@
result.append(", 鍏宠仈鍥芥爣骞冲彴[ " + param.getPlatformGbId() + " ]澶辫触");
}
}
- return result.toString();
+ wvpResult.setMsg(result.toString());
+ return wvpResult;
}
@Override
public JSONObject addStreamProxyToZlm(StreamProxyItem param) {
JSONObject result = null;
+ MediaServerItem mediaServerItem = null;
+ if (param.getMediaServerId() == null) {
+ logger.warn("娣诲姞浠ｇ悊鏃禡ediaServerId 涓簄ull");
+ return null;
+ }else {
+ mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ }
if ("default".equals(param.getType())){
- result = zlmresTfulUtils.addStreamProxy(param.getApp(), param.getStream(), param.getUrl(),
+ result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl(),
param.isEnable_hls(), param.isEnable_mp4(), param.getRtp_type());
}else if ("ffmpeg".equals(param.getType())) {
- result = zlmresTfulUtils.addFFmpegSource(param.getSrc_url(), param.getDst_url(),
+ result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrc_url(), param.getDst_url(),
param.getTimeout_ms() + "", param.isEnable_hls(), param.isEnable_mp4(),
param.getFfmpeg_cmd_key());
}
@@ -112,8 +154,9 @@
@Override
public JSONObject removeStreamProxyFromZlm(StreamProxyItem param) {
- JSONObject result = zlmresTfulUtils.closeStreams(param.getApp(), param.getStream());
-
+ if (param ==null) return null;
+ MediaServerItem mediaServerItem = mediaServerService.getOne(param.getMediaServerId());
+ JSONObject result = zlmresTfulUtils.closeStreams(mediaServerItem, param.getApp(), param.getStream());
return result;
}
@@ -124,17 +167,18 @@
@Override
public void del(String app, String stream) {
- StreamProxyItem streamProxyItem = new StreamProxyItem();
- streamProxyItem.setApp(app);
- streamProxyItem.setStream(stream);
- JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
- if (jsonObject.getInteger("code") == 0) {
+ StreamProxyItem streamProxyItem = videoManagerStorager.queryStreamProxy(app, stream);
+ if (streamProxyItem != null) {
videoManagerStorager.deleteStreamProxy(app, stream);
- // 濡傛灉鍏宠仈浜嗗浗鏍囬偅涔堢Щ闄ゅ叧鑱�
- gbStreamMapper.del(app, stream);
- platformGbStreamMapper.delByAppAndStream(app, stream);
- // TODO 濡傛灉鍏宠仈鐨勬帹娴侊紝 閭ｄ箞鐘舵�佽缃负绂荤嚎
+ JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
+ if (jsonObject != null && jsonObject.getInteger("code") == 0) {
+ // 濡傛灉鍏宠仈浜嗗浗鏍囬偅涔堢Щ闄ゅ叧鑱�
+ gbStreamMapper.del(app, stream);
+ platformGbStreamMapper.delByAppAndStream(app, stream);
+ // TODO 濡傛灉鍏宠仈鐨勬帹娴侊紝 閭ｄ箞鐘舵�佽缃负绂荤嚎
+ }
}
+
}
@Override
@@ -168,9 +212,9 @@
}
@Override
- public JSONObject getFFmpegCMDs() {
+ public JSONObject getFFmpegCMDs(MediaServerItem mediaServerItem) {
JSONObject result = new JSONObject();
- JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig();
+ JSONObject mediaServerConfigResuly = zlmresTfulUtils.getMediaServerConfig(mediaServerItem);
if (mediaServerConfigResuly != null && mediaServerConfigResuly.getInteger("code") == 0
&& mediaServerConfigResuly.getJSONArray("data").size() > 0){
JSONObject mediaServerConfig = mediaServerConfigResuly.getJSONArray("data").getJSONObject(0);
@@ -184,4 +228,10 @@
return result;
}
+
+
+ @Override
+ public StreamProxyItem getStreamProxyByAppAndStream(String app, String streamId) {
+ return videoManagerStorager.getStreamProxyByAppAndStream(app, streamId);
+ }
}
--
Gitblit v1.8.0