From 6e4a8cac04432f5a36d5c5e3c5eb3d28d2295a5c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 12 一月 2021 09:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 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 b868919..b4d0c9b 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -7,7 +7,11 @@
 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.vmanager.platform.bean.ChannelReduce;
 import com.github.pagehelper.PageInfo;
+import gov.nist.javax.sip.stack.NioTcpMessageProcessor;
+
+import javax.swing.event.ChangeEvent;
 
 /**    
  * @Description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛
@@ -47,6 +51,21 @@
 	 * @param channel 閫氶亾
 	 */
 	public void updateChannel(String deviceId, DeviceChannel channel);
+
+	/**
+	 * 寮�濮嬫挱鏀�
+	 * @param deviceId 璁惧id
+	 * @param channelId 閫氶亾ID
+	 * @param streamId 娴佸湴鍧�
+	 */
+	public void startPlay(String deviceId, String channelId, String streamId);
+
+	/**
+	 * 鍋滄鎾斁
+	 * @param deviceId 璁惧id
+	 * @param channelId 閫氶亾ID
+	 */
+	public void stopPlay(String deviceId, String channelId);
 	
 	/**   
 	 * 鑾峰彇璁惧
@@ -185,4 +204,18 @@
 	 * 鎵�鏈夊钩鍙扮绾�
 	 */
 	void outlineForAllParentPlatform();
+
+	/**
+	 * 鏌ヨ閫氶亾淇℃伅锛� 涓嶅尯鍒嗚澶�
+	 */
+	PageInfo<ChannelReduce> queryChannelListInAll(int page, int count, String query, Boolean online, Boolean channelType, String parentChannelId);
+
+
+	/**
+	 * 鏇存柊涓婄骇骞冲彴鐨勯�氶亾淇℃伅
+	 * @param platformId
+	 * @param channelReduces
+	 * @return
+	 */
+	int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces);
 }

--
Gitblit v1.8.0