From 44d216100b45c3337c593ee82ee68e7e0f35d24b Mon Sep 17 00:00:00 2001 From: Lawrence <1934378145@qq.com> Date: 星期三, 16 十二月 2020 20:29:19 +0800 Subject: [PATCH] 与master分支同步 --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 9 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 fd0a665..b58caae 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -1,6 +1,7 @@ package com.genersoft.iot.vmp.storager; import java.util.List; +import java.util.Map; import com.alibaba.fastjson.JSONObject; import com.genersoft.iot.vmp.common.PageResult; @@ -8,6 +9,7 @@ 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; /** * @Description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛 @@ -136,30 +138,24 @@ /** * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆 * - * @param deviceId 璁惧ID - * @param channelId 閫氶亾ID * @param stream 娴佷俊鎭� * @return */ - public boolean startPlay(String deviceId, String channelId, StreamInfo stream); + public boolean startPlay(StreamInfo stream); /** * 鍋滄鎾斁鏃跺垹闄� * - * @param deviceId 璁惧ID - * @param channelId 閫氶亾ID * @return */ - public boolean stopPlay(String deviceId, String channelId); + public boolean stopPlay(StreamInfo streamInfo); /** * 鏌ユ壘瑙嗛娴� * - * @param deviceId 璁惧ID - * @param channelId 閫氶亾ID * @return */ - public StreamInfo queryPlay(String deviceId, String channelId); + public StreamInfo queryPlay(StreamInfo streamInfo); /** * 鏌ヨ瀛愯澶� @@ -182,4 +178,46 @@ * @param deviceId */ void cleanChannelsForDevice(String deviceId); + + StreamInfo queryPlayBySSRC(String ssrc); + + StreamInfo queryPlayByDevice(String deviceId, String code); + + Map<String, StreamInfo> queryPlayByDeviceId(String deviceId); + + boolean startPlayback(StreamInfo streamInfo); + + boolean stopPlayback(StreamInfo streamInfo); + + StreamInfo queryPlaybackByDevice(String deviceId, String channelId); + + StreamInfo queryPlaybackBySSRC(String ssrc); + + /** + * 鏇存柊鎴栨坊鍔犱笂绾у钩鍙� + * @param parentPlatform + */ + boolean updateParentPlatform(ParentPlatform parentPlatform); + + /** + * 鍒犻櫎涓婄骇骞冲彴 + * @param parentPlatform + */ + boolean deleteParentPlatform(ParentPlatform parentPlatform); + + + /** + * 鍒嗛〉鑾峰彇涓婄骇骞冲彴 + * @param page + * @param count + * @return + */ + public PageResult<ParentPlatform> queryParentPlatformList(int page, int count); + + /** + * 鑾峰彇涓婄骇骞冲彴 + * @param platformGbId + * @return + */ + public ParentPlatform queryParentPlatById(String platformGbId); } -- Gitblit v1.8.0