From c084d6c98af1ef4d36a61adc719df5db76589428 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 07 十月 2023 18:00:08 +0800
Subject: [PATCH] 优化国标级联心跳失败判断逻辑
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 129 ++++++++++++++++++++++++++++++------------
1 files changed, 92 insertions(+), 37 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 3bdec7a..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
@@ -1,17 +1,26 @@
package com.genersoft.iot.vmp.gb28181.event;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent;
+import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.sip.*;
-import java.util.Calendar;
-import java.util.Date;
+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;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+/**
+ * @author lin
+ */
@Component
public class SipSubscribe {
@@ -21,35 +30,62 @@
private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> timeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Instant> okTimeSubscribes = new ConcurrentHashMap<>();
-// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
- @Scheduled(cron="0 0 * * * ?") //姣忓皬鏃舵墽琛屼竴娆★紝 姣忎釜鏁寸偣
+ private Map<String, Instant> errorTimeSubscribes = new ConcurrentHashMap<>();
+
+ // @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
+ // @Scheduled(fixedRate= 100 * 60 * 60 )
+ @Scheduled(cron="0 0/5 * * * ?") //姣�5鍒嗛挓鎵ц涓�娆�
public void execute(){
- logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭�");
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) - 1);
- for (String key : timeSubscribes.keySet()) {
- if (timeSubscribes.get(key).before(calendar.getTime())){
- logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
- errorSubscribes.remove(key);
+ logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨凷IP璁㈤槄淇℃伅");
+
+ Instant instant = Instant.now().minusMillis(TimeUnit.MINUTES.toMillis(5));
+
+ for (String key : okTimeSubscribes.keySet()) {
+ if (okTimeSubscribes.get(key).isBefore(instant)){
okSubscribes.remove(key);
- timeSubscribes.remove(key);
+ okTimeSubscribes.remove(key);
}
}
+ for (String key : errorTimeSubscribes.keySet()) {
+ if (errorTimeSubscribes.get(key).isBefore(instant)){
+ errorSubscribes.remove(key);
+ errorTimeSubscribes.remove(key);
+ }
+ }
+ logger.debug("okTimeSubscribes.size:{}",okTimeSubscribes.size());
+ logger.debug("okSubscribes.size:{}",okSubscribes.size());
+ logger.debug("errorTimeSubscribes.size:{}",errorTimeSubscribes.size());
+ logger.debug("errorSubscribes.size:{}",errorSubscribes.size());
}
- public interface Event {
- void response(EventResult eventResult);
+ public interface Event { void response(EventResult eventResult) ;
+ }
+
+ /**
+ *
+ */
+ public enum EventResultType{
+ // 瓒呮椂
+ timeout,
+ // 鍥炲
+ response,
+ // 浜嬪姟宸茬粨鏉�
+ transactionTerminated,
+ // 浼氳瘽宸茬粨鏉�
+ dialogTerminated,
+ // 璁惧鏈壘鍒�
+ deviceNotFoundEvent,
+ // 璁惧鏈壘鍒�
+ cmdSendFailEvent
}
public static class EventResult<EventObject>{
public int statusCode;
- public String type;
+ public EventResultType type;
public String msg;
public String callId;
- public Dialog dialog;
public EventObject event;
public EventResult() {
@@ -59,44 +95,57 @@
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.type = EventResultType.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";
+ this.type = EventResultType.timeout;
this.msg = "娑堟伅瓒呮椂鏈洖澶�";
this.statusCode = -1024;
- this.callId = timeoutEvent.getClientTransaction().getDialog().getCallId().getCallId();
- this.dialog = timeoutEvent.getClientTransaction().getDialog();
+ if (timeoutEvent.isServerTransaction()) {
+ this.callId = ((SIPRequest)timeoutEvent.getServerTransaction().getRequest()).getCallIdHeader().getCallId();
+ }else {
+ this.callId = ((SIPRequest)timeoutEvent.getClientTransaction().getRequest()).getCallIdHeader().getCallId();
+ }
}else if (event instanceof TransactionTerminatedEvent) {
TransactionTerminatedEvent transactionTerminatedEvent = (TransactionTerminatedEvent)event;
- this.type = "transactionTerminated";
+ this.type = EventResultType.transactionTerminated;
this.msg = "浜嬪姟宸茬粨鏉�";
this.statusCode = -1024;
- this.callId = transactionTerminatedEvent.getClientTransaction().getDialog().getCallId().getCallId();
- this.dialog = transactionTerminatedEvent.getClientTransaction().getDialog();
+ if (transactionTerminatedEvent.isServerTransaction()) {
+ this.callId = ((SIPRequest)transactionTerminatedEvent.getServerTransaction().getRequest()).getCallIdHeader().getCallId();
+ }else {
+ this.callId = ((SIPRequest)transactionTerminatedEvent.getClientTransaction().getRequest()).getCallIdHeader().getCallId();
+ }
}else if (event instanceof DialogTerminatedEvent) {
DialogTerminatedEvent dialogTerminatedEvent = (DialogTerminatedEvent)event;
- this.type = "dialogTerminated";
+ this.type = EventResultType.dialogTerminated;
this.msg = "浼氳瘽宸茬粨鏉�";
this.statusCode = -1024;
this.callId = dialogTerminatedEvent.getDialog().getCallId().getCallId();
- this.dialog = dialogTerminatedEvent.getDialog();
+ }else if (event instanceof DeviceNotFoundEvent) {
+ this.type = EventResultType.deviceNotFoundEvent;
+ this.msg = "璁惧鏈壘鍒�";
+ this.statusCode = -1024;
+ this.callId = ((DeviceNotFoundEvent) event).getCallId();
}
}
}
public void addErrorSubscribe(String key, SipSubscribe.Event event) {
errorSubscribes.put(key, event);
- timeSubscribes.put(key, new Date());
+ errorTimeSubscribes.put(key, Instant.now());
}
public void addOkSubscribe(String key, SipSubscribe.Event event) {
okSubscribes.put(key, event);
- timeSubscribes.put(key, new Date());
+ okTimeSubscribes.put(key, Instant.now());
}
public SipSubscribe.Event getErrorSubscribe(String key) {
@@ -104,8 +153,11 @@
}
public void removeErrorSubscribe(String key) {
+ if(key == null){
+ return;
+ }
errorSubscribes.remove(key);
- timeSubscribes.remove(key);
+ errorTimeSubscribes.remove(key);
}
public SipSubscribe.Event getOkSubscribe(String key) {
@@ -113,8 +165,11 @@
}
public void removeOkSubscribe(String key) {
+ if(key == null){
+ return;
+ }
okSubscribes.remove(key);
- timeSubscribes.remove(key);
+ okTimeSubscribes.remove(key);
}
public int getErrorSubscribesSize(){
return errorSubscribes.size();
--
Gitblit v1.8.0