From e4e0cde16ce4f464859d8fa4eff56660b2bd24fd Mon Sep 17 00:00:00 2001 From: 随波 <davieyoung@163.com> Date: 星期一, 28 二月 2022 23:31:50 +0800 Subject: [PATCH] update src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java. 修改新建拉流代理时不保存“名称”字段问题 --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 4 +++- 1 files changed, 3 insertions(+), 1 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 de5a423..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 @@ -41,6 +41,8 @@ public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP"; + public static final String UPLOAD_FILE_CHANNEL = "UPLOAD_FILE_CHANNEL"; + public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION"; public static final String CALLBACK_CMD_PRESETQUERY = "CALLBACK_PRESETQUERY"; @@ -112,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