From a8c424e49db9213e879bf6c44cebccdfddaa1808 Mon Sep 17 00:00:00 2001
From: BradyXu <brady_xu@outlook.com>
Date: 星期日, 12 五月 2024 02:00:55 +0800
Subject: [PATCH] 修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择
---
src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java b/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java
index 3353656..58e3761 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/event/hook/HookSubscribe.java
@@ -1,9 +1,6 @@
package com.genersoft.iot.vmp.media.event.hook;
-import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
-import com.genersoft.iot.vmp.media.event.media.MediaDepartureEvent;
-import com.genersoft.iot.vmp.media.event.media.MediaEvent;
-import com.genersoft.iot.vmp.media.event.media.MediaPublishEvent;
+import com.genersoft.iot.vmp.media.event.media.*;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
@@ -60,6 +57,14 @@
public void onApplicationEvent(MediaPublishEvent event) {
sendNotify(HookType.on_publish, event);
}
+ /**
+ * 鐢熸垚褰曞儚鏂囦欢浜嬩欢
+ */
+ @Async("taskExecutor")
+ @EventListener
+ public void onApplicationEvent(MediaRecordMp4Event event) {
+ sendNotify(HookType.on_record_mp4, event);
+ }
private final Map<String, Event> allSubscribes = new ConcurrentHashMap<>();
private final Map<String, Hook> allHook = new ConcurrentHashMap<>();
@@ -74,8 +79,8 @@
}
public void addSubscribe(Hook hook, HookSubscribe.Event event) {
- if (hook.getCreateTime() == null) {
- hook.setCreateTime(System.currentTimeMillis());
+ if (hook.getExpireTime() == null) {
+ hook.setExpireTime(System.currentTimeMillis() + subscribeExpire);
}
allSubscribes.put(hook.toString(), event);
allHook.put(hook.toString(), hook);
@@ -91,9 +96,9 @@
*/
@Scheduled(fixedRate=subscribeExpire) //姣�5鍒嗛挓鎵ц涓�娆�
public void execute(){
- long expireTime = System.currentTimeMillis() - subscribeExpire;
+ long expireTime = System.currentTimeMillis();
for (Hook hook : allHook.values()) {
- if (hook.getCreateTime() < expireTime) {
+ if (hook.getExpireTime() < expireTime) {
allSubscribes.remove(hook.toString());
allHook.remove(hook.toString());
}
--
Gitblit v1.8.0