From e2f9ee8f7b2c8b210c75fcd328b2d42c37f9d737 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 06 五月 2023 17:40:57 +0800
Subject: [PATCH] 修复国标视频点播三种点播方式（自动点播，上级点播，接口点播）并发情况下失败的问题
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 81 ----------------------------------------
1 files changed, 0 insertions(+), 81 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 aed9811..dabe9f8 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
@@ -92,87 +92,6 @@
}
}
- /**
- * 寮�濮嬫挱鏀炬椂灏嗘祦瀛樺叆redis
- */
- @Override
- public boolean startPlay(StreamInfo stream) {
-
- redisTemplate.opsForValue().set(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(),
- stream.getMediaServerId(), stream.getStream(), stream.getDeviceID(), stream.getChannelId()),
- stream);
- return true;
- }
-
- /**
- * 鍋滄鎾斁鏃朵粠redis鍒犻櫎
- */
- @Override
- public boolean stopPlay(StreamInfo streamInfo) {
- if (streamInfo == null) {
- return false;
- }
- Boolean result = redisTemplate.delete(String.format("%S_%s_%s_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- streamInfo.getMediaServerId(),
- streamInfo.getStream(),
- streamInfo.getDeviceID(),
- streamInfo.getChannelId()));
- return result != null && result;
- }
-
- /**
- * 鏌ヨ鎾斁鍒楄〃
- */
- @Override
- public StreamInfo queryPlay(StreamInfo streamInfo) {
- return (StreamInfo)redisTemplate.opsForValue().get(String.format("%S_%s_%s_%s_%s_%s",
- VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- streamInfo.getMediaServerId(),
- streamInfo.getStream(),
- streamInfo.getDeviceID(),
- streamInfo.getChannelId()));
- }
- @Override
- public StreamInfo queryPlayByStreamId(String streamId) {
- List<Object> playLeys = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(), streamId));
- if (playLeys.size() == 0) {
- return null;
- }
- return (StreamInfo)redisTemplate.opsForValue().get(playLeys.get(0).toString());
- }
-
- @Override
- public StreamInfo queryPlayByDevice(String deviceId, String channelId) {
- List<Object> playLeys = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
- userSetting.getServerId(),
- deviceId,
- channelId));
- if (playLeys.size() == 0) {
- return null;
- }
- return (StreamInfo)redisTemplate.opsForValue().get(playLeys.get(0).toString());
- }
-
- @Override
- public Map<String, StreamInfo> queryPlayByDeviceId(String deviceId) {
- Map<String, StreamInfo> streamInfos = new HashMap<>();
- List<Object> players = RedisUtil.scan(redisTemplate, String.format("%S_%s_*_*_%s_*", VideoManagerConstants.PLAYER_PREFIX, userSetting.getServerId(),deviceId));
- if (players.size() == 0) {
- return streamInfos;
- }
- for (Object player : players) {
- String key = (String) player;
- StreamInfo streamInfo = JsonUtil.redisJsonToObject(redisTemplate, key, StreamInfo.class);
- if (Objects.isNull(streamInfo)) {
- continue;
- }
- streamInfos.put(streamInfo.getDeviceID() + "_" + streamInfo.getChannelId(), streamInfo);
- }
- return streamInfos;
- }
-
@Override
public boolean startPlayback(StreamInfo stream, String callId) {
--
Gitblit v1.8.0