From 7e6512bd35d5ec537d6e9480f21ae1cde13f8646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Sat, 22 Mar 2025 14:27:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E8=BF=87success=20true=20false?= =?UTF-8?q?=E6=9D=A5=E5=8C=BA=E5=88=86=E6=8C=87=E4=BB=A4=E6=88=90=E5=8A=9F?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qyft/ms/system/service/device/DeviceCommandService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java b/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java index cfb9df0..9b51ad4 100644 --- a/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java +++ b/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java @@ -41,7 +41,6 @@ public class DeviceCommandService { } cmdFuture.getResponseFuture().whenComplete((result, ex) -> { - log.info("commandFutureMap 移除id:{} 剩余:{}", cmdToDevice.getCmdId(),commandFutureMap.size()); commandFutureMap.remove(cmdToDevice.getCmdId()); }); @@ -76,8 +75,8 @@ public class DeviceCommandService { CommandFuture commandFuture = executeCommand(deviceCommand); // webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, "已向设备发送了" + deviceCommand.getCmdName() + "指令", deviceCommand)); // commandFuture.getAckFuture().thenApply(result -> { -// Boolean status = result.getBool("status"); -// if (!status) { //ack失败 +// Boolean success = result.getBool("success"); +// if (success == null || !success) { //ack失败 // String message = deviceCommand.getCmdName() + "指令，设备ack错误"; // webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, message, result)); // throw new RuntimeException(message); @@ -87,8 +86,8 @@ public class DeviceCommandService { // }); commandFuture.getResponseFuture().thenApply(result -> { - Boolean status = result.getBool("status"); - if (!status) { //response失败 + Boolean success = result.getBool("success"); + if (success == null || !success) { //response失败 String message = deviceCommand.getCmdName() + "指令，设备response错误"; webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, message, result)); throw new RuntimeException(message);