From dc20ccfce84d46f86209309ea70ba81d0360e070 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 05 一月 2022 15:23:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 51d03b4..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
@@ -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