From 35e222482b26d5e672eb5939a24458fc30a7d37f Mon Sep 17 00:00:00 2001
From: chenparty <870300816@qq.com>
Date: 星期日, 26 九月 2021 15:37:01 +0800
Subject: [PATCH] 修复快照无法生成的BUG
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
index 129f8a3..be69df1 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
@@ -1,12 +1,10 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -33,7 +31,7 @@
}
public interface Event{
- void response(JSONObject response);
+ void response(MediaServerItem mediaServerItem, JSONObject response);
}
private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
@@ -59,19 +57,51 @@
if (result == null) {
result = key.getString(s).equals(hookResponse.getString(s));
}else {
+ if (key.getString(s) == null) {
+ continue;
+ }
result = result && key.getString(s).equals(hookResponse.getString(s));
}
}
- if (result) {
+ if (null != result && result) {
event = eventMap.get(key);
}
}
return event;
}
+ public void removeSubscribe(HookType type, JSONObject hookResponse) {
+ Map<JSONObject, Event> eventMap = allSubscribes.get(type);
+ if (eventMap == null) {
+ return;
+ }
+ Iterator<Map.Entry<JSONObject, Event>> iterator = eventMap.entrySet().iterator();
+ while (iterator.hasNext()){
+ Map.Entry<JSONObject, Event> next = iterator.next();
+ JSONObject key = next.getKey();
+ Boolean result = null;
+ for (String s : key.keySet()) {
+ if (result == null) {
+ result = key.getString(s).equals(hookResponse.getString(s));
+ }else {
+ if (key.getString(s) == null) continue;
+ result = result && key.getString(s).equals(hookResponse.getString(s));
+ }
+ }
+ if (null != result && result){
+ iterator.remove();
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鏌愪釜绫诲瀷鐨勬墍鏈夌殑璁㈤槄
+ * @param type
+ * @return
+ */
public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) {
- ZLMHttpHookSubscribe.Event event= null;
+ // ZLMHttpHookSubscribe.Event event= null;
Map<JSONObject, Event> eventMap = allSubscribes.get(type);
if (eventMap == null) {
return null;
--
Gitblit v1.8.0