From fe0b5c33f92e11f51574deb2c589a31b34a6e720 Mon Sep 17 00:00:00 2001
From: chenjialing <595168663@qq.com>
Date: 星期三, 02 三月 2022 09:18:17 +0800
Subject: [PATCH] 告警信息上报过程中，AlarmType存储失败的解决
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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..ac77f7b 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,13 @@
public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY";
+ public static final String CALLBACK_CMD_PLAYBACK = "CALLBACK_PLAY";
+
+ 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";
@@ -110,7 +114,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