From b0cc14051c84af562cee794cef0f0a9551e23b9c Mon Sep 17 00:00:00 2001
From: chenlw <brokge@qq.com>
Date: 星期四, 16 十二月 2021 12:49:12 +0800
Subject: [PATCH] 1.修复录像合并文件下载链接问题；2.时间滑道，endTime超出24小时问题。3.录像文件格式命名 startTime~endTime~duration.mp4
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 ecfa666..48c4939 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
@@ -11,7 +11,7 @@
import org.springframework.web.context.request.async.DeferredResult;
/**
- * @Description: 寮傛璇锋眰澶勭悊
+ * @description: 寮傛璇锋眰澶勭悊
* @author: swwheihei
* @date: 2020骞�5鏈�8鏃� 涓嬪崍7:59:05
*/
@@ -35,9 +35,11 @@
public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY";
- public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
+ public static final String CALLBACK_CMD_PLAYBACK = "CALLBACK_PLAY";
- public static final String CALLBACK_ONVIF = "CALLBACK_ONVIF";
+ public static final String CALLBACK_CMD_DOWNLOAD = "CALLBACK_DOWNLOAD";
+
+ public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";
public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION";
@@ -110,7 +112,7 @@
if (result == null) {
return;
}
- result.setResult(new ResponseEntity<>(msg.getData(),HttpStatus.OK));
+ result.setResult(ResponseEntity.ok().body(msg.getData()));
}
map.remove(msg.getKey());
--
Gitblit v1.8.0