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 a00ac630..4644fb0a 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,7 +23,8 @@ public class SipSubscribe { private Map okSubscribes = new ConcurrentHashMap<>(); - private Map timeSubscribes = new ConcurrentHashMap<>(); + private Map okTimeSubscribes = new ConcurrentHashMap<>(); + private Map errorTimeSubscribes = new ConcurrentHashMap<>(); // @Scheduled(cron="*/5 * * * * ?") //每五秒执行一次 // @Scheduled(fixedRate= 100 * 60 * 60 ) @@ -33,14 +34,24 @@ public class SipSubscribe { 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())){ + for (String key : okTimeSubscribes.keySet()) { + if (okTimeSubscribes.get(key).before(calendar.getTime())){ logger.info("[定时任务] 清理过期的订阅信息: {}", key); - errorSubscribes.remove(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 {