Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

sc.dm

2022-03-10 4abbf4df07f02c0c94baa2787fdcf4a14dcb3463

 src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java

@@ -99,14 +99,14 @@
      applicationEventPublisher.publishEvent(outEvent);

   }



   @Async



   public void catalogEventPublish(String platformId, DeviceChannel deviceChannel, String type) {

      List<DeviceChannel> deviceChannelList = new ArrayList<>();

      deviceChannelList.add(deviceChannel);

      catalogEventPublish(platformId, deviceChannelList, type);

   }



   @Async



   public void catalogEventPublish(String platformId, List<DeviceChannel> deviceChannels, String type) {

      CatalogEvent outEvent = new CatalogEvent(this);

      List<DeviceChannel> channels = new ArrayList<>();

@@ -128,8 +128,8 @@
      applicationEventPublisher.publishEvent(outEvent);

   }



   @Async

   public void catalogEventPublishForStream(String platformId, GbStream[] gbStreams, String type) {



   public void catalogEventPublishForStream(String platformId, List<GbStream> gbStreams, String type) {

      CatalogEvent outEvent = new CatalogEvent(this);

      outEvent.setGbStreams(gbStreams);

      outEvent.setType(type);

@@ -137,10 +137,11 @@
      applicationEventPublisher.publishEvent(outEvent);

   }



   @Async



   public void catalogEventPublishForStream(String platformId, GbStream gbStream, String type) {

      GbStream[] gbStreams = {gbStream};

      catalogEventPublishForStream(platformId, gbStreams, type);

      List<GbStream> gbStreamList = new ArrayList<>();

      gbStreamList.add(gbStream);

      catalogEventPublishForStream(platformId, gbStreamList, type);

   }



   public void recordEndEventPush(RecordInfo recordInfo) {