From cf8a22f50b81fa30abaa518bdce660cd65deabea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 15:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 153 ++++++++++++++++++++++++++++++++------------------
1 files changed, 97 insertions(+), 56 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 e85d1ff..970f7a4 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
@@ -3,12 +3,15 @@
import java.util.List;
import java.util.Map;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.PageResult;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
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:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛
@@ -16,19 +19,6 @@
* @date: 2020骞�5鏈�6鏃� 涓嬪崍2:14:31
*/
public interface IVideoManagerStorager {
-
- /**
- * 鏇存柊娴佸獟浣撲俊鎭�
- * @param mediaServerConfig
- * @return
- */
- public boolean updateMediaInfo(MediaServerConfig mediaServerConfig);
-
- /**
- * 鑾峰彇娴佸獟浣撲俊鎭�
- * @return
- */
- public MediaServerConfig getMediaInfo();
/**
* 鏍规嵁璁惧ID鍒ゆ柇璁惧鏄惁瀛樺湪
@@ -61,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);
/**
* 鑾峰彇璁惧
@@ -78,7 +83,7 @@
* @param count 姣忛〉鏁伴噺
* @return
*/
- public PageResult queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, String online, int page, int count);
+ public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count);
/**
* 鑾峰彇鏌愪釜璁惧鐨勯�氶亾鍒楄〃
@@ -95,21 +100,20 @@
*/
public DeviceChannel queryChannel(String deviceId, String channelId);
- /**
+ /**
* 鑾峰彇澶氫釜璁惧
- *
- * @param deviceIds 璁惧ID鏁扮粍
+ * @param page 褰撳墠椤垫暟
+ * @param count 姣忛〉鏁伴噺
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
- public PageResult<Device> queryVideoDeviceList(String[] deviceIds, int page, int count);
+ public PageInfo<Device> queryVideoDeviceList(int page, int count);
/**
* 鑾峰彇澶氫釜璁惧
*
- * @param deviceIds 璁惧ID鏁扮粍
* @return List<Device> 璁惧瀵硅薄鏁扮粍
*/
- public List<Device> queryVideoDeviceList(String[] deviceIds);
+ public List<Device> queryVideoDeviceList();
/**
* 鍒犻櫎璁惧
@@ -135,27 +139,6 @@
*/
public boolean outline(String deviceId);
- /**
- * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆
- *
- * @param stream 娴佷俊鎭�
- * @return
- */
- public boolean startPlay(StreamInfo stream);
-
- /**
- * 鍋滄鎾斁鏃跺垹闄�
- *
- * @return
- */
- public boolean stopPlay(StreamInfo streamInfo);
-
- /**
- * 鏌ユ壘瑙嗛娴�
- *
- * @return
- */
- public StreamInfo queryPlay(StreamInfo streamInfo);
/**
* 鏌ヨ瀛愯澶�
@@ -166,12 +149,8 @@
* @param count
* @return
*/
- PageResult querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, String online, int page, int count);
+ PageInfo querySubChannels(String deviceId, String channelId, String query, Boolean hasSubChannel, String online, int page, int count);
- /**
- * 鏇存柊缂撳瓨
- */
- public void updateCatch();
/**
* 娓呯┖閫氶亾
@@ -179,17 +158,79 @@
*/
void cleanChannelsForDevice(String deviceId);
- StreamInfo queryPlayByStreamId(String streamId);
- StreamInfo queryPlayByDevice(String deviceId, String code);
+ /**
+ * 鏇存柊涓婄骇骞冲彴
+ * @param parentPlatform
+ */
+ boolean updateParentPlatform(ParentPlatform parentPlatform);
- Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
- boolean startPlayback(StreamInfo streamInfo);
+ /**
+ * 娣诲姞涓婄骇骞冲彴
+ * @param parentPlatform
+ */
+ boolean addParentPlatform(ParentPlatform parentPlatform);
- boolean stopPlayback(StreamInfo streamInfo);
+ /**
+ * 鍒犻櫎涓婄骇骞冲彴
+ * @param parentPlatform
+ */
+ boolean deleteParentPlatform(ParentPlatform parentPlatform);
- StreamInfo queryPlaybackByDevice(String deviceId, String channelId);
- StreamInfo queryPlaybackByStreamId(String streamId);
+ /**
+ * 鍒嗛〉鑾峰彇涓婄骇骞冲彴
+ * @param page
+ * @param count
+ * @return
+ */
+ PageInfo<ParentPlatform> queryParentPlatformList(int page, int count);
+
+ /**
+ * 鑾峰彇鎵�鏈夊凡鍚敤鐨勫钩鍙�
+ * @return
+ */
+ List<ParentPlatform> queryEnableParentPlatformList(boolean enable);
+
+ /**
+ * 鑾峰彇涓婄骇骞冲彴
+ * @param platformGbId
+ * @return
+ */
+ ParentPlatform queryParentPlatById(String platformGbId);
+
+ /**
+ * 鎵�鏈夊钩鍙扮绾�
+ */
+ void outlineForAllParentPlatform();
+
+ /**
+ * 鏌ヨ閫氶亾淇℃伅锛屼笉鍖哄垎璁惧(宸插叧鑱斿钩鍙版垨鍏ㄩ儴)
+ */
+ PageInfo<ChannelReduce> queryAllChannelList(int page, int count, String query, Boolean online, Boolean channelType, String platformId, Boolean inPlatform);
+
+ /**
+ * 鏌ヨ璁惧鐨勯�氶亾淇℃伅
+ */
+ List<ChannelReduce> queryChannelListInParentPlatform(String platformId);
+
+
+ /**
+ * 鏇存柊涓婄骇骞冲彴鐨勯�氶亾淇℃伅
+ * @param platformId
+ * @param channelReduces
+ * @return
+ */
+ int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces);
+
+ /**
+ * 绉婚櫎涓婄骇骞冲彴鐨勯�氶亾淇℃伅
+ * @param platformId
+ * @param channelReduces
+ * @return
+ */
+ int delChannelForGB(String platformId, List<ChannelReduce> channelReduces);
+
+
}
--
Gitblit v1.8.0