修复子节点显示错误

648540858

2020-10-12 be42a35ecacf4436eb517ae652befd36b8231182

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

@@ -80,11 +80,10 @@
      String channelId = channel.getChannelId();
      HashMap<String, HashSet<String>> channelMap = deviceMap.get(deviceId);
      if (channelMap == null) return;

      // 作为父设备, 确定自己的子节点数
      if (channelMap.get(channelId) == null) {
         channelMap.put(channelId, new HashSet<String>());
      }else if (channelMap.get(channelId).size()> 0) {
      }else if (channelMap.get(channelId).size() > 0) {
         channel.setSubCount(channelMap.get(channelId).size());
      }

@@ -107,7 +106,7 @@
      if (!StringUtils.isEmpty(parentId)) {

         if (channelMap.get(parentId) == null) {
            channelMap.put(parentId, new HashSet<>());
            channelMap.put(parentId, new HashSet<String>());
         }
         channelMap.get(parentId).add(channelId);

@@ -399,19 +398,29 @@
            for (int i = 0; i < deviceChannelList.size(); i++) {
               String key = (String)deviceChannelList.get(i);
               String[] s = key.split("_");
               String channelId = s[3];
               String channelId = s[3].split(":")[0];
               HashSet<String> subChannel = channelMap.get(channelId);
               if (subChannel == null) {
                  subChannel = new HashSet<>();
               }
               if (s.length > 4) {
                  subChannel.add(s[4]);
               if (!"null".equals(s[6])) {
                  subChannel.add(s[6]);
               }
               channelMap.put(channelId, subChannel);
               System.out.println();
            }
         }
         deviceMap.put(device.getDeviceId(),channelMap);
      }
   }

   @Override
   public void cleanChannelsForDevice(String deviceId) {
      List<DeviceChannel> result = new ArrayList<>();
      List<Object> deviceChannelList = redis.keys(VideoManagerConstants.CACHEKEY_PREFIX + deviceId + "_" + "*");
      if (deviceChannelList != null && deviceChannelList.size() > 0 ) {
         for (int i = 0; i < deviceChannelList.size(); i++) {
            redis.del((String)deviceChannelList.get(i));
         }
      }
   }
}