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/record/GBRecordController.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
index f1c85cd..4ecb311 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -22,6 +22,8 @@
 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
 
+import java.util.UUID;
+
 @Api(tags = "鍥芥爣褰曞儚")
 @CrossOrigin
 @RestController
@@ -56,13 +58,15 @@
 		Device device = storager.queryVideoDevice(deviceId);
 		cmder.recordInfoQuery(device, channelId, startTime, endTime);
 		// 鎸囧畾瓒呮椂鏃堕棿 1鍒嗛挓30绉�
-		DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<ResponseEntity<RecordInfo>>(90*1000L);
+		DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<>(90*1000L);
+		String uuid = UUID.randomUUID().toString();
+		String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + channelId;
 		// 褰曞儚鏌ヨ浠hannelId浣滀负deviceId鏌ヨ
-		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_RECORDINFO+channelId, result);
+		resultHolder.put(key, uuid, result);
 		result.onTimeout(()->{
 			RequestMessage msg = new RequestMessage();
-			msg.setDeviceId(deviceId);
-			msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
+			msg.setId(uuid);
+			msg.setKey(key);
 			msg.setData("timeout");
 			resultHolder.invokeResult(msg);
 		});

--
Gitblit v1.8.0