与master分支同步

Lawrence

2020-12-16 44d216100b45c3337c593ee82ee68e7e0f35d24b

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

@@ -8,6 +8,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -554,7 +555,46 @@
      List<Object> playLeys = redis.scan(String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
            deviceId,
            code));
      if (playLeys == null || playLeys.size() == 0) {
         playLeys = redis.scan(String.format("%S_*_*_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
            deviceId));
      }
      if (playLeys == null || playLeys.size() == 0) return null;
      return (StreamInfo)redis.get(playLeys.get(0).toString());
   }

   @Override
   public boolean updateParentPlatform(ParentPlatform parentPlatform) {

      // 存储device
      return redis.set(VideoManagerConstants.PLATFORM_PREFIX + parentPlatform.getDeviceGBId(), parentPlatform);
   }

   @Override
   public boolean deleteParentPlatform(ParentPlatform parentPlatform) {
      return redis.del(VideoManagerConstants.PLATFORM_PREFIX + parentPlatform.getDeviceGBId());
   }

   @Override
   public PageResult<ParentPlatform> queryParentPlatformList(int page, int count) {
      PageResult pageResult = new PageResult<Device>();
      pageResult.setPage(page);
      pageResult.setCount(count);
      List<ParentPlatform> resultData = new ArrayList<>();
      List<Object> parentPlatformList = redis.scan(VideoManagerConstants.PLATFORM_PREFIX + "*");
      pageResult.setTotal(parentPlatformList.size());
      int maxCount = (page + 1)* count;
      for (int i = page * count; i < (pageResult.getTotal() > maxCount ? maxCount : pageResult.getTotal() ); i++) {
         ParentPlatform parentPlatform =(ParentPlatform)redis.get((String)parentPlatformList.get(i));
         resultData.add(parentPlatform);

      }
      pageResult.setData(resultData);
      return pageResult;
   }

   @Override
   public ParentPlatform queryParentPlatById(String platformGbId) {
      return (ParentPlatform)redis.get(VideoManagerConstants.PLATFORM_PREFIX + platformGbId);
   }
}