From fbc14439aa383f57a8d409d850fc85c7fc89c9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Thu, 20 Mar 2025 18:14:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E6=94=B9=E4=B8=BAcmd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/command/DeviceCommandGenerator.java | 8 ++++---- .../com/qyft/ms/system/model/bo/DeviceCommand.java | 8 ++++---- .../system/service/device/DeviceCommandService.java | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/qyft/ms/system/common/device/command/DeviceCommandGenerator.java b/src/main/java/com/qyft/ms/system/common/device/command/DeviceCommandGenerator.java index 3178aec..ec6998b 100644 --- a/src/main/java/com/qyft/ms/system/common/device/command/DeviceCommandGenerator.java +++ b/src/main/java/com/qyft/ms/system/common/device/command/DeviceCommandGenerator.java @@ -502,12 +502,12 @@ public class DeviceCommandGenerator { private static DeviceCommand deviceCmd(String code, String device, String action, Map params, String commandName) { int cmdId = CyclicNumberGenerator.getInstance().generateNumber(); DeviceCommand cmdToDevice = new DeviceCommand(); - cmdToDevice.setCommandId(cmdId); - cmdToDevice.setCommandCode(code); - cmdToDevice.setTargetDevice(device); + cmdToDevice.setCmdId(cmdId); + cmdToDevice.setCmdCode(code); + cmdToDevice.setDevice(device); cmdToDevice.setAction(action); cmdToDevice.setParams(params); - cmdToDevice.setCommandName(commandName); + cmdToDevice.setCmdName(commandName); return cmdToDevice; } } diff --git a/src/main/java/com/qyft/ms/system/model/bo/DeviceCommand.java b/src/main/java/com/qyft/ms/system/model/bo/DeviceCommand.java index 516a408..8c83df2 100644 --- a/src/main/java/com/qyft/ms/system/model/bo/DeviceCommand.java +++ b/src/main/java/com/qyft/ms/system/model/bo/DeviceCommand.java @@ -9,22 +9,22 @@ public class DeviceCommand { /** * 指令ID */ - private Integer commandId; + private Integer cmdId; /** * 指令名称 */ - private String commandName; + private String cmdName; /** * 指令代码 例如 "device_status_get" */ - private String commandCode; + private String cmdCode; /** * 目标设备 */ - private String targetDevice; + private String device; /** * 执行动作 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 0e733d7..6efcfe3 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 @@ -30,14 +30,14 @@ public class DeviceCommandService { public CommandFuture executeCommand(DeviceCommand cmdToDevice) { CommandFuture cmdFuture = new CommandFuture(); - commandFutureMap.put(cmdToDevice.getCommandId(), cmdFuture); + commandFutureMap.put(cmdToDevice.getCmdId(), cmdFuture); if (!deviceTcpClient.sendToJSON(cmdToDevice)) { - commandFutureMap.remove(cmdToDevice.getCommandId()); + commandFutureMap.remove(cmdToDevice.getCmdId()); throw new RuntimeException("向设备发送指令失败"); } cmdFuture.getResponseFuture().whenComplete((result, ex) -> - commandFutureMap.remove(cmdToDevice.getCommandId())); + commandFutureMap.remove(cmdToDevice.getCmdId())); return cmdFuture; } @@ -47,7 +47,7 @@ public class DeviceCommandService { commandFuture.getAckFuture().thenApply(result -> { Boolean status = result.getBool("status"); if (!status) { //ack失败 - String message = deviceCommand.getCommandName() + "指令，设备ack错误"; + String message = deviceCommand.getCmdName() + "指令，设备ack错误"; throw new RuntimeException(message); } return result; @@ -56,7 +56,7 @@ public class DeviceCommandService { commandFuture.getResponseFuture().thenApply(result -> { Boolean status = result.getBool("status"); if (!status) { //response失败 - String message = deviceCommand.getCommandName() + "指令，设备response错误"; + String message = deviceCommand.getCmdName() + "指令，设备response错误"; throw new RuntimeException(message); } return result.get("data"); @@ -67,26 +67,26 @@ public class DeviceCommandService { public CommandFuture sendCommand(String cmdId, String cmdCode, DeviceCommand deviceCommand) throws IOException { CommandFuture commandFuture = executeCommand(deviceCommand); - webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, "已向设备发送了" + deviceCommand.getCommandName() + "指令", deviceCommand)); + webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, "已向设备发送了" + deviceCommand.getCmdName() + "指令", deviceCommand)); commandFuture.getAckFuture().thenApply(result -> { Boolean status = result.getBool("status"); if (!status) { //ack失败 - String message = deviceCommand.getCommandName() + "指令，设备ack错误"; + String message = deviceCommand.getCmdName() + "指令，设备ack错误"; webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, message, result)); throw new RuntimeException(message); } - webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RESULT, deviceCommand.getCommandName() + "指令，设备ack正常", result)); + webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RESULT, deviceCommand.getCmdName() + "指令，设备ack正常", result)); return result; }); commandFuture.getResponseFuture().thenApply(result -> { Boolean status = result.getBool("status"); if (!status) { //response失败 - String message = deviceCommand.getCommandName() + "指令，设备response错误"; + String message = deviceCommand.getCmdName() + "指令，设备response错误"; webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.SEND, message, result)); throw new RuntimeException(message); } - webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RESULT, deviceCommand.getCommandName() + "指令，设备response正常", result)); + webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RESULT, deviceCommand.getCmdName() + "指令，设备response正常", result)); return result.get("data"); });