From 21a96ad20fd75e55d03c00af8df8adb039f0c77a Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 20 六月 2023 12:51:06 +0800 Subject: [PATCH] 修复通道刷新 --- src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java | 79 +++++++++++++++++++++++++++++++++------ 1 files changed, 66 insertions(+), 13 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 d8a4465..8d92002 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java @@ -1,14 +1,19 @@ package com.genersoft.iot.vmp.service; import com.genersoft.iot.vmp.gb28181.bean.GbStream; -import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; -import com.genersoft.iot.vmp.media.zlm.dto.MediaItem; +import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; 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.ResourceBaseInfo; import com.github.pagehelper.PageInfo; import java.util.List; +import java.util.Map; +/** + * @author lin + */ public interface IStreamPushService { List<StreamPushItem> handleJSON(String json, MediaServerItem mediaServerItem); @@ -29,13 +34,12 @@ /** * 鑾峰彇 - * @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); - StreamPushItem transform(MediaItem item); + List<StreamPushItem> getPushList(String mediaSererId); + + StreamPushItem transform(OnStreamChangedHookParam item); StreamPushItem getPush(String app, String streamId); @@ -43,22 +47,71 @@ * 鍋滄涓�璺帹娴� * @param app 搴旂敤鍚� * @param streamId 娴両D - * @return */ boolean stop(String app, String streamId); /** * 鏂扮殑鑺傜偣鍔犲叆 - * @param zlmServerConfig - * @return */ - void zlmServerOnline(ZLMServerConfig zlmServerConfig); + 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(); + + /** + * 鑾峰彇缁熻淇℃伅 + * @return + */ + ResourceBaseInfo getOverview(); } -- Gitblit v1.8.0