From 4d2c36edcd43d18e30c354bfb88ed2a9ff8e5a94 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期三, 22 六月 2022 13:09:09 +0800
Subject: [PATCH] fix设备状态查询接口
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 b347bba..c6cfc7a 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
@@ -9,11 +9,14 @@
import javax.sip.*;
import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
-import java.util.Calendar;
-import java.util.Date;
+import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+/**
+ * @author lin
+ */
@Component
public class SipSubscribe {
@@ -23,36 +26,33 @@
private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> errorTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Instant> okTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Instant> errorTimeSubscribes = new ConcurrentHashMap<>();
// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
-// @Scheduled(fixedRate= 100 * 60 * 60 )
+ // @Scheduled(fixedRate= 100 * 60 * 60 )
@Scheduled(cron="0 0/5 * * * ?") //姣�5鍒嗛挓鎵ц涓�娆�
public void execute(){
logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨凷IP璁㈤槄淇℃伅");
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.set(Calendar.MINUTE, calendar.get(Calendar.MINUTE) - 5);
+
+ Instant instant = Instant.now().minusMillis(TimeUnit.MINUTES.toMillis(5));
for (String key : okTimeSubscribes.keySet()) {
- if (okTimeSubscribes.get(key).before(calendar.getTime())){
-// logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ if (okTimeSubscribes.get(key).isBefore(instant)){
okSubscribes.remove(key);
okTimeSubscribes.remove(key);
}
}
for (String key : errorTimeSubscribes.keySet()) {
- if (errorTimeSubscribes.get(key).before(calendar.getTime())){
-// logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ if (errorTimeSubscribes.get(key).isBefore(instant)){
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());
+ 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 {
@@ -88,8 +88,8 @@
this.type = "timeout";
this.msg = "娑堟伅瓒呮椂鏈洖澶�";
this.statusCode = -1024;
- this.callId = timeoutEvent.getClientTransaction().getDialog().getCallId().getCallId();
this.dialog = timeoutEvent.getClientTransaction().getDialog();
+ this.callId = this.dialog != null?timeoutEvent.getClientTransaction().getDialog().getCallId().getCallId(): null;
}else if (event instanceof TransactionTerminatedEvent) {
TransactionTerminatedEvent transactionTerminatedEvent = (TransactionTerminatedEvent)event;
this.type = "transactionTerminated";
@@ -109,20 +109,20 @@
this.type = "deviceNotFoundEvent";
this.msg = "璁惧鏈壘鍒�";
this.statusCode = -1024;
- this.callId = deviceNotFoundEvent.getDialog().getCallId().getCallId();
this.dialog = deviceNotFoundEvent.getDialog();
+ this.callId = this.dialog != null ?deviceNotFoundEvent.getDialog().getCallId().getCallId() : null;
}
}
}
public void addErrorSubscribe(String key, SipSubscribe.Event event) {
errorSubscribes.put(key, event);
- errorTimeSubscribes.put(key, new Date());
+ errorTimeSubscribes.put(key, Instant.now());
}
public void addOkSubscribe(String key, SipSubscribe.Event event) {
okSubscribes.put(key, event);
- okTimeSubscribes.put(key, new Date());
+ okTimeSubscribes.put(key, Instant.now());
}
public SipSubscribe.Event getErrorSubscribe(String key) {
@@ -130,6 +130,9 @@
}
public void removeErrorSubscribe(String key) {
+ if(key == null){
+ return;
+ }
errorSubscribes.remove(key);
errorTimeSubscribes.remove(key);
}
@@ -139,6 +142,9 @@
}
public void removeOkSubscribe(String key) {
+ if(key == null){
+ return;
+ }
okSubscribes.remove(key);
okTimeSubscribes.remove(key);
}
--
Gitblit v1.8.0