From ff7ecd270c7d0b2cd1dd2ec078df0dbe62aad08d Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 21 一月 2021 09:24:58 +0800 Subject: [PATCH] Merge pull request #43 from lawrencehj/master --- src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java | 33 ++++++++++++++++++++++----------- 1 files changed, 22 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 4174507..6563754 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -1,14 +1,10 @@ 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; -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.github.pagehelper.PageInfo; /** * @Description:瑙嗛璁惧鏁版嵁瀛樺偍鎺ュ彛 @@ -48,6 +44,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); /** * 鑾峰彇璁惧 @@ -65,7 +76,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); /** * 鑾峰彇鏌愪釜璁惧鐨勯�氶亾鍒楄〃 @@ -82,13 +93,13 @@ */ 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); /** * 鑾峰彇澶氫釜璁惧 @@ -131,7 +142,7 @@ * @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); /** -- Gitblit v1.8.0