增加强制不查询编码信息配置

648540858

2020-11-13 33b51c40ddd9750a19b2c6a6618fb22386f87cd7

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

@@ -276,6 +276,7 @@
      PageResult pageResult = new PageResult<Device>();
      pageResult.setPage(page);
      pageResult.setCount(count);
      Device device = null;

      if (deviceIds == null || deviceIds.length == 0) {

@@ -284,11 +285,21 @@
         pageResult.setTotal(deviceIdList.size());
         int maxCount = (page + 1)* count;
         for (int i = page * count; i < (pageResult.getTotal() > maxCount ? maxCount : pageResult.getTotal() ); i++) {
            devices.add((Device)redis.get((String)deviceIdList.get(i)));
            // devices.add((Device)redis.get((String)deviceIdList.get(i)));
            device =(Device)redis.get((String)deviceIdList.get(i));
            if (redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX+device.getDeviceId()).size() == 0){
               // outline(device.getDeviceId());
            }
            devices.add(device);
         }
      } else {
         for (int i = 0; i < deviceIds.length; i++) {
            devices.add((Device)redis.get(VideoManagerConstants.DEVICE_PREFIX+deviceIds[i]));
            // devices.add((Device)redis.get(VideoManagerConstants.DEVICE_PREFIX+deviceIds[i]));
            device = (Device)redis.get(VideoManagerConstants.DEVICE_PREFIX+deviceIds[i]);
            if (redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX+device.getDeviceId()).size() == 0){
               // outline(device.getDeviceId());
            }
            devices.add(device);
         }
      }
      pageResult.setData(devices);
@@ -304,16 +315,25 @@
   @Override
   public List<Device> queryVideoDeviceList(String[] deviceIds) {
      List<Device> devices = new ArrayList<>();
      Device device = null;

      if (deviceIds == null || deviceIds.length == 0) {
//         List<Object> deviceIdList = redis.keys(VideoManagerConstants.DEVICE_PREFIX+"*");
         List<Object> deviceIdList = redis.scan(VideoManagerConstants.DEVICE_PREFIX+"*");
         for (int i = 0; i < deviceIdList.size(); i++) {
            devices.add((Device)redis.get((String)deviceIdList.get(i)));
            device =(Device)redis.get((String)deviceIdList.get(i));
            if (redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX+device.getDeviceId()).size() == 0){
               outline(device.getDeviceId());
            }
            devices.add(device);
         }
      } else {
         for (int i = 0; i < deviceIds.length; i++) {
            devices.add((Device)redis.get(VideoManagerConstants.DEVICE_PREFIX+deviceIds[i]));
            device = (Device)redis.get(VideoManagerConstants.DEVICE_PREFIX+deviceIds[i]);
            if (redis.scan(VideoManagerConstants.KEEPLIVEKEY_PREFIX+device.getDeviceId()).size() == 0){
               outline(device.getDeviceId());
            }
            devices.add(device);
         }
      }
      return devices;
@@ -409,7 +429,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;
@@ -505,14 +525,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) {
@@ -527,7 +547,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);