Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-10-12 2673fbb0bf7af6405c544cc8a56f17d03018c59a

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

@@ -17,6 +17,7 @@
import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.sun.org.apache.xml.internal.resolver.Catalog;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -94,12 +95,6 @@
   @Autowired
    private PlatformGbStreamMapper platformGbStreamMapper;

   @Autowired
    private IGbStreamService gbStreamService;

   @Autowired
    private ParentPlatformMapper parentPlatformMapper;

   /**
    * 根据设备ID判断设备是否存在
    *
@@ -169,7 +164,7 @@
            }
         }
      }
      if (channels.size() > 0) {
      if (!channels.isEmpty()) {
         for (DeviceChannel channel : channels) {
            if (subContMap.get(channel.getChannelId()) != null){
               Integer count = subContMap.get(channel.getChannelId());
@@ -190,19 +185,7 @@
      }
      try {
         int limitCount = 50;
         int cleanChannelsResult = 0;
         if (channels.size() > limitCount) {
            for (int i = 0; i < channels.size(); i += limitCount) {
               int toIndex = i + limitCount;
               if (i + limitCount > channels.size()) {
                  toIndex = channels.size();
               }
               cleanChannelsResult += this.deviceChannelMapper.cleanChannelsNotInList(deviceId, channels.subList(i, toIndex));
            }
         } else {
            cleanChannelsResult = this.deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
         }
         boolean result = cleanChannelsResult < 0;
         boolean result = false;
         if (!result && addChannels.size() > 0) {
            if (addChannels.size() > limitCount) {
               for (int i = 0; i < addChannels.size(); i += limitCount) {