From 9b18c33dd87801f17a977a92ebb023b2c89ff1bb Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期四, 29 十月 2020 10:23:10 +0800
Subject: [PATCH] 录像查询更换日期后先清空原先的查询列表
---
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
index e69a645..7c3a2fc 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
@@ -101,7 +101,7 @@
// 濡傛灉鏈夌埗璁惧,鏇存柊鐖惰澶囧唴瀛愯妭鐐规暟
String parentId = channel.getParentId();
- if (!StringUtils.isEmpty(parentId)) {
+ if (!StringUtils.isEmpty(parentId) && !parentId.equals(deviceId)) {
if (channelMap.get(parentId) == null) {
channelMap.put(parentId, new HashSet<String>());
@@ -111,8 +111,6 @@
DeviceChannel deviceChannel = queryChannel(deviceId, parentId);
if (deviceChannel != null) {
deviceChannel.setSubCount(channelMap.get(parentId).size());
-// redis.set(VideoManagerConstants.CACHEKEY_PREFIX+deviceId + "_" + deviceChannel.getChannelId(),
-// deviceChannel);
redis.set(VideoManagerConstants.CACHEKEY_PREFIX + deviceId +
"_" + deviceChannel.getChannelId() +
"_" + (deviceChannel.getStatus() == 1 ? "on":"off") +
@@ -411,7 +409,7 @@
}
@Override
- public StreamInfo queryPlayBlackBySSRC(String ssrc) {
+ public StreamInfo queryPlaybackBySSRC(String ssrc) {
// List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc));
List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, ssrc));
if (playLeys == null || playLeys.size() == 0) return null;
@@ -456,7 +454,6 @@
for (Device device : devices) {
// 鏇存柊璁惧涓嬬殑閫氶亾
HashMap<String, HashSet<String>> channelMap = new HashMap<String, HashSet<String>>();
-// List<Object> deviceChannelList = redis.keys(VideoManagerConstants.CACHEKEY_PREFIX +
List<Object> deviceChannelList = redis.scan(VideoManagerConstants.CACHEKEY_PREFIX +
device.getDeviceId() + "_" + "*");
if (deviceChannelList != null && deviceChannelList.size() > 0 ) {
@@ -477,6 +474,7 @@
}
deviceMap.put(device.getDeviceId(),channelMap);
}
+ System.out.println();
}
@Override
@@ -507,14 +505,14 @@
@Override
- public boolean startPlayBlack(StreamInfo stream) {
+ public boolean startPlayback(StreamInfo stream) {
return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()),
stream);
}
@Override
- public boolean stopPlayBlack(StreamInfo streamInfo) {
+ public boolean stopPlayback(StreamInfo streamInfo) {
if (streamInfo == null) return false;
DeviceChannel deviceChannel = queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId());
if (deviceChannel != null) {
@@ -529,7 +527,7 @@
}
@Override
- public StreamInfo queryPlayBlackByDevice(String deviceId, String code) {
+ public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
deviceId,
code);
--
Gitblit v1.8.0