From a29a0a0785f966294ba01982fba62c1ff0f23bea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 22 四月 2021 17:33:07 +0800
Subject: [PATCH] 增加对设备的兼容性
---
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 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 7b7f599..98795ef 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,7 +1,5 @@
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;
@@ -77,11 +75,11 @@
}
@Override
- public StreamInfo queryPlayByDevice(String deviceId, String code) {
+ public StreamInfo queryPlayByDevice(String deviceId, String channelId) {
// List<Object> playLeys = redis.keys(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
deviceId,
- code));
+ channelId));
if (playLeys == null || playLeys.size() == 0) return null;
return (StreamInfo)redis.get(playLeys.get(0).toString());
}
@@ -261,34 +259,22 @@
}
}
-
- /**
- * 鏇存柊濯掍綋娴佸垪琛�
- * @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());
+ public void clearCatchByDeviceId(String deviceId) {
+ List<Object> playLeys = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAYER_PREFIX,
+ deviceId));
+ if (playLeys.size() > 0) {
+ for (Object key : playLeys) {
+ redis.del(key.toString());
+ }
}
- }
-
- /**
- * 鑾峰彇褰撳墠濯掍綋娴佸垪琛�
- * @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;
+ List<Object> playBackers = redis.scan(String.format("%S_*_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX,
+ deviceId));
+ if (playBackers.size() > 0) {
+ for (Object key : playBackers) {
+ redis.del(key.toString());
+ }
+ }
}
}
--
Gitblit v1.8.0