From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 06 五月 2022 10:12:34 +0800 Subject: [PATCH] 使用阿里代码规范。规范代码写法 --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 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..cfb13c3 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,13 @@ public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY"; + public static final String CALLBACK_CMD_PLAYBACK = "CALLBACK_PLAYBACK"; + + 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"; @@ -61,12 +65,16 @@ public DeferredResult get(String key, String id) { Map<String, DeferredResult> deferredResultMap = map.get(key); - if (deferredResultMap == null) return null; + if (deferredResultMap == null) { + return null; + } return deferredResultMap.get(id); } public boolean exist(String key, String id){ - if (key == null) return false; + if (key == null) { + return false; + } Map<String, DeferredResult> deferredResultMap = map.get(key); if (id == null) { return deferredResultMap != null; @@ -110,7 +118,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