From 56859d09df8d4226882d43934acf32d60a3b51d7 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 30 三月 2021 18:46:34 +0800
Subject: [PATCH] 添加推流列表和拉流代理，下一步与国标关联
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 139 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 113 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index 89eaa13..7b7f599 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -1,23 +1,20 @@
package com.genersoft.iot.vmp.storager.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.common.RealVideo;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
-import com.genersoft.iot.vmp.gb28181.bean.PlatformRegister;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+@SuppressWarnings("rawtypes")
@Component
public class RedisCatchStorageImpl implements IRedisCatchStorage {
@@ -35,7 +32,7 @@
*/
@Override
public boolean startPlay(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getCahnnelId()),
+ return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
stream);
}
@@ -47,16 +44,10 @@
@Override
public boolean stopPlay(StreamInfo streamInfo) {
if (streamInfo == null) return false;
- DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId());
- if (deviceChannel != null) {
- deviceChannel.setStreamId(null);
- deviceChannel.setDeviceId(streamInfo.getDeviceID());
- deviceChannelMapper.update(deviceChannel);
- }
return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
streamInfo.getStreamId(),
streamInfo.getDeviceID(),
- streamInfo.getCahnnelId()));
+ streamInfo.getChannelId()));
}
/**
@@ -69,7 +60,7 @@
VideoManagerConstants.PLAYER_PREFIX,
streamInfo.getStreamId(),
streamInfo.getDeviceID(),
- streamInfo.getCahnnelId()));
+ streamInfo.getChannelId()));
}
@Override
public StreamInfo queryPlayByStreamId(String steamId) {
@@ -102,6 +93,7 @@
*/
@Override
public boolean updateMediaInfo(MediaServerConfig mediaServerConfig) {
+ mediaServerConfig.setUpdateTime(System.currentTimeMillis());
return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX,mediaServerConfig);
}
@@ -123,7 +115,7 @@
for (int i = 0; i < players.size(); i++) {
String key = (String) players.get(i);
StreamInfo streamInfo = (StreamInfo)redis.get(key);
- streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getCahnnelId(), streamInfo);
+ streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getChannelId(), streamInfo);
}
return streamInfos;
}
@@ -131,7 +123,7 @@
@Override
public boolean startPlayback(StreamInfo stream) {
- return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getCahnnelId()),
+ return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getStreamId(),stream.getDeviceID(), stream.getChannelId()),
stream);
}
@@ -139,7 +131,7 @@
@Override
public boolean stopPlayback(StreamInfo streamInfo) {
if (streamInfo == null) return false;
- DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId());
+ DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(streamInfo.getDeviceID(), streamInfo.getChannelId());
if (deviceChannel != null) {
deviceChannel.setStreamId(null);
deviceChannel.setDeviceId(streamInfo.getDeviceID());
@@ -148,14 +140,14 @@
return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
streamInfo.getStreamId(),
streamInfo.getDeviceID(),
- streamInfo.getCahnnelId()));
+ streamInfo.getChannelId()));
}
@Override
public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
- String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
- deviceId,
- code);
+ // String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ // deviceId,
+ // code);
List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
deviceId,
code));
@@ -175,13 +167,13 @@
@Override
public void updatePlatformKeepalive(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + parentPlatform.getDeviceGBId();
+ String key = VideoManagerConstants.PLATFORM_KEEPLIVEKEY_PREFIX + parentPlatform.getServerGBId();
redis.set(key, "", Integer.parseInt(parentPlatform.getKeepTimeout()));
}
@Override
public void updatePlatformRegister(ParentPlatform parentPlatform) {
- String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + parentPlatform.getDeviceGBId();
+ String key = VideoManagerConstants.PLATFORM_REGISTER_PREFIX + parentPlatform.getServerGBId();
redis.set(key, "", Integer.parseInt(parentPlatform.getExpires()));
}
@@ -204,4 +196,99 @@
public void delPlatformRegister(String platformGbId) {
redis.del(VideoManagerConstants.PLATFORM_REGISTER_PREFIX + platformGbId);
}
+
+
+ @Override
+ public void updatePlatformRegisterInfo(String callId, String platformGbId) {
+ String key = VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId;
+ redis.set(key, platformGbId);
+ }
+
+
+ @Override
+ public String queryPlatformRegisterInfo(String callId) {
+ return (String)redis.get(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId);
+ }
+
+ @Override
+ public void delPlatformRegisterInfo(String callId) {
+ redis.del(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + callId);
+ }
+
+ @Override
+ public void cleanPlatformRegisterInfos() {
+ List regInfos = redis.scan(VideoManagerConstants.PLATFORM_REGISTER_INFO_PREFIX + "*");
+ for (Object key : regInfos) {
+ redis.del(key.toString());
+ }
+ }
+
+ @Override
+ public void updateSendRTPSever(SendRtpItem sendRtpItem) {
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + sendRtpItem.getPlatformId() + "_" + sendRtpItem.getChannelId();
+ redis.set(key, sendRtpItem);
+ }
+
+ @Override
+ public SendRtpItem querySendRTPServer(String platformGbId, String channelId) {
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId;
+ return (SendRtpItem)redis.get(key);
+ }
+
+ /**
+ * 鍒犻櫎RTP鎺ㄩ�佷俊鎭紦瀛�
+ * @param platformGbId
+ * @param channelId
+ */
+ @Override
+ public void deleteSendRTPServer(String platformGbId, String channelId) {
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + platformGbId + "_" + channelId;
+ redis.del(key);
+ }
+
+ /**
+ * 鏌ヨ鏌愪釜閫氶亾鏄惁瀛樺湪涓婄骇鐐规挱锛圧TP鎺ㄩ�侊級
+ * @param channelId
+ */
+ @Override
+ public boolean isChannelSendingRTP(String channelId) {
+ String key = VideoManagerConstants.PLATFORM_SEND_RTP_INFO_PREFIX + "*_" + channelId;
+ List<Object> RtpStreams = redis.scan(key);
+ if (RtpStreams.size() > 0) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
+ /**
+ * 鏇存柊濯掍綋娴佸垪琛�
+ * @param mediaList
+ */
+ @Override
+ public void updateMediaList(List<RealVideo> mediaList) {
+ String key = VideoManagerConstants.MEDIA_STREAM_PREFIX;
+ redis.del(key);
+ for (int i = 0; i < mediaList.size(); i++) {
+ RealVideo realVideo = mediaList.get(i);
+ redis.zAdd(key, realVideo, realVideo.getCreateStamp());
+ }
+ }
+
+
+ /**
+ * 鑾峰彇褰撳墠濯掍綋娴佸垪琛�
+ * @return List<RealVideo>
+ */
+ @Override
+ public JSONObject getMediaList(int start, int end) {
+ String key = VideoManagerConstants.MEDIA_STREAM_PREFIX;
+ Set<Object> realVideos = redis.ZRange(key, start, end);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("list", new ArrayList(realVideos));
+ jsonObject.put("total", redis.zSize(key));
+
+ return jsonObject;
+ }
}
--
Gitblit v1.8.0