From fff3d64f850b3ee61b9847cd80e7958c46cc6347 Mon Sep 17 00:00:00 2001
From: 庄梦蝶殇 <linhuaichuan1989@126.com>
Date: 星期三, 27 七月 2022 18:31:33 +0800
Subject: [PATCH] fix 优化pom依赖，去除几个重复客户端。并改了几个 equals判断不精准的bug
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 94 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 39 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 1a93902..b9811da 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;
@@ -47,17 +46,15 @@
StreamInfo queryPlayByStreamId(String steamId);
- StreamInfo queryPlaybackByStreamId(String steamId);
-
StreamInfo queryPlayByDevice(String deviceId, String channelId);
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);
@@ -89,7 +86,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);
@@ -98,7 +95,7 @@
* @param platformGbId
* @param channelId
*/
- void deleteSendRTPServer(String platformGbId, String channelId);
+ void deleteSendRTPServer(String platformGbId, String channelId, String callId, String streamId);
/**
* 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
@@ -113,23 +110,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);
@@ -139,6 +119,12 @@
* @param jsonObject 娑堟伅鍐呭
*/
void sendStreamChangeMsg(String type, JSONObject jsonObject);
+
+ /**
+ * 鍙戦�佹姤璀︽秷鎭�
+ * @param msg 娑堟伅鍐呭
+ */
+ void sendAlarmMsg(AlarmChannelMessage msg);
/**
* 娣诲姞娴佷俊鎭埌redis
@@ -167,9 +153,11 @@
* 寮�濮嬩笅杞藉綍鍍忔椂瀛樺叆
* @param streamInfo
*/
- boolean startDownload(StreamInfo streamInfo);
+ boolean startDownload(StreamInfo streamInfo, String callId);
- StreamInfo queryDownloadByStreamId(String streamId);
+ StreamInfo queryDownload(String deviceId, String channelId, String stream, String callId);
+
+ boolean stopDownload(String deviceId, String channelId, String stream, String callId);
/**
* 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊�
@@ -204,17 +192,7 @@
void resetAllSN();
- void updateSubscribe(String key, SubscribeInfo subscribeInfo);
-
- SubscribeInfo getSubscribe(String key);
-
- void delSubscribe(String key);
-
MediaItem getStreamInfo(String app, String streamId, String mediaServerId);
-
- List<SubscribeInfo> getAllSubscribe();
-
- List<String> getAllSubscribePlatform();
void addCpuInfo(double cpuInfo);
@@ -222,4 +200,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