From 3146e63fc05fddf91e6df086e363a4f5584c1d6b Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 01 九月 2022 17:53:00 +0800 Subject: [PATCH] 优化异常处理 --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java index 30320e6..fe363a6 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java @@ -56,20 +56,14 @@ @Operation(summary = "杩滅▼鍚姩鎺у埗鍛戒护") @Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true) @GetMapping("/teleboot/{deviceId}") - public String teleBootApi(@PathVariable String deviceId) { + public void teleBootApi(@PathVariable String deviceId) { if (logger.isDebugEnabled()) { logger.debug("璁惧杩滅▼鍚姩API璋冪敤"); } Device device = storager.queryVideoDevice(deviceId); - boolean sucsess = cmder.teleBootCmd(device); - if (sucsess) { - JSONObject json = new JSONObject(); - json.put("DeviceID", deviceId); - json.put("Result", "OK"); - return json.toJSONString(); - } else { - logger.warn("璁惧杩滅▼鍚姩API璋冪敤澶辫触锛�"); - throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧杩滅▼鍚姩API璋冪敤澶辫触锛�"); + if (!cmder.teleBootCmd(device)) { + logger.warn("璁惧杩滅▼鍚姩API璋冪敤澶辫触锛�"); + throw new ControllerException(ErrorCode.ERROR100); } } -- Gitblit v1.8.0