From ee746e53cda8e35ede1d966b582160caeb1ca562 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 04 三月 2022 15:39:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitee.com/wvp-pro-record' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
index 76b4427..a9464b7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
@@ -1,11 +1,11 @@
package com.genersoft.iot.vmp.gb28181.event;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.offline.OfflineEvent;
import com.genersoft.iot.vmp.gb28181.event.platformKeepaliveExpire.PlatformKeepaliveExpireEvent;
+import com.genersoft.iot.vmp.gb28181.event.platformNotRegister.PlatformCycleRegisterEvent;
import com.genersoft.iot.vmp.gb28181.event.platformNotRegister.PlatformNotRegisterEvent;
+import com.genersoft.iot.vmp.gb28181.event.record.RecordEndEvent;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
import com.genersoft.iot.vmp.media.zlm.event.ZLMOfflineEvent;
import com.genersoft.iot.vmp.media.zlm.event.ZLMOnlineEvent;
@@ -14,7 +14,6 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
-import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEvent;
import com.genersoft.iot.vmp.gb28181.event.online.OnlineEvent;
@@ -67,6 +66,16 @@
platformNotRegisterEvent.setPlatformGbID(platformGbId);
applicationEventPublisher.publishEvent(platformNotRegisterEvent);
}
+
+ /**
+ * 骞冲彴鍛ㄦ湡娉ㄥ唽浜嬩欢
+ * @param paltformGbId
+ */
+ public void platformRegisterCycleEventPublish(String paltformGbId) {
+ PlatformCycleRegisterEvent platformCycleRegisterEvent = new PlatformCycleRegisterEvent(this);
+ platformCycleRegisterEvent.setPlatformGbID(paltformGbId);
+ applicationEventPublisher.publishEvent(platformCycleRegisterEvent);
+ }
/**
* 璁惧鎶ヨ浜嬩欢
@@ -90,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<>();
@@ -119,7 +128,7 @@
applicationEventPublisher.publishEvent(outEvent);
}
- @Async
+
public void catalogEventPublishForStream(String platformId, List<GbStream> gbStreams, String type) {
CatalogEvent outEvent = new CatalogEvent(this);
outEvent.setGbStreams(gbStreams);
@@ -128,10 +137,17 @@
applicationEventPublisher.publishEvent(outEvent);
}
- @Async
+
public void catalogEventPublishForStream(String platformId, GbStream gbStream, String type) {
List<GbStream> gbStreamList = new ArrayList<>();
gbStreamList.add(gbStream);
catalogEventPublishForStream(platformId, gbStreamList, type);
}
+
+ public void recordEndEventPush(RecordInfo recordInfo) {
+ RecordEndEvent outEvent = new RecordEndEvent(this);
+ outEvent.setRecordInfo(recordInfo);
+ applicationEventPublisher.publishEvent(outEvent);
+ }
+
}
--
Gitblit v1.8.0