From 14174ff40022a1f7662759d478d06b7b350ccd98 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 03 三月 2022 16:28:32 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-pro-record
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 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 a00ac63..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
@@ -23,24 +23,36 @@
private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> timeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Date> errorTimeSubscribes = new ConcurrentHashMap<>();
-// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
+ // @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
// @Scheduled(fixedRate= 100 * 60 * 60 )
- @Scheduled(cron="0 0 * * * ?") //姣忓皬鏃舵墽琛屼竴娆★紝 姣忎釜鏁寸偣
+ @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);
+ 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);
- timeSubscribes.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 {
@@ -105,12 +117,12 @@
public void addErrorSubscribe(String key, SipSubscribe.Event event) {
errorSubscribes.put(key, event);
- timeSubscribes.put(key, new Date());
+ errorTimeSubscribes.put(key, new Date());
}
public void addOkSubscribe(String key, SipSubscribe.Event event) {
okSubscribes.put(key, event);
- timeSubscribes.put(key, new Date());
+ okTimeSubscribes.put(key, new Date());
}
public SipSubscribe.Event getErrorSubscribe(String key) {
@@ -119,7 +131,7 @@
public void removeErrorSubscribe(String key) {
errorSubscribes.remove(key);
- timeSubscribes.remove(key);
+ errorTimeSubscribes.remove(key);
}
public SipSubscribe.Event getOkSubscribe(String key) {
@@ -128,7 +140,7 @@
public void removeOkSubscribe(String key) {
okSubscribes.remove(key);
- timeSubscribes.remove(key);
+ okTimeSubscribes.remove(key);
}
public int getErrorSubscribesSize(){
return errorSubscribes.size();
--
Gitblit v1.8.0