From 9889f908c80cfc69bb3d240ce1705fcddfb5e9fb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 04 七月 2023 11:08:14 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/AudioBroadcastManager.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/AudioBroadcastManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/AudioBroadcastManager.java
index 7186fad..03aa749 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/AudioBroadcastManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/AudioBroadcastManager.java
@@ -23,10 +23,6 @@
public static Map<String, AudioBroadcastCatch> data = new ConcurrentHashMap<>();
- public void add(AudioBroadcastCatch audioBroadcastCatch) {
- this.update(audioBroadcastCatch);
- }
-
public void update(AudioBroadcastCatch audioBroadcastCatch) {
if (SipUtils.isFrontEnd(audioBroadcastCatch.getDeviceId())) {
data.put(audioBroadcastCatch.getDeviceId(), audioBroadcastCatch);
@@ -87,4 +83,21 @@
return audioBroadcastCatch;
}
+
+ public List<AudioBroadcastCatch> get(String deviceId) {
+ List<AudioBroadcastCatch> audioBroadcastCatchList= new ArrayList<>();
+ if (SipUtils.isFrontEnd(deviceId)) {
+ if (data.get(deviceId) != null) {
+ audioBroadcastCatchList.add(data.get(deviceId));
+ }
+ }else {
+ for (String key : data.keySet()) {
+ if (key.startsWith(deviceId)) {
+ audioBroadcastCatchList.add(data.get(key));
+ }
+ }
+ }
+
+ return audioBroadcastCatchList;
+ }
}
--
Gitblit v1.8.0