From 1e1364e51a66614469b91e396d33a54bdf8f6e98 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 17 十月 2022 14:33:25 +0800 Subject: [PATCH] 修复开始点播功能接口调用返回参数与定义的不符 #635 --- src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 61 ++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java index d228a1a..5dbba92 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java @@ -5,9 +5,12 @@ import com.genersoft.iot.vmp.media.zlm.dto.MediaItem; import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; +import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis; +import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto; import com.github.pagehelper.PageInfo; import java.util.List; +import java.util.Map; public interface IStreamPushService { @@ -29,11 +32,9 @@ /** * 鑾峰彇 - * @param page - * @param count - * @return */ - PageInfo<StreamPushItem> getPushList(Integer page, Integer count); + PageInfo<StreamPushItem> getPushList(Integer page, Integer count, String query, Boolean pushing, String mediaServerId); + List<StreamPushItem> getPushList(String mediaSererId); StreamPushItem transform(MediaItem item); @@ -44,23 +45,65 @@ * 鍋滄涓�璺帹娴� * @param app 搴旂敤鍚� * @param streamId 娴両D - * @return */ boolean stop(String app, String streamId); /** * 鏂扮殑鑺傜偣鍔犲叆 - * @param mediaServerId - * @return */ void zlmServerOnline(String mediaServerId); /** * 鑺傜偣绂荤嚎 - * @param mediaServerId - * @return */ void zlmServerOffline(String mediaServerId); + /** + * 娓呯┖ + */ void clean(); + + + boolean saveToRandomGB(); + + /** + * 鎵归噺娣诲姞 + */ + void batchAdd(List<StreamPushItem> streamPushExcelDtoList); + + /** + * 涓澶氫釜鎺ㄦ祦 + */ + boolean batchStop(List<GbStream> streamPushItems); + + /** + * 瀵煎叆鏃舵壒閲忓鍔� + */ + void batchAddForUpload(List<StreamPushItem> streamPushItems, Map<String, List<String[]>> streamPushItemsForAll); + + /** + * 鍏ㄩ儴绂荤嚎 + */ + void allStreamOffline(); + + /** + * 鎺ㄦ祦绂荤嚎 + */ + void offline(List<StreamPushItemFromRedis> offlineStreams); + + /** + * 鎺ㄦ祦涓婄嚎 + */ + void online(List<StreamPushItemFromRedis> onlineStreams); + + /** + * 澧炲姞鎺ㄦ祦 + */ + boolean add(StreamPushItem stream); + + /** + * 鑾峰彇鍏ㄩ儴鐨刟pp+Streanm 鐢ㄤ簬鍒ゆ柇鎺ㄦ祦鍒楄〃鏄柊澧炶繕鏄慨鏀� + * @return + */ + List<String> getAllAppAndStream(); } -- Gitblit v1.8.0