From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java | 67 ++++-----------------------------
1 files changed, 9 insertions(+), 58 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 ffe477f..26ababd 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,22 +1,18 @@
package com.genersoft.iot.vmp.gb28181.event;
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.device.RequestTimeoutEvent;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEvent;
-import com.genersoft.iot.vmp.gb28181.event.online.OnlineEvent;
+import javax.sip.TimeoutEvent;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -32,58 +28,6 @@
@Autowired
private ApplicationEventPublisher applicationEventPublisher;
-
- public void onlineEventPublish(Device device, String from, int expires) {
- OnlineEvent onEvent = new OnlineEvent(this);
- onEvent.setDevice(device);
- onEvent.setFrom(from);
- onEvent.setExpires(expires);
- applicationEventPublisher.publishEvent(onEvent);
- }
-
- public void onlineEventPublish(Device device, String from) {
- OnlineEvent onEvent = new OnlineEvent(this);
- onEvent.setDevice(device);
- onEvent.setFrom(from);
- applicationEventPublisher.publishEvent(onEvent);
- }
-
- public void outlineEventPublish(String deviceId, String from){
- OfflineEvent outEvent = new OfflineEvent(this);
- outEvent.setDeviceId(deviceId);
- outEvent.setFrom(from);
- applicationEventPublisher.publishEvent(outEvent);
- }
-
- /**
- * 骞冲彴蹇冭烦鍒版湡浜嬩欢
- * @param platformGbId
- */
- public void platformKeepaliveExpireEventPublish(String platformGbId){
- PlatformKeepaliveExpireEvent platformNotRegisterEvent = new PlatformKeepaliveExpireEvent(this);
- platformNotRegisterEvent.setPlatformGbID(platformGbId);
- applicationEventPublisher.publishEvent(platformNotRegisterEvent);
- }
-
- /**
- * 骞冲彴鏈敞鍐屼簨浠�
- * @param platformGbId
- */
- public void platformNotRegisterEventPublish(String platformGbId){
- PlatformNotRegisterEvent platformNotRegisterEvent = new PlatformNotRegisterEvent(this);
- platformNotRegisterEvent.setPlatformGbID(platformGbId);
- applicationEventPublisher.publishEvent(platformNotRegisterEvent);
- }
-
- /**
- * 骞冲彴鍛ㄦ湡娉ㄥ唽浜嬩欢
- * @param paltformGbId
- */
- public void platformRegisterCycleEventPublish(String paltformGbId) {
- PlatformCycleRegisterEvent platformCycleRegisterEvent = new PlatformCycleRegisterEvent(this);
- platformCycleRegisterEvent.setPlatformGbID(paltformGbId);
- applicationEventPublisher.publishEvent(platformCycleRegisterEvent);
- }
/**
* 璁惧鎶ヨ浜嬩欢
@@ -115,6 +59,13 @@
}
+ public void requestTimeOut(TimeoutEvent timeoutEvent) {
+ RequestTimeoutEvent requestTimeoutEvent = new RequestTimeoutEvent(this);
+ requestTimeoutEvent.setTimeoutEvent(timeoutEvent);
+ applicationEventPublisher.publishEvent(requestTimeoutEvent);
+ }
+
+
/**
*
* @param platformId
--
Gitblit v1.8.0