将上级平台标识改为serverGBId

Lawrence

2021-01-15 1b200bcc904d088b31ceaf1e9261b5433d9322a6

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java

@@ -9,6 +9,7 @@
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.storager.dao.ParentPlatformMapper;
import com.genersoft.iot.vmp.storager.dao.PatformChannelMapper;
import com.genersoft.iot.vmp.vmanager.platform.bean.ChannelReduce;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -38,6 +39,9 @@

   @Autowired
    private IRedisCatchStorage redisCatchStorage;

   @Autowired
    private PatformChannelMapper patformChannelMapper;



@@ -119,7 +123,7 @@
   @Override
   public PageInfo queryChannelsByDeviceId(String deviceId, String query, Boolean hasSubChannel, Boolean online, int page, int count) {
      // 获取到所有正在播放的流
      PageHelper.startPage(page+1, count);
      PageHelper.startPage(page, count);
      List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, null, query, hasSubChannel, online);
      return new PageInfo<>(all);
   }
@@ -131,7 +135,7 @@

   @Override
   public PageInfo<DeviceChannel> querySubChannels(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, String online, int page, int count) {
      PageHelper.startPage(page+1, count);
      PageHelper.startPage(page, count);
      List<DeviceChannel> all = deviceChannelMapper.queryChannelsByDeviceId(deviceId, parentChannelId, null, null, null);
      return new PageInfo<>(all);
   }
@@ -151,7 +155,7 @@
    */
   @Override
   public PageInfo<Device> queryVideoDeviceList(int page, int count) {
      PageHelper.startPage(page+1, count);
      PageHelper.startPage(page, count);
      List<Device> all = deviceMapper.getDevices();
      return new PageInfo<>(all);
   }
@@ -227,14 +231,14 @@
   @Override
   public boolean updateParentPlatform(ParentPlatform parentPlatform) {
      int result = 0;
      ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getDeviceGBId());
      if ( platformMapper.getParentPlatById(parentPlatform.getDeviceGBId()) == null) {
      ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
      if ( platformMapper.getParentPlatById(parentPlatform.getServerGBId()) == null) {
         result = platformMapper.addParentPlatform(parentPlatform);

         if (parentPlatformCatch == null) {
            parentPlatformCatch = new ParentPlatformCatch();
            parentPlatformCatch.setParentPlatform(parentPlatform);
            parentPlatformCatch.setId(parentPlatform.getDeviceGBId());
            parentPlatformCatch.setId(parentPlatform.getServerGBId());
         }
      }else {
         result = platformMapper.updateParentPlatform(parentPlatform);
@@ -245,9 +249,12 @@
      return result > 0;
   }

   @Transactional
   @Override
   public boolean deleteParentPlatform(ParentPlatform parentPlatform) {
      int result = platformMapper.delParentPlatform(parentPlatform);
      // 删除关联的通道
      patformChannelMapper.cleanChannelForGB(parentPlatform.getDeviceGBId());
      return result > 0;
   }

@@ -275,17 +282,51 @@


   @Override
   public PageInfo<ChannelReduce> queryChannelListInAll(int page, int count, String query, Boolean online,
                                           Boolean channelType, String parentChannelId) {
   public PageInfo<ChannelReduce> queryAllChannelList(int page, int count, String query, Boolean online,
                                           Boolean channelType, String platformId, Boolean inPlatform) {
      PageHelper.startPage(page, count);
      List<ChannelReduce> all = deviceChannelMapper.queryChannelListInAll(query, online, channelType, parentChannelId);
      List<ChannelReduce> all = deviceChannelMapper.queryChannelListInAll(query, online, channelType, platformId, inPlatform);
      return new PageInfo<>(all);
   }

   @Override
   public List<ChannelReduce> queryChannelListInParentPlatform(String platformId) {

   @Transactional
      return deviceChannelMapper.queryChannelListInAll(null, null, null, platformId, true);
   }

   @Override
   public int updateChannelForGB(String platformId, List<ChannelReduce> channelReduces) {
      return 0;

      Map<String, ChannelReduce> deviceAndChannels = new HashMap<>();
      for (ChannelReduce channelReduce : channelReduces) {
         deviceAndChannels.put(channelReduce.getDeviceId() + "_" + channelReduce.getChannelId(), channelReduce);
      }
      List<String> deviceAndChannelList = new ArrayList<>(deviceAndChannels.keySet());
      // 查询当前已经存在的
      List<String> relatedPlatformchannels = patformChannelMapper.findChannelRelatedPlatform(platformId, deviceAndChannelList);
      if (relatedPlatformchannels != null) {
         deviceAndChannelList.removeAll(relatedPlatformchannels);
      }
      for (String relatedPlatformchannel : relatedPlatformchannels) {
         deviceAndChannels.remove(relatedPlatformchannel);
      }
      List<ChannelReduce> channelReducesToAdd = new ArrayList<>(deviceAndChannels.values());
      // 对剩下的数据进行存储
      int result = 0;
      if (channelReducesToAdd.size() > 0) {
         result = patformChannelMapper.addChannels(platformId, channelReducesToAdd);
      }

      return result;
   }


   @Override
   public int delChannelForGB(String platformId, List<ChannelReduce> channelReduces) {

      int result = patformChannelMapper.delChannelForGB(platformId, channelReduces);

      return result;
   }
}