From 335916f1f15eb9d0b34dea38cacee2300eac0606 Mon Sep 17 00:00:00 2001
From: 李防 <liguofang0703@126.com>
Date: 星期一, 07 三月 2022 14:20:27 +0800
Subject: [PATCH] InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 82 ++++++++++++++++++++++++++++-------------
1 files changed, 56 insertions(+), 26 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 0c00b82..84b36e3 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,37 +1,19 @@
package com.genersoft.iot.vmp.media.zlm;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.stereotype.Component;
-import org.springframework.util.ConcurrentReferenceHashMap;
-import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigInteger;
-import java.text.DecimalFormat;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢璁㈤槄
* @author: pan
* @date: 2020骞�12鏈�2鏃� 21:17:32
*/
@Component
public class ZLMHttpHookSubscribe {
-
- private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookSubscribe.class);
public enum HookType{
on_flow_report,
@@ -45,11 +27,12 @@
on_stream_changed,
on_stream_none_reader,
on_stream_not_found,
- on_server_started
+ on_server_started,
+ on_server_keepalive
}
public interface Event{
- void response(JSONObject response);
+ void response(MediaServerItem mediaServerItem, JSONObject response);
}
private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
@@ -72,19 +55,66 @@
for (JSONObject key : eventMap.keySet()) {
Boolean result = null;
for (String s : key.keySet()) {
- String string = hookResponse.getString(s);
- String string1 = key.getString(s);
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;
+ }
+
+ Set<Map.Entry<JSONObject, Event>> entries = eventMap.entrySet();
+ if (entries.size() > 0) {
+ for (Map.Entry<JSONObject, 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){
+ entries.remove(entry);
+ }
+ }
+ }
+ }
+
+ /**
+ * 鑾峰彇鏌愪釜绫诲瀷鐨勬墍鏈夌殑璁㈤槄
+ * @param type
+ * @return
+ */
+ public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) {
+ // ZLMHttpHookSubscribe.Event event= null;
+ Map<JSONObject, Event> eventMap = allSubscribes.get(type);
+ if (eventMap == null) {
+ return null;
+ }
+ List<ZLMHttpHookSubscribe.Event> result = new ArrayList<>();
+ for (JSONObject key : eventMap.keySet()) {
+ result.add(eventMap.get(key));
+ }
+ return result;
+ }
+
+
}
--
Gitblit v1.8.0