From 0c9ce2c19c61b46eb63c82b23d6aae956aff11bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 14 May 2025 21:29:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=B4=E6=8A=A4=E6=89=98=E7=9B=98?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/iflytop/gd/app/cmd/TrayDownCommand.java | 2 +- src/main/java/com/iflytop/gd/app/cmd/TrayUpCommand.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iflytop/gd/app/cmd/TrayDownCommand.java b/src/main/java/com/iflytop/gd/app/cmd/TrayDownCommand.java index 142e6e6..8c59e0c 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/TrayDownCommand.java +++ b/src/main/java/com/iflytop/gd/app/cmd/TrayDownCommand.java @@ -4,6 +4,7 @@ import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; import com.iflytop.gd.app.service.DeviceCommandUtilService; import com.iflytop.gd.app.service.DevicePositionService; +import com.iflytop.gd.app.service.DeviceStateService; import com.iflytop.gd.common.annotation.CommandMapping; import com.iflytop.gd.common.enums.HeatModuleCode; import com.iflytop.gd.common.enums.data.DevicePositionCode; @@ -33,7 +34,6 @@ public class TrayDownCommand extends BaseCommandHandler { double trayLower = devicePositionService.getPosition(DevicePositionCode.trayLower).getDistance(); //下降加热位托盘 deviceCommandUtilService.heaterMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, trayLower); - //TODO 设置相应加热区托盘状态 }); } } diff --git a/src/main/java/com/iflytop/gd/app/cmd/TrayUpCommand.java b/src/main/java/com/iflytop/gd/app/cmd/TrayUpCommand.java index 099b8a8..3fa9cfb 100644 --- a/src/main/java/com/iflytop/gd/app/cmd/TrayUpCommand.java +++ b/src/main/java/com/iflytop/gd/app/cmd/TrayUpCommand.java @@ -4,6 +4,7 @@ import com.iflytop.gd.app.core.BaseCommandHandler; import com.iflytop.gd.app.model.dto.CmdDTO; import com.iflytop.gd.app.service.DeviceCommandUtilService; import com.iflytop.gd.app.service.DevicePositionService; +import com.iflytop.gd.app.service.DeviceStateService; import com.iflytop.gd.common.annotation.CommandMapping; import com.iflytop.gd.common.enums.HeatModuleCode; import com.iflytop.gd.common.enums.data.DevicePositionCode; @@ -23,6 +24,7 @@ import java.util.concurrent.CompletableFuture; public class TrayUpCommand extends BaseCommandHandler { private final DeviceCommandUtilService deviceCommandUtilService; private final DevicePositionService devicePositionService; + private final DeviceStateService deviceStateService; @Override public CompletableFuture handle(CmdDTO cmdDTO) { @@ -34,6 +36,7 @@ public class TrayUpCommand extends BaseCommandHandler { //抬升加热位托盘 deviceCommandUtilService.heaterMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, trayLift); //TODO 设置相应加热区托盘状态 + deviceStateService.setHeatModuleStateTrayStatus(heatModuleId, 2); }); } }