修复获取设备信息信令Catalog不标准问题 PTZType，级联的Longitude、Latitude、PTZType等

shizy@yisa.com

2021-12-29 206f47f42ac9c679da1a4154b58d37441360f068

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

@@ -156,7 +156,7 @@
   }

   @Override
   public void updateChannels(String deviceId, List<DeviceChannel> channels) {
   public int updateChannels(String deviceId, List<DeviceChannel> channels) {
      List<DeviceChannel> addChannels = new ArrayList<>();
      List<DeviceChannel> updateChannels = new ArrayList<>();
      HashMap<String, DeviceChannel> channelsInStore = new HashMap<>();
@@ -210,13 +210,47 @@
                  if (i + limitCount > updateChannels.size()) {
                     toIndex = updateChannels.size();
                  }
                  deviceChannelMapper.batchAdd(updateChannels.subList(i, toIndex));
                  deviceChannelMapper.batchUpdate(updateChannels.subList(i, toIndex));
               }
            }else {
               deviceChannelMapper.batchUpdate(updateChannels);
            }
         }
      }
      return addChannels.size() + updateChannels.size();
   }

   @Override
   public boolean resetChannels(String deviceId, List<DeviceChannel> deviceChannelList) {
      TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
      try {
         int cleanChannelsResult = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
         int limitCount = 300;
         boolean result = cleanChannelsResult <0;
         if (!result && deviceChannelList.size() > 0) {
            if (deviceChannelList.size() > limitCount) {
               for (int i = 0; i < deviceChannelList.size(); i += limitCount) {
                  int toIndex = i + limitCount;
                  if (i + limitCount > deviceChannelList.size()) {
                     toIndex = deviceChannelList.size();
                  }
                  result = result || deviceChannelMapper.batchAdd(deviceChannelList.subList(i, toIndex)) < 0;
               }
            }else {
               result = result || deviceChannelMapper.batchAdd(deviceChannelList) < 0;
            }
         }
         if (result) {
            //事务回滚
            dataSourceTransactionManager.rollback(transactionStatus);
         }
         dataSourceTransactionManager.commit(transactionStatus);     //手动提交
         return true;
      }catch (Exception e) {
         dataSourceTransactionManager.rollback(transactionStatus);
         return false;
      }

   }

   @Override
@@ -256,6 +290,11 @@
      PageHelper.startPage(page, count);
      List<DeviceChannel> all = deviceChannelMapper.queryChannels(deviceId, null, query, hasSubChannel, online);
      return new PageInfo<>(all);
   }

   @Override
   public List<DeviceChannel> queryChannelsByDeviceIdWithStartAndLimit(String deviceId, String query, Boolean hasSubChannel, Boolean online, int start, int limit) {
      return deviceChannelMapper.queryChannelsByDeviceIdWithStartAndLimit(deviceId, null, query, hasSubChannel, online, start, limit);
   }

   @Override
@@ -706,7 +745,6 @@
               if (streamProxyItems == null) {
                  platformGbStreamMapper.add(streamPushItem);
               }

            }
         }
      }