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/storager/IVideoManagerStorager.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
index 7656898..e8f3240 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -2,12 +2,9 @@
 
 import java.util.List;
 
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
+import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
-import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import com.github.pagehelper.PageInfo;
 
 /**    
@@ -238,7 +235,7 @@
 
 	/**
 	 * 娣诲姞Mobile Position璁惧绉诲姩浣嶇疆
-	 * @param MobilePosition
+	 * @param mobilePosition
 	 * @return
 	 */
 	public boolean insertMobilePosition(MobilePosition mobilePosition);
@@ -268,14 +265,14 @@
 	 * @param streamProxyDto
 	 * @return
 	 */
-	public int addStreamProxy(StreamProxyDto streamProxyDto);
+	public boolean addStreamProxy(StreamProxyItem streamProxyDto);
 
 	/**
 	 * 鏇存柊浠g悊娴�
 	 * @param streamProxyDto
 	 * @return
 	 */
-	public int updateStreamProxy(StreamProxyDto streamProxyDto);
+	public boolean updateStreamProxy(StreamProxyItem streamProxyDto);
 
 	/**
 	 * 绉婚櫎浠g悊娴�
@@ -290,7 +287,7 @@
 	 * @param enable
 	 * @return
 	 */
-	public List<StreamProxyDto> getStreamProxyListForEnable(boolean enable);
+	public List<StreamProxyItem> getStreamProxyListForEnable(boolean enable);
 
 	/**
 	 * 鎸夌収鏄痑pp鍜宻tream鑾峰彇浠g悊娴�
@@ -298,7 +295,7 @@
 	 * @param stream
 	 * @return
 	 */
-	public StreamProxyDto queryStreamProxy(String app, String stream);
+	public StreamProxyItem queryStreamProxy(String app, String stream);
 
 	/**
 	 * 鑾峰彇浠g悊娴�
@@ -306,5 +303,20 @@
 	 * @param count
 	 * @return
 	 */
-	PageInfo<StreamProxyDto> queryStreamProxyList(Integer page, Integer count);
+	PageInfo<StreamProxyItem> queryStreamProxyList(Integer page, Integer count);
+
+	/**
+	 * 鏍规嵁鍥芥爣ID鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦
+	 * @param platformId
+	 * @param channelId
+	 * @return
+	 */
+	GbStream queryStreamInParentPlatform(String platformId, String channelId);
+
+	/**
+	 * 鑾峰彇骞冲彴鍏宠仈鐨勭洿鎾祦
+	 * @param platformId
+	 * @return
+	 */
+	List<GbStream> queryGbStreamListInPlatform(String platformId);
 }

--
Gitblit v1.8.0