离在线状态样式修改 修复未回复200ok导致catalog一直发送的bug 修改点播接口未收到视频后回复

648540858

2020-10-13 d4ae8194eb87271423aba24bab0f0d815d5ffdc1

 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);

@@ -330,40 +329,53 @@
   /**
    * 开始播放时将流存入redis
    *
    * @param deviceId 设备ID
    * @param channelId 通道ID
    * @return
    */
   @Override
   public boolean startPlay(String deviceId, String channelId, StreamInfo stream) {
      return redis.set(String.format("%S_%s_%s", VideoManagerConstants.PLAYER_PREFIX, deviceId, channelId),
   public boolean startPlay(StreamInfo stream) {
      return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()),
            stream);
   }

   /**
    * 停止播放时从redis删除
    *
    * @param deviceId 设备ID
    * @param channelId 通道ID
    * @return
    */
   @Override
   public boolean stopPlay(String deviceId, String channelId) {
      return redis.del(String.format("%S_%s_%s", VideoManagerConstants.PLAYER_PREFIX, deviceId, channelId));
   public boolean stopPlay(StreamInfo streamInfo) {
      return redis.del(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
            streamInfo.getSsrc(),
            streamInfo.getDeviceID(),
            streamInfo.getCahnnelId()));
   }

   /**
    * 查询播放列表
    * @param deviceId 设备ID
    * @param channelId 通道ID
    * @return
    */
   @Override
   public StreamInfo queryPlay(String deviceId, String channelId) {
      return (StreamInfo)redis.get(String.format("%S_%s_%s", VideoManagerConstants.PLAYER_PREFIX, deviceId, channelId));
   public StreamInfo queryPlay(StreamInfo streamInfo) {
      return (StreamInfo)redis.get(String.format("%S_%s_%s_%s",
            VideoManagerConstants.PLAYER_PREFIX,
            streamInfo.getSsrc(),
            streamInfo.getDeviceID(),
            streamInfo.getCahnnelId()));
   }
   @Override
   public StreamInfo queryPlayBySSRC(String ssrc) {
      List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc));
      if (playLeys.size() == 0) return null;
      return (StreamInfo)redis.get(playLeys.get(0).toString());
   }


   @Override
   public StreamInfo queryPlayByDevice(String deviceId, String code) {
      List<Object> playLeys = redis.keys(String.format("%S_*_%s_%s", VideoManagerConstants.PLAYER_PREFIX,
            deviceId,
            code));
      return (StreamInfo)redis.get(playLeys.get(0).toString());
   }

   /**
    * 更新流媒体信息
@@ -404,11 +416,10 @@
               if (subChannel == null) {
                  subChannel = new HashSet<>();
               }
               if ("null".equals(s[6])) {
               if (!"null".equals(s[6])) {
                  subChannel.add(s[6]);
               }
               channelMap.put(channelId, subChannel);
               System.out.println();
            }
         }
         deviceMap.put(device.getDeviceId(),channelMap);
@@ -425,4 +436,7 @@
         }
      }
   }



}