From c429a34e5390b0245da276c2c03a6116822167c3 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 08 五月 2023 17:18:08 +0800 Subject: [PATCH] 修复国标视频点播三种级联并发点播和录像下载的问题 --- src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 43 ++++++------------------------------------- 1 files changed, 6 insertions(+), 37 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 b6cfab4..ec93e78 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java @@ -1,14 +1,16 @@ package com.genersoft.iot.vmp.storager; import com.alibaba.fastjson2.JSONObject; -import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.common.SystemAllInfo; -import com.genersoft.iot.vmp.gb28181.bean.*; -import com.genersoft.iot.vmp.media.zlm.dto.*; +import com.genersoft.iot.vmp.gb28181.bean.AlarmChannelMessage; +import com.genersoft.iot.vmp.gb28181.bean.Device; +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.media.zlm.dto.StreamAuthorityInfo; import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam; import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; -import com.genersoft.iot.vmp.service.bean.ThirdPartyGB; import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo; import java.util.List; @@ -22,14 +24,6 @@ * @return */ Long getCSEQ(); - - boolean startPlayback(StreamInfo stream, String callId); - - boolean stopPlayback(String deviceId, String channelId, String stream, String callId); - - StreamInfo queryPlayback(String deviceId, String channelID, String stream, String callId); - - String queryPlaybackForKey(String deviceId, String channelId, String stream, String callId); void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch); @@ -46,8 +40,6 @@ PlatformRegisterInfo queryPlatformRegisterInfo(String callId); void delPlatformRegisterInfo(String callId); - - void cleanPlatformRegisterInfos(); void updateSendRTPSever(SendRtpItem sendRtpItem); @@ -73,12 +65,6 @@ * @param channelId */ boolean isChannelSendingRTP(String channelId); - - /** - * 娓呯┖鏌愪釜璁惧鐨勬墍鏈夌紦瀛� - * @param deviceId 璁惧ID - */ - void clearCatchByDeviceId(String deviceId); /** * 鍦╮edis娣诲姞wvp鐨勪俊鎭� @@ -119,23 +105,6 @@ * @param mediaServerId */ void removeStream(String mediaServerId, String type); - - /** - * 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆 - * @param streamInfo - */ - boolean startDownload(StreamInfo streamInfo, String callId); - - StreamInfo queryDownload(String deviceId, String channelId, String stream, String callId); - - boolean stopDownload(String deviceId, String channelId, String stream, String callId); - - /** - * 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊� - * @param queryKey - * @return - */ - ThirdPartyGB queryMemberNoGBId(String queryKey); List<OnStreamChangedHookParam> getStreams(String mediaServerId, String pull); -- Gitblit v1.8.0