From a1398a56cc3587f08c28032a5c00f4c71b48e4f7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 09:33:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 377cd94..f341548 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
@@ -1,12 +1,13 @@
package com.genersoft.iot.vmp.gb28181.event;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.sip.*;
+import javax.sip.header.CallIdHeader;
+import javax.sip.message.Response;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
@@ -24,7 +25,8 @@
private Map<String, Date> timeSubscribes = new ConcurrentHashMap<>();
// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
- @Scheduled(cron="0 * */1 * * ?") //姣忓皬鏃舵墽琛屼竴娆�
+// @Scheduled(fixedRate= 100 * 60 * 60 )
+ @Scheduled(cron="0 0 * * * ?") //姣忓皬鏃舵墽琛屼竴娆★紝 姣忎釜鏁寸偣
public void execute(){
logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭�");
Calendar calendar = Calendar.getInstance();
@@ -59,11 +61,15 @@
this.event = event;
if (event instanceof ResponseEvent) {
ResponseEvent responseEvent = (ResponseEvent)event;
- this.type = "response";
- this.msg = responseEvent.getResponse().getReasonPhrase();
- this.statusCode = responseEvent.getResponse().getStatusCode();
- this.callId = responseEvent.getDialog().getCallId().getCallId();
- this.dialog = responseEvent.getDialog();
+ Response response = responseEvent.getResponse();
+ this.dialog = responseEvent.getDialog();
+ this.type = "response";
+ if (response != null) {
+ this.msg = response.getReasonPhrase();
+ this.statusCode = response.getStatusCode();
+ }
+ this.callId = ((CallIdHeader)response.getHeader(CallIdHeader.NAME)).getCallId();
+
}else if (event instanceof TimeoutEvent) {
TimeoutEvent timeoutEvent = (TimeoutEvent)event;
this.type = "timeout";
--
Gitblit v1.8.0