From 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 01 四月 2022 16:45:29 +0800
Subject: [PATCH] 支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 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 f7b16a8..e66dfa0 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -3,8 +3,12 @@
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.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 java.util.List;
@@ -44,17 +48,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);
@@ -86,7 +88,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);
@@ -95,7 +97,7 @@
* @param platformGbId
* @param channelId
*/
- void deleteSendRTPServer(String platformGbId, String channelId);
+ void deleteSendRTPServer(String platformGbId, String channelId, String callId, String streamId);
/**
* 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
@@ -143,7 +145,7 @@
* @param app
* @param streamId
*/
- void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, StreamInfo streamInfo);
+ void addStream(MediaServerItem mediaServerItem, String type, String app, String streamId, MediaItem item);
/**
* 绉婚櫎娴佷俊鎭粠redis
@@ -164,9 +166,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);
/**
* 鏌ユ壘绗笁鏂圭郴缁熺暀涓嬬殑鍥芥爣棰勮鍊�
@@ -175,7 +179,7 @@
*/
ThirdPartyGB queryMemberNoGBId(String queryKey);
- List<StreamInfo> getStreams(String mediaServerId, String pull);
+ List<MediaItem> getStreams(String mediaServerId, String pull);
/**
* 灏哾evice淇℃伅鍐欏叆redis
@@ -201,9 +205,15 @@
void resetAllSN();
- void updateSubscribe(String key, SubscribeInfo subscribeInfo);
+ MediaItem getStreamInfo(String app, String streamId, String mediaServerId);
- SubscribeInfo getSubscribe(String key);
+ void addCpuInfo(double cpuInfo);
- void delSubscribe(String key);
+ void addMemInfo(double memInfo);
+
+ void addNetInfo(Map<String, String> networkInterfaces);
+
+ void sendMobilePositionMsg(JSONObject jsonObject);
+
+ void sendStreamPushRequestedMsg(MessageForPushChannel messageForPushChannel);
}
--
Gitblit v1.8.0