合并主线

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java

@@ -695,7 +695,7 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
         }else {
             subChannels = channelList.subList(index, channelList.size());
         }
-        logger.info("[发送NOTIFY通知]类型： {}，发送数量： {}", type, channels.size());
+        logger.info("[发送NOTIFY通知]类型： {}，发送数量： {}", type, channelList.size());
         Integer finalIndex = index;
         String catalogXmlContent = getCatalogXmlContentForCatalogOther(parentPlatform, subChannels, type);
         sendNotify(parentPlatform, catalogXmlContent, subscribeInfo, eventResult -> {

src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java

@@ -154,26 +154,6 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
         return platformChannelMapper.queryChannelByPlatformIdAndChannelDeviceId(platformId, channelId);
     }
 
-    @Override
-    public int delAllChannelForGB(String platformId, String catalogId) {
-
-        int result;
-        if (platformId == null) {
-            return 0;
-        }
-        ParentPlatform platform = platformMapper.getParentPlatByServerGBId(platformId);
-        if (platform == null) {
-            return 0;
-        }
-        if (ObjectUtils.isEmpty(catalogId)) {
-            catalogId = null;
-        }
-
-        List<DeviceChannel> deviceChannels = platformChannelMapper.queryAllChannelInCatalog(platformId, catalogId);
-        eventPublisher.catalogEventPublish(platformId, deviceChannels, CatalogEvent.DEL);
-
-        return platformChannelMapper.delChannelForGBByCatalogId(platformId, catalogId);
-    }
     @Override
     public List<CommonGbChannel> queryCommonGbChannellList(Integer platformId) {
         return platformChannelMapper.queryCommonGbChannellList(platformId);