From 7d5a5b6c8fa20720a01986e9498a4cee6ec3674b Mon Sep 17 00:00:00 2001 From: xubinbin <1323875150@qq.com> Date: 星期二, 30 五月 2023 13:24:46 +0800 Subject: [PATCH] 删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql,保证升级脚本能正常执行。 --- src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java index e5b995e..75751ad 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java @@ -7,10 +7,12 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.sip.*; +import javax.sip.DialogTerminatedEvent; +import javax.sip.ResponseEvent; +import javax.sip.TimeoutEvent; +import javax.sip.TransactionTerminatedEvent; import javax.sip.header.CallIdHeader; import javax.sip.message.Response; -import java.text.ParseException; import java.time.Instant; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -29,6 +31,7 @@ private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>(); private Map<String, Instant> okTimeSubscribes = new ConcurrentHashMap<>(); + private Map<String, Instant> errorTimeSubscribes = new ConcurrentHashMap<>(); // @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆� @@ -73,7 +76,9 @@ // 浼氳瘽宸茬粨鏉� dialogTerminated, // 璁惧鏈壘鍒� - deviceNotFoundEvent + deviceNotFoundEvent, + // 璁惧鏈壘鍒� + cmdSendFailEvent } public static class EventResult<EventObject>{ @@ -83,6 +88,9 @@ public String callId; public EventObject event; + public EventResult() { + } + public EventResult(EventObject event) { this.event = event; if (event instanceof ResponseEvent) { -- Gitblit v1.8.0