From 41616f726dafafe7c015bf4f3e02a7aa9488a3a2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 三月 2022 10:47:06 +0800
Subject: [PATCH] 修复导入通道时无平台关联时的bug
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 142 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 128 insertions(+), 14 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 1f78df4..49c52d5 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,37 +1,151 @@
package com.genersoft.iot.vmp.gb28181.event;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.media.zlm.ZLMHttpHookSubscribe;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceNotFoundEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.sip.ResponseEvent;
-import javax.sip.message.Request;
-import java.util.EventObject;
+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;
import java.util.concurrent.ConcurrentHashMap;
@Component
public class SipSubscribe {
- private final static Logger logger = LoggerFactory.getLogger(SipSubscribe.class);
+ private final Logger logger = LoggerFactory.getLogger(SipSubscribe.class);
- private Map<String, SipSubscribe.Event> allSubscribes = new ConcurrentHashMap<>();
+ private Map<String, SipSubscribe.Event> errorSubscribes = new ConcurrentHashMap<>();
+
+ private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
+
+ private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Date> 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.MINUTE, calendar.get(Calendar.MINUTE) - 5);
+
+ for (String key : okTimeSubscribes.keySet()) {
+ if (okTimeSubscribes.get(key).before(calendar.getTime())){
+// logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ okSubscribes.remove(key);
+ okTimeSubscribes.remove(key);
+ }
+ }
+ for (String key : errorTimeSubscribes.keySet()) {
+ if (errorTimeSubscribes.get(key).before(calendar.getTime())){
+// logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ errorSubscribes.remove(key);
+ errorTimeSubscribes.remove(key);
+ }
+ }
+ logger.info("okTimeSubscribes.size:{}",okTimeSubscribes.size());
+ logger.info("okSubscribes.size:{}",okSubscribes.size());
+ logger.info("errorTimeSubscribes.size:{}",errorTimeSubscribes.size());
+ logger.info("errorSubscribes.size:{}",errorSubscribes.size());
+ }
public interface Event {
- void response(ResponseEvent event);
+ void response(EventResult eventResult);
}
- public void addSubscribe(String key, SipSubscribe.Event event) {
- allSubscribes.put(key, event);
+ public static class EventResult<EventObject>{
+ public int statusCode;
+ public String type;
+ public String msg;
+ public String callId;
+ public Dialog dialog;
+ public EventObject event;
+
+ public EventResult() {
+ }
+
+ public EventResult(EventObject event) {
+ this.event = event;
+ if (event instanceof ResponseEvent) {
+ ResponseEvent responseEvent = (ResponseEvent)event;
+ 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";
+ this.msg = "娑堟伅瓒呮椂鏈洖澶�";
+ this.statusCode = -1024;
+ this.callId = timeoutEvent.getClientTransaction().getDialog().getCallId().getCallId();
+ this.dialog = timeoutEvent.getClientTransaction().getDialog();
+ }else if (event instanceof TransactionTerminatedEvent) {
+ TransactionTerminatedEvent transactionTerminatedEvent = (TransactionTerminatedEvent)event;
+ this.type = "transactionTerminated";
+ this.msg = "浜嬪姟宸茬粨鏉�";
+ this.statusCode = -1024;
+ this.callId = transactionTerminatedEvent.getClientTransaction().getDialog().getCallId().getCallId();
+ this.dialog = transactionTerminatedEvent.getClientTransaction().getDialog();
+ }else if (event instanceof DialogTerminatedEvent) {
+ DialogTerminatedEvent dialogTerminatedEvent = (DialogTerminatedEvent)event;
+ this.type = "dialogTerminated";
+ this.msg = "浼氳瘽宸茬粨鏉�";
+ this.statusCode = -1024;
+ this.callId = dialogTerminatedEvent.getDialog().getCallId().getCallId();
+ this.dialog = dialogTerminatedEvent.getDialog();
+ }else if (event instanceof DeviceNotFoundEvent) {
+ DeviceNotFoundEvent deviceNotFoundEvent = (DeviceNotFoundEvent)event;
+ this.type = "deviceNotFoundEvent";
+ this.msg = "璁惧鏈壘鍒�";
+ this.statusCode = -1024;
+ this.callId = deviceNotFoundEvent.getDialog().getCallId().getCallId();
+ this.dialog = deviceNotFoundEvent.getDialog();
+ }
+ }
}
- public SipSubscribe.Event getSubscribe(String key) {
- return allSubscribes.get(key);
+ public void addErrorSubscribe(String key, SipSubscribe.Event event) {
+ errorSubscribes.put(key, event);
+ errorTimeSubscribes.put(key, new Date());
}
- public int getSize(){
- return allSubscribes.size();
+ public void addOkSubscribe(String key, SipSubscribe.Event event) {
+ okSubscribes.put(key, event);
+ okTimeSubscribes.put(key, new Date());
+ }
+
+ public SipSubscribe.Event getErrorSubscribe(String key) {
+ return errorSubscribes.get(key);
+ }
+
+ public void removeErrorSubscribe(String key) {
+ errorSubscribes.remove(key);
+ errorTimeSubscribes.remove(key);
+ }
+
+ public SipSubscribe.Event getOkSubscribe(String key) {
+ return okSubscribes.get(key);
+ }
+
+ public void removeOkSubscribe(String key) {
+ okSubscribes.remove(key);
+ okTimeSubscribes.remove(key);
+ }
+ public int getErrorSubscribesSize(){
+ return errorSubscribes.size();
+ }
+ public int getOkSubscribesSize(){
+ return okSubscribes.size();
}
}
--
Gitblit v1.8.0