Browse Source

修改转移指令

master
王梦远 1 week ago
parent
commit
03a4c2a79e
  1. 5
      src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java
  2. 5
      src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java

5
src/main/java/com/iflytop/colortitration/app/command/control/transfer/HeatAreaMoveTitrationAreaCommand.java

@ -31,11 +31,10 @@ public class HeatAreaMoveTitrationAreaCommand extends BaseCommandHandler {
@Override
public CompletableFuture<Void> 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();

5
src/main/java/com/iflytop/colortitration/app/command/control/transfer/TitrationAreaMoveHeatAreaCommand.java

@ -30,13 +30,12 @@ public class TitrationAreaMoveHeatAreaCommand extends BaseCommandHandler {
@Override
public CompletableFuture<Void> 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();

Loading…
Cancel
Save