From 002782569d323c8a9def230cd561ffb15b1f3f3a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 15 十月 2020 15:23:41 +0800
Subject: [PATCH] 修改bug
---
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 91b60a1..0c58763 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
@@ -93,7 +93,7 @@
":" + channel.getName() +
"_" + (channel.getStatus() == 1 ? "on":"off") +
"_" + (channelMap.get(channelId).size() > 0)+
- "_" + channel.getParentId(),
+ "_" + (StringUtils.isEmpty(channel.getParentId())?null:channel.getParentId()),
channel);
// 鏇存柊device涓殑閫氶亾鏁伴噺
Device device = (Device)redis.get(VideoManagerConstants.DEVICE_PREFIX+deviceId);
@@ -113,7 +113,14 @@
DeviceChannel deviceChannel = queryChannel(deviceId, parentId);
if (deviceChannel != null) {
deviceChannel.setSubCount(channelMap.get(parentId).size());
- redis.set(VideoManagerConstants.CACHEKEY_PREFIX+deviceId + "_" + deviceChannel.getChannelId(),
+// redis.set(VideoManagerConstants.CACHEKEY_PREFIX+deviceId + "_" + deviceChannel.getChannelId(),
+// deviceChannel);
+ redis.set(VideoManagerConstants.CACHEKEY_PREFIX + deviceId +
+ "_" + deviceChannel.getChannelId() +
+ ":" + deviceChannel.getName() +
+ "_" + (deviceChannel.getStatus() == 1 ? "on":"off") +
+ "_" + (channelMap.get(deviceChannel.getChannelId()).size() > 0)+
+ "_" + (StringUtils.isEmpty(deviceChannel.getParentId())?null:deviceChannel.getParentId()),
deviceChannel);
}
@@ -438,7 +445,8 @@
if (subChannel == null) {
subChannel = new HashSet<>();
}
- if (!"null".equals(s[6])) {
+ System.out.println(key);
+ if (s.length == 7 && !"null".equals(s[6])) {
subChannel.add(s[6]);
}
channelMap.put(channelId, subChannel);
--
Gitblit v1.8.0