Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复查询设备信息接口返回设备通道数错误的问题

pull/1/head
648540858 2020-10-26 14:21:40 +08:00
parent 9361943e47
commit 6e8cc24e64
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
View File

@ -101,7 +101,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
// 如果有父设备,更新父设备内子节点数 // 如果有父设备,更新父设备内子节点数
String parentId = channel.getParentId(); String parentId = channel.getParentId();
if (!StringUtils.isEmpty(parentId)) { if (!StringUtils.isEmpty(parentId) && !parentId.equals(deviceId)) {
if (channelMap.get(parentId) == null) { if (channelMap.get(parentId) == null) {
channelMap.put(parentId, new HashSet<String>()); channelMap.put(parentId, new HashSet<String>());
@ -111,8 +111,6 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
DeviceChannel deviceChannel = queryChannel(deviceId, parentId); DeviceChannel deviceChannel = queryChannel(deviceId, parentId);
if (deviceChannel != null) { if (deviceChannel != null) {
deviceChannel.setSubCount(channelMap.get(parentId).size()); deviceChannel.setSubCount(channelMap.get(parentId).size());
// redis.set(VideoManagerConstants.CACHEKEY_PREFIX+deviceId + "_" + deviceChannel.getChannelId(),
// deviceChannel);
redis.set(VideoManagerConstants.CACHEKEY_PREFIX + deviceId + redis.set(VideoManagerConstants.CACHEKEY_PREFIX + deviceId +
"_" + deviceChannel.getChannelId() + "_" + deviceChannel.getChannelId() +
"_" + (deviceChannel.getStatus() == 1 ? "on":"off") + "_" + (deviceChannel.getStatus() == 1 ? "on":"off") +
@ -456,7 +454,6 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
for (Device device : devices) { for (Device device : devices) {
// 更新设备下的通道 // 更新设备下的通道
HashMap<String, HashSet<String>> channelMap = new HashMap<String, HashSet<String>>(); 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 + List<Object> deviceChannelList = redis.scan(VideoManagerConstants.CACHEKEY_PREFIX +
device.getDeviceId() + "_" + "*"); device.getDeviceId() + "_" + "*");
if (deviceChannelList != null && deviceChannelList.size() > 0 ) { if (deviceChannelList != null && deviceChannelList.size() > 0 ) {
@ -477,6 +474,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
} }
deviceMap.put(device.getDeviceId(),channelMap); deviceMap.put(device.getDeviceId(),channelMap);
} }
System.out.println();
} }
@Override @Override