From 20a3cb9e73d16bd08d99780b91ca0e8d8722a0f9 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 10 十二月 2021 11:28:25 +0800 Subject: [PATCH] 启用失败的流转发如果开启无人观看自动移除则不保存在数据库 --- src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 80 +++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java index 649fb71..4f240d8 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java @@ -1,10 +1,12 @@ package com.genersoft.iot.vmp.storager; +import com.alibaba.fastjson.JSONObject; import com.genersoft.iot.vmp.common.StreamInfo; -import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch; import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; +import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.service.bean.ThirdPartyGB; import java.util.List; import java.util.Map; @@ -38,19 +40,6 @@ StreamInfo queryPlaybackByStreamId(String steamId); StreamInfo queryPlayByDevice(String deviceId, String channelId); - - /** - * 鏇存柊娴佸獟浣撲俊鎭� - * @param ZLMServerConfig - * @return - */ - boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig); - - /** - * 鑾峰彇娴佸獟浣撲俊鎭� - * @return - */ - ZLMServerConfig getMediaInfo(); Map<String, StreamInfo> queryPlayByDeviceId(String deviceId); @@ -114,7 +103,70 @@ void clearCatchByDeviceId(String deviceId); /** + * 鑾峰彇mediaServer鑺傜偣 + * @param mediaServerId + * @return + */ +// MediaServerItem getMediaInfo(String mediaServerId); + + /** * 璁剧疆鎵�鏈夎澶囩绾� */ void outlineForAll(); + + /** + * 鑾峰彇鎵�鏈夊湪绾跨殑 + */ + List<String> getOnlineForAll(); + + /** + * 鍦╮edis娣诲姞wvp鐨勪俊鎭� + */ + void updateWVPInfo(JSONObject jsonObject, int time); + + /** + * 鍙戦�佹帹娴佺敓鎴愪笌鎺ㄦ祦娑堝け娑堟伅 + * @param jsonObject 娑堟伅鍐呭 + */ + void sendStreamChangeMsg(String type, JSONObject jsonObject); + + /** + * 娣诲姞娴佷俊鎭埌redis + * @param mediaServerItem + * @param app + * @param streamId + */ + void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo); + + /** + * 绉婚櫎娴佷俊鎭粠redis + * @param mediaServerId + * @param app + * @param streamId + */ + void removeStream(String mediaServerId, String type, String app, String streamId); + + + /** + * 绉婚櫎娴佷俊鎭粠redis + * @param mediaServerId + */ + void removeStream(String mediaServerId, String type); + + /** + * 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆 + * @param streamInfo + */ + boolean startDownload(StreamInfo streamInfo); + + StreamInfo queryDownloadByStreamId(String streamId); + + /** + * 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊� + * @param queryKey + * @return + */ + ThirdPartyGB queryMemberNoGBId(String queryKey); + + List<StreamInfo> getStreams(String mediaServerId, String pull); } -- Gitblit v1.8.0