From 82adc0cb23f3ee47322e78889cdaba57e9309000 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 21 三月 2023 15:55:24 +0800
Subject: [PATCH] 完善语音对讲级联
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 121 ++++++++++++++++++++++++++++++++++-----
1 files changed, 104 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
index f21895c..43d4186 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java
@@ -1,15 +1,17 @@
package com.genersoft.iot.vmp.gb28181.transmit.callback;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import com.genersoft.iot.vmp.vmanager.bean.DeferredResultEx;
import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.async.DeferredResult;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
/**
- * @Description: 寮傛璇锋眰澶勭悊
+ * @description: 寮傛璇锋眰澶勭悊
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍7:59:05
*/
@@ -31,11 +33,15 @@
public static final String CALLBACK_CMD_RECORDINFO = "CALLBACK_RECORDINFO";
- public static final String CALLBACK_CMD_PlAY = "CALLBACK_PLAY";
+ public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY";
+
+ public static final String CALLBACK_CMD_PLAYBACK = "CALLBACK_PLAYBACK";
+
+ public static final String CALLBACK_CMD_DOWNLOAD = "CALLBACK_DOWNLOAD";
public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
- public static final String CALLBACK_ONVIF = "CALLBACK_ONVIF";
+ public static final String UPLOAD_FILE_CHANNEL = "UPLOAD_FILE_CHANNEL";
public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION";
@@ -43,23 +49,104 @@
public static final String CALLBACK_CMD_ALARM = "CALLBACK_ALARM";
- public static final String CALLBACK_CMD_BROADCAST = "CALLBACK_BROADCAST";
+ private Map<String, Map<String, DeferredResultEx>> map = new ConcurrentHashMap<>();
- private Map<String, DeferredResult> map = new ConcurrentHashMap<String, DeferredResult>();
- public void put(String key, DeferredResult result) {
- map.put(key, result);
+ public void put(String key, String id, DeferredResultEx result) {
+ Map<String, DeferredResultEx> deferredResultMap = map.get(key);
+ if (deferredResultMap == null) {
+ deferredResultMap = new ConcurrentHashMap<>();
+ map.put(key, deferredResultMap);
+ }
+ deferredResultMap.put(id, result);
+ }
+
+ public void put(String key, String id, DeferredResult result) {
+ Map<String, DeferredResultEx> deferredResultMap = map.get(key);
+ if (deferredResultMap == null) {
+ deferredResultMap = new ConcurrentHashMap<>();
+ map.put(key, deferredResultMap);
+ }
+ deferredResultMap.put(id, new DeferredResultEx(result));
}
- public DeferredResult get(String key) {
- return map.get(key);
+ public DeferredResultEx get(String key, String id) {
+ Map<String, DeferredResultEx> deferredResultMap = map.get(key);
+ if (deferredResultMap == null || ObjectUtils.isEmpty(id)) {
+ return null;
+ }
+ return deferredResultMap.get(id);
}
-
+
+ public Collection<DeferredResultEx> getAllByKey(String key) {
+ Map<String, DeferredResultEx> deferredResultMap = map.get(key);
+ if (deferredResultMap == null) {
+ return null;
+ }
+ return deferredResultMap.values();
+ }
+
+ public boolean exist(String key, String id){
+ if (key == null) {
+ return false;
+ }
+ Map<String, DeferredResultEx> deferredResultMap = map.get(key);
+ if (id == null) {
+ return deferredResultMap != null;
+ }else {
+ return deferredResultMap != null && deferredResultMap.get(id) != null;
+ }
+ }
+
+ /**
+ * 閲婃斁鍗曚釜璇锋眰
+ * @param msg
+ */
public void invokeResult(RequestMessage msg) {
- DeferredResult result = map.get(msg.getId());
+ Map<String, DeferredResultEx> deferredResultMap = map.get(msg.getKey());
+ if (deferredResultMap == null) {
+ return;
+ }
+ DeferredResultEx result = deferredResultMap.get(msg.getId());
if (result == null) {
return;
}
- result.setResult(new ResponseEntity<>(msg.getData(),HttpStatus.OK));
+ result.getDeferredResult().setResult(msg.getData());
+ deferredResultMap.remove(msg.getId());
+ if (deferredResultMap.size() == 0) {
+ map.remove(msg.getKey());
+ }
+ }
+
+ /**
+ * 閲婃斁鎵�鏈夌殑璇锋眰
+ * @param msg
+ */
+ public void invokeAllResult(RequestMessage msg) {
+ Map<String, DeferredResultEx> deferredResultMap = map.get(msg.getKey());
+ if (deferredResultMap == null) {
+ return;
+ }
+ synchronized (this) {
+ deferredResultMap = map.get(msg.getKey());
+ if (deferredResultMap == null) {
+ return;
+ }
+ Set<String> ids = deferredResultMap.keySet();
+ for (String id : ids) {
+ DeferredResultEx result = deferredResultMap.get(id);
+ if (result == null) {
+ return;
+ }
+ if (result.getFilter() != null) {
+ Object handler = result.getFilter().handler(msg.getData());
+ result.getDeferredResult().setResult(handler);
+ }else {
+ result.getDeferredResult().setResult(msg.getData());
+ }
+
+ }
+ map.remove(msg.getKey());
+ }
}
}
--
Gitblit v1.8.0