From 3b21f385cdae7d94fce1ebba6abb06a893f57114 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 02 十一月 2021 10:40:29 +0800
Subject: [PATCH] 对需要向设备发起请求的http请求，使用缓存，等待设备请求返回的时候一次性释放所有请求
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
index fb31fa0..2346ab3 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
@@ -103,28 +103,31 @@
logger.debug(String.format("璁惧棰勮/鍥炴斁鍋滄API璋冪敤锛宻treamId锛�%s_%s", deviceId, channelId ));
- UUID uuid = UUID.randomUUID();
+ String uuid = UUID.randomUUID().toString();
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_STOP + uuid, result);
+ String key = DeferredResultHolder.CALLBACK_CMD_STOP + deviceId + channelId;
+ resultHolder.put(key, uuid, result);
Device device = storager.queryVideoDevice(deviceId);
cmder.streamByeCmd(deviceId, channelId, (event) -> {
StreamInfo streamInfo = redisCatchStorage.queryPlayByDevice(deviceId, channelId);
if (streamInfo == null) {
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("鐐规挱鏈壘鍒�");
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
storager.stopPlay(deviceId, channelId);
}else {
redisCatchStorage.stopPlay(streamInfo);
storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
+ msg.setId(uuid);
+ msg.setKey(key);
//Response response = event.getResponse();
msg.setData(String.format("success"));
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
}
mediaServerService.closeRTPServer(device, channelId);
});
@@ -134,24 +137,27 @@
json.put("deviceId", deviceId);
json.put("channelId", channelId);
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData(json.toString());
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
} else {
logger.warn("璁惧棰勮/鍥炴斁鍋滄API璋冪敤澶辫触锛�");
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_PLAY + uuid);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("streamId null");
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
}
// 瓒呮椂澶勭悊
result.onTimeout(()->{
logger.warn(String.format("璁惧棰勮/鍥炴斁鍋滄瓒呮椂锛宒eviceId/channelId锛�%s_%s ", deviceId, channelId));
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_STOP + uuid);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("Timeout");
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
});
return result;
}
@@ -259,10 +265,18 @@
}
Device device = storager.queryVideoDevice(deviceId);
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(3 * 1000L);
+ String key = DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId;
+ if (resultHolder.exist(key, null)) {
+ result.setResult(new ResponseEntity<>("璁惧浣跨敤涓�",HttpStatus.OK));
+ return result;
+ }
+ String uuid = UUID.randomUUID().toString();
if (device == null) {
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
+
+ resultHolder.put(key, key, result);
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("CmdType", "Broadcast");
@@ -275,7 +289,8 @@
cmder.audioBroadcastCmd(device, (event) -> {
Response response = event.getResponse();
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("CmdType", "Broadcast");
@@ -288,7 +303,8 @@
result.onTimeout(() -> {
logger.warn(String.format("璇煶骞挎挱鎿嶄綔瓒呮椂, 璁惧鏈繑鍥炲簲绛旀寚浠�"));
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
JSONObject json = new JSONObject();
json.put("DeviceID", deviceId);
json.put("CmdType", "Broadcast");
@@ -297,7 +313,7 @@
msg.setData(json);
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_BROADCAST + deviceId, result);
+ resultHolder.put(key, uuid, result);
return result;
}
--
Gitblit v1.8.0