From 3c025a5ac04b7b8fd619ea62d0cfeceb2060cce3 Mon Sep 17 00:00:00 2001 From: xingqiao <xingqiao@uni-ubi.com> Date: 星期五, 26 八月 2022 11:03:43 +0800 Subject: [PATCH] 1.解决轮询内存增长过快问题 --- src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 69 +++++++++++++++++++++++----------- 1 files changed, 47 insertions(+), 22 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 e669ab4..d10de48 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java @@ -3,10 +3,9 @@ import com.alibaba.fastjson.JSONObject; import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.gb28181.bean.*; -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.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; @@ -18,10 +17,9 @@ /** * 璁℃暟鍣ㄣ�備负cseq杩涜璁℃暟 * - * @param method sip 鏂规硶 * @return */ - Long getCSEQ(String method); + Long getCSEQ(); /** * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆 @@ -111,23 +109,6 @@ 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); @@ -137,6 +118,12 @@ * @param jsonObject 娑堟伅鍐呭 */ void sendStreamChangeMsg(String type, JSONObject jsonObject); + + /** + * 鍙戦�佹姤璀︽秷鎭� + * @param msg 娑堟伅鍐呭 + */ + void sendAlarmMsg(AlarmChannelMessage msg); /** * 娣诲姞娴佷俊鎭埌redis @@ -212,4 +199,42 @@ 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(); } -- Gitblit v1.8.0