From 03a4c2a79e9df94e82e09d4d054b27c24c737831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Sat, 26 Jul 2025 15:33:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E7=A7=BB=E6=8C=87?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/control/transfer/HeatAreaMoveTitrationAreaCommand.java | 5 ++--- .../command/control/transfer/TitrationAreaMoveHeatAreaCommand.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java index 9f597ec..fadb736 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java @@ -31,11 +31,10 @@ public class HeatAreaMoveTitrationAreaCommand extends BaseCommandHandler { @Override public CompletableFuture handle(CommandDTO commandDTO) { String heatModuleCodeStr = commandDTO.getStringParam("heatModuleCode"); - String titrationModuleCodeStr = commandDTO.getStringParam("titrationModuleCode"); - if (StringUtils.isEmpty(heatModuleCodeStr) || StringUtils.isEmpty(titrationModuleCodeStr)) { + if (StringUtils.isEmpty(heatModuleCodeStr)) { throw new AppException(ResultCode.INVALID_PARAMETER);//参数缺失 } - MultipleModuleCode titrationModuleCode = MultipleModuleCode.valueOf(titrationModuleCodeStr); + MultipleModuleCode titrationModuleCode = MultipleModuleCode.valueOf(heatModuleCodeStr); MultipleModuleCode heatModuleCode = MultipleModuleCode.valueOf(heatModuleCodeStr); boolean tubeExist = switch (titrationModuleCode) { //首先滴定位是否存在试管 case MultipleModuleCode.MODULE_1 -> deviceState.isTrayExist1(); diff --git a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java index bf6a412..f6dff01 100644 --- a/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java +++ b/src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java @@ -30,13 +30,12 @@ public class TitrationAreaMoveHeatAreaCommand extends BaseCommandHandler { @Override public CompletableFuture handle(CommandDTO commandDTO) { - String heatModuleCodeStr = commandDTO.getStringParam("heatModuleCode"); String titrationModuleCodeStr = commandDTO.getStringParam("titrationModuleCode"); - if (StringUtils.isEmpty(heatModuleCodeStr) || StringUtils.isEmpty(titrationModuleCodeStr)) { + if (StringUtils.isEmpty(titrationModuleCodeStr)) { throw new AppException(ResultCode.INVALID_PARAMETER);//参数缺失 } MultipleModuleCode titrationModuleCode = MultipleModuleCode.valueOf(titrationModuleCodeStr); - MultipleModuleCode heatModuleCode = MultipleModuleCode.valueOf(heatModuleCodeStr); + MultipleModuleCode heatModuleCode = MultipleModuleCode.valueOf(titrationModuleCodeStr); boolean tubeExist = switch (titrationModuleCode) { //首先滴定位是否存在试管 case MultipleModuleCode.MODULE_1 -> deviceState.isTrayExist1(); case MultipleModuleCode.MODULE_2 -> deviceState.isTrayExist2();