From 48fad3582d81dd79423db1db5402d9f47fd5f30f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 09 二月 2023 14:13:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
index 92a4351..cb46823 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
@@ -1,8 +1,10 @@
package com.genersoft.iot.vmp.gb28181.event.record;
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
+import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
@@ -20,25 +22,46 @@
private final static Logger logger = LoggerFactory.getLogger(RecordEndEventListener.class);
+ private Map<String, RecordEndEventHandler> handlerMap = new ConcurrentHashMap<>();
public interface RecordEndEventHandler{
void handler(RecordInfo recordInfo);
}
- private Map<String, RecordEndEventHandler> handlerMap = new ConcurrentHashMap<>();
-
@Override
public void onApplicationEvent(RecordEndEvent event) {
- logger.info("褰曞儚鏌ヨ瀹屾垚浜嬩欢瑙﹀彂锛宒eviceId锛歿}, channelId: {}, 褰曞儚鏁伴噺{}鏉�", event.getRecordInfo().getDeviceId(),
- event.getRecordInfo().getChannelId(), event.getRecordInfo().getSumNum() );
+ String deviceId = event.getRecordInfo().getDeviceId();
+ String channelId = event.getRecordInfo().getChannelId();
+ int count = event.getRecordInfo().getCount();
+ int sumNum = event.getRecordInfo().getSumNum();
+ logger.info("褰曞儚鏌ヨ瀹屾垚浜嬩欢瑙﹀彂锛宒eviceId锛歿}, channelId: {}, 褰曞儚鏁伴噺{}/{}鏉�", event.getRecordInfo().getDeviceId(),
+ event.getRecordInfo().getChannelId(), count,sumNum);
if (handlerMap.size() > 0) {
- for (RecordEndEventHandler recordEndEventHandler : handlerMap.values()) {
- recordEndEventHandler.handler(event.getRecordInfo());
+ RecordEndEventHandler handler = handlerMap.get(deviceId + channelId);
+ if (handler !=null){
+ handler.handler(event.getRecordInfo());
+ if (count ==sumNum){
+ handlerMap.remove(deviceId + channelId);
+ }
}
}
- handlerMap.clear();
}
+ /**
+ * 娣诲姞
+ * @param device
+ * @param channelId
+ * @param recordEndEventHandler
+ */
public void addEndEventHandler(String device, String channelId, RecordEndEventHandler recordEndEventHandler) {
handlerMap.put(device + channelId, recordEndEventHandler);
}
+ /**
+ * 娣诲姞
+ * @param device
+ * @param channelId
+ */
+ public void delEndEventHandler(String device, String channelId) {
+ handlerMap.remove(device + channelId);
+ }
+
}
--
Gitblit v1.8.0