From 7db2bf7b51015a7e989ea5b0f4d9486dfd99d4bd Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 02 九月 2022 10:51:55 +0800 Subject: [PATCH] 使用equalsIgnoreCase代替equals,忽略大小写差异 --- src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 183 +++++++++++++++++++++++++++++++++++++-------- 1 files changed, 151 insertions(+), 32 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..1f467e4 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java @@ -1,15 +1,26 @@ 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.gb28181.bean.*; +import com.genersoft.iot.vmp.media.zlm.dto.*; +import com.genersoft.iot.vmp.service.bean.GPSMsgInfo; +import com.genersoft.iot.vmp.service.bean.MessageForPushChannel; +import com.genersoft.iot.vmp.service.bean.SSRCInfo; +import com.genersoft.iot.vmp.service.bean.ThirdPartyGB; +import com.genersoft.iot.vmp.storager.dao.dto.PlatformRegisterInfo; import java.util.List; import java.util.Map; public interface IRedisCatchStorage { + + /** + * 璁℃暟鍣ㄣ�備负cseq杩涜璁℃暟 + * + * @return + */ + Long getCSEQ(); /** * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆 @@ -35,30 +46,15 @@ StreamInfo queryPlayByStreamId(String steamId); - 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); - boolean startPlayback(StreamInfo stream); + boolean startPlayback(StreamInfo stream, String callId); - boolean stopPlayback(StreamInfo streamInfo); + boolean stopPlayback(String deviceId, String channelId, String stream, String callId); - StreamInfo queryPlaybackByDevice(String deviceId, String code); + StreamInfo queryPlayback(String deviceId, String channelID, String stream, String callId); void updatePlatformCatchInfo(ParentPlatformCatch parentPlatformCatch); @@ -66,17 +62,13 @@ void delPlatformCatchInfo(String platformGbId); - void updatePlatformKeepalive(ParentPlatform parentPlatform); - void delPlatformKeepalive(String platformGbId); - - void updatePlatformRegister(ParentPlatform parentPlatform); void delPlatformRegister(String platformGbId); - void updatePlatformRegisterInfo(String callId, String platformGbId); + void updatePlatformRegisterInfo(String callId, PlatformRegisterInfo platformRegisterInfo); - String queryPlatformRegisterInfo(String callId); + PlatformRegisterInfo queryPlatformRegisterInfo(String callId); void delPlatformRegisterInfo(String callId); @@ -90,7 +82,7 @@ * @param channelId * @return sendRtpItem */ - SendRtpItem querySendRTPServer(String platformGbId, String channelId); + SendRtpItem querySendRTPServer(String platformGbId, String channelId, String streamId, String callId); List<SendRtpItem> querySendRTPServer(String platformGbId); @@ -99,7 +91,7 @@ * @param platformGbId * @param channelId */ - void deleteSendRTPServer(String platformGbId, String channelId); + void deleteSendRTPServer(String platformGbId, String channelId, String callId, String streamId); /** * 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級 @@ -114,7 +106,134 @@ void clearCatchByDeviceId(String deviceId); /** - * 璁剧疆鎵�鏈夎澶囩绾� + * 鍦╮edis娣诲姞wvp鐨勪俊鎭� */ - void outlineForAll(); + void updateWVPInfo(JSONObject jsonObject, int time); + + /** + * 鍙戦�佹帹娴佺敓鎴愪笌鎺ㄦ祦娑堝け娑堟伅 + * @param jsonObject 娑堟伅鍐呭 + */ + void sendStreamChangeMsg(String type, JSONObject jsonObject); + + /** + * 鍙戦�佹姤璀︽秷鎭� + * @param msg 娑堟伅鍐呭 + */ + void sendAlarmMsg(AlarmChannelMessage msg); + + /** + * 娣诲姞娴佷俊鎭埌redis + * @param mediaServerItem + * @param app + * @param streamId + */ + void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem item); + + /** + * 绉婚櫎娴佷俊鎭粠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, 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<MediaItem> getStreams(String mediaServerId, String pull); + + /** + * 灏哾evice淇℃伅鍐欏叆redis + * @param device + */ + void updateDevice(Device device); + + void removeDevice(String deviceId); + + /** + * 鑾峰彇Device + */ + Device getDevice(String deviceId); + + void resetAllCSEQ(); + + void updateGpsMsgInfo(GPSMsgInfo gpsMsgInfo); + + GPSMsgInfo getGpsMsgInfo(String gbId); + List<GPSMsgInfo> getAllGpsMsgInfo(); + + Long getSN(String method); + + void resetAllSN(); + + MediaItem getStreamInfo(String app, String streamId, String mediaServerId); + + void addCpuInfo(double cpuInfo); + + void addMemInfo(double memInfo); + + void addNetInfo(Map<String, String> networkInterfaces); + + void sendMobilePositionMsg(JSONObject jsonObject); + + void sendStreamPushRequestedMsg(MessageForPushChannel messageForPushChannel); + + /** + * 鍒ゆ柇璁惧鐘舵�� + * @param deviceId 璁惧ID + * @return + */ + public boolean deviceIsOnline(String deviceId); + + /** + * 瀛樺偍鎺ㄦ祦鐨勯壌鏉冧俊鎭� + * @param app 搴旂敤鍚� + * @param stream 娴� + * @param streamAuthorityInfo 閴存潈淇℃伅 + */ + void updateStreamAuthorityInfo(String app, String stream, StreamAuthorityInfo streamAuthorityInfo); + + /** + * 绉婚櫎鎺ㄦ祦鐨勯壌鏉冧俊鎭� + * @param app 搴旂敤鍚� + * @param streamId 娴� + */ + void removeStreamAuthorityInfo(String app, String streamId); + + /** + * 鑾峰彇鎺ㄦ祦鐨勯壌鏉冧俊鎭� + * @param app 搴旂敤鍚� + * @param stream 娴� + * @return + */ + StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream); + + /** + * 鍙戦�乺edis娑堟伅 鏌ヨ鎵�鏈夋帹娴佽澶囩殑鐘舵�� + */ + void sendStreamPushRequestedMsgForStatus(); + + List<SendRtpItem> querySendRTPServerByChnnelId(String channelId); } -- Gitblit v1.8.0