From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 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 4f832ae..ffd8ec9 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,13 +1,15 @@
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 org.springframework.util.CollectionUtils;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄
* @author: pan
* @date: 2020骞�12鏈�2鏃� 21:17:32
*/
@@ -26,22 +28,19 @@
on_stream_changed,
on_stream_none_reader,
on_stream_not_found,
- on_server_started
+ on_server_started,
+ on_server_keepalive
}
+ @FunctionalInterface
public interface Event{
- void response(JSONObject response);
+ void response(MediaServerItem mediaServerItem, JSONObject response);
}
private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
public void addSubscribe(HookType type, JSONObject hookResponse, ZLMHttpHookSubscribe.Event event) {
- Map<JSONObject, Event> eventMap = allSubscribes.get(type);
- if (eventMap == null) {
- eventMap = new HashMap<JSONObject, Event>();
- allSubscribes.put(type,eventMap);
- }
- eventMap.put(hookResponse, event);
+ allSubscribes.computeIfAbsent(type, k -> new ConcurrentHashMap<>()).put(hookResponse, event);
}
public ZLMHttpHookSubscribe.Event getSubscribe(HookType type, JSONObject hookResponse) {
@@ -56,6 +55,9 @@
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));
}
@@ -72,22 +74,34 @@
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 {
- result = result && key.getString(s).equals(hookResponse.getString(s));
- }
+ Set<Map.Entry<JSONObject, Event>> entries = eventMap.entrySet();
+ if (entries.size() > 0) {
+ List<Map.Entry<JSONObject, ZLMHttpHookSubscribe.Event>> entriesToRemove = new ArrayList<>();
+ for (Map.Entry<JSONObject, ZLMHttpHookSubscribe.Event> entry : entries) {
+ JSONObject key = entry.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){
+ entriesToRemove.add(entry);
+ }
}
- if (null != result && result){
- iterator.remove();
+
+ if (!CollectionUtils.isEmpty(entriesToRemove)) {
+ for (Map.Entry<JSONObject, ZLMHttpHookSubscribe.Event> entry : entriesToRemove) {
+ entries.remove(entry);
+ }
}
+
}
}
--
Gitblit v1.8.0