From 985082d33930868c3cc1723f28fd9aaae9013a8f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 八月 2023 09:11:22 +0800
Subject: [PATCH] 添加缺少的内容
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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
old mode 100644
new mode 100755
index 69529b0..75751ad
--- 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,7 +7,10 @@
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.time.Instant;
@@ -28,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 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
@@ -56,8 +60,7 @@
logger.debug("errorSubscribes.size:{}",errorSubscribes.size());
}
- public interface Event {
- void response(EventResult eventResult);
+ public interface Event { void response(EventResult eventResult) ;
}
/**
@@ -73,7 +76,9 @@
// 浼氳瘽宸茬粨鏉�
dialogTerminated,
// 璁惧鏈壘鍒�
- deviceNotFoundEvent
+ deviceNotFoundEvent,
+ // 璁惧鏈壘鍒�
+ cmdSendFailEvent
}
public static class EventResult<EventObject>{
@@ -81,7 +86,6 @@
public EventResultType type;
public String msg;
public String callId;
- public Dialog dialog;
public EventObject event;
public EventResult() {
@@ -92,7 +96,6 @@
if (event instanceof ResponseEvent) {
ResponseEvent responseEvent = (ResponseEvent)event;
Response response = responseEvent.getResponse();
- this.dialog = responseEvent.getDialog();
this.type = EventResultType.response;
if (response != null) {
this.msg = response.getReasonPhrase();
@@ -127,12 +130,10 @@
this.statusCode = -1024;
this.callId = dialogTerminatedEvent.getDialog().getCallId().getCallId();
}else if (event instanceof DeviceNotFoundEvent) {
- DeviceNotFoundEvent deviceNotFoundEvent = (DeviceNotFoundEvent)event;
this.type = EventResultType.deviceNotFoundEvent;
this.msg = "璁惧鏈壘鍒�";
this.statusCode = -1024;
- this.dialog = deviceNotFoundEvent.getDialog();
- this.callId = this.dialog != null ?deviceNotFoundEvent.getDialog().getCallId().getCallId() : null;
+ this.callId = ((DeviceNotFoundEvent) event).getCallId();
}
}
}
--
Gitblit v1.8.0