From 7dc8fd4a1e8c5afb6fad53454935419c239838c0 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 01 四月 2021 18:06:21 +0800
Subject: [PATCH] 添加拉流代理与国标关联, 支持代理rtsp/rtmp/...，转发到国标
---
src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java
index 0655980..ec94844 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/StreamProxyServiceImpl.java
@@ -2,20 +2,17 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
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.PlarfotmGbStreamMapper;
import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
import com.genersoft.iot.vmp.vmanager.service.IStreamProxyService;
-import com.genersoft.iot.vmp.vmanager.streamProxy.StreamProxyController;
-import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.List;
/**
* 瑙嗛浠ｇ悊涓氬姟
@@ -35,29 +32,35 @@
@Autowired
private StreamProxyMapper streamProxyMapper;
+ @Autowired
+ private GbStreamMapper gbStreamMapper;
+
+ @Autowired
+ private PlarfotmGbStreamMapper plarfotmGbStreamMapper;
+
@Override
- public void save(StreamProxyDto param) {
+ public void save(StreamProxyItem param) {
MediaServerConfig 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);
// 鏇存柊
if (videoManagerStorager.queryStreamProxy(param.getApp(), param.getStream()) != null) {
- int result = videoManagerStorager.updateStreamProxy(param);
- if (result > 0 && param.isEnable()) {
+ boolean result = videoManagerStorager.updateStreamProxy(param);
+ if (result && param.isEnable()) {
addStreamProxyToZlm(param);
}
}else { // 鏂板
- int result = videoManagerStorager.addStreamProxy(param);
- if (result > 0 && param.isEnable()) {
+ boolean result = videoManagerStorager.addStreamProxy(param);
+ if (result && param.isEnable()) {
addStreamProxyToZlm(param);
}
}
}
@Override
- public JSONObject addStreamProxyToZlm(StreamProxyDto param) {
+ public JSONObject addStreamProxyToZlm(StreamProxyItem param) {
JSONObject result = null;
if ("default".equals(param.getType())){
result = zlmresTfulUtils.addStreamProxy(param.getApp(), param.getStream(), param.getUrl(),
@@ -70,37 +73,42 @@
}
@Override
- public JSONObject removeStreamProxyFromZlm(StreamProxyDto param) {
+ public JSONObject removeStreamProxyFromZlm(StreamProxyItem param) {
JSONObject result = zlmresTfulUtils.closeStreams(param.getApp(), param.getStream());
+
return result;
}
@Override
- public PageInfo<StreamProxyDto> getAll(Integer page, Integer count) {
+ public PageInfo<StreamProxyItem> getAll(Integer page, Integer count) {
return videoManagerStorager.queryStreamProxyList(page, count);
}
@Override
public void del(String app, String stream) {
- StreamProxyDto streamProxyDto = new StreamProxyDto();
- streamProxyDto.setApp(app);
- streamProxyDto.setStream(stream);
- JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
+ StreamProxyItem streamProxyItem = new StreamProxyItem();
+ streamProxyItem.setApp(app);
+ streamProxyItem.setStream(stream);
+ JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyItem);
if (jsonObject.getInteger("code") == 0) {
videoManagerStorager.deleteStreamProxy(app, stream);
+ // 濡傛灉鍏宠仈浜嗗浗鏍囬偅涔堢Щ闄ゅ叧鑱�
+ gbStreamMapper.del(app, stream);
+ plarfotmGbStreamMapper.delByAppAndStream(app, stream);
+ // TODO 濡傛灉鍏宠仈鐨勬帹娴侊紝 閭ｄ箞鐘舵�佽缃负绂荤嚎
}
}
@Override
public boolean start(String app, String stream) {
boolean result = false;
- StreamProxyDto streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
- if (!streamProxyDto.isEnable() && streamProxyDto != null) {
- JSONObject jsonObject = addStreamProxyToZlm(streamProxyDto);
+ StreamProxyItem streamProxy = videoManagerStorager.queryStreamProxy(app, stream);
+ if (!streamProxy.isEnable() && streamProxy != null) {
+ JSONObject jsonObject = addStreamProxyToZlm(streamProxy);
if (jsonObject.getInteger("code") == 0) {
result = true;
- streamProxyDto.setEnable(true);
- videoManagerStorager.updateStreamProxy(streamProxyDto);
+ streamProxy.setEnable(true);
+ videoManagerStorager.updateStreamProxy(streamProxy);
}
}
return result;
@@ -109,7 +117,7 @@
@Override
public boolean stop(String app, String stream) {
boolean result = false;
- StreamProxyDto streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
+ StreamProxyItem streamProxyDto = videoManagerStorager.queryStreamProxy(app, stream);
if (streamProxyDto.isEnable() && streamProxyDto != null) {
JSONObject jsonObject = removeStreamProxyFromZlm(streamProxyDto);
if (jsonObject.getInteger("code") == 0) {
--
Gitblit v1.8.0