Browse Source

feat:维护托盘状态

master
白凤吉 3 months ago
parent
commit
0c9ce2c19c
  1. 2
      src/main/java/com/iflytop/gd/app/cmd/TrayDownCommand.java
  2. 3
      src/main/java/com/iflytop/gd/app/cmd/TrayUpCommand.java

2
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.model.dto.CmdDTO;
import com.iflytop.gd.app.service.DeviceCommandUtilService; import com.iflytop.gd.app.service.DeviceCommandUtilService;
import com.iflytop.gd.app.service.DevicePositionService; 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.annotation.CommandMapping;
import com.iflytop.gd.common.enums.HeatModuleCode; import com.iflytop.gd.common.enums.HeatModuleCode;
import com.iflytop.gd.common.enums.data.DevicePositionCode; import com.iflytop.gd.common.enums.data.DevicePositionCode;
@ -33,7 +34,6 @@ public class TrayDownCommand extends BaseCommandHandler {
double trayLower = devicePositionService.getPosition(DevicePositionCode.trayLower).getDistance(); double trayLower = devicePositionService.getPosition(DevicePositionCode.trayLower).getDistance();
//下降加热位托盘 //下降加热位托盘
deviceCommandUtilService.heaterMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, trayLower); deviceCommandUtilService.heaterMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, trayLower);
//TODO 设置相应加热区托盘状态
}); });
} }
} }

3
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.model.dto.CmdDTO;
import com.iflytop.gd.app.service.DeviceCommandUtilService; import com.iflytop.gd.app.service.DeviceCommandUtilService;
import com.iflytop.gd.app.service.DevicePositionService; 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.annotation.CommandMapping;
import com.iflytop.gd.common.enums.HeatModuleCode; import com.iflytop.gd.common.enums.HeatModuleCode;
import com.iflytop.gd.common.enums.data.DevicePositionCode; import com.iflytop.gd.common.enums.data.DevicePositionCode;
@ -23,6 +24,7 @@ import java.util.concurrent.CompletableFuture;
public class TrayUpCommand extends BaseCommandHandler { public class TrayUpCommand extends BaseCommandHandler {
private final DeviceCommandUtilService deviceCommandUtilService; private final DeviceCommandUtilService deviceCommandUtilService;
private final DevicePositionService devicePositionService; private final DevicePositionService devicePositionService;
private final DeviceStateService deviceStateService;
@Override @Override
public CompletableFuture<Void> handle(CmdDTO cmdDTO) { public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
@ -34,6 +36,7 @@ public class TrayUpCommand extends BaseCommandHandler {
//抬升加热位托盘 //抬升加热位托盘
deviceCommandUtilService.heaterMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, trayLift); deviceCommandUtilService.heaterMotorMove(cmdDTO.getCommandId(), cmdDTO.getCommand(), heatModuleId, trayLift);
//TODO 设置相应加热区托盘状态 //TODO 设置相应加热区托盘状态
deviceStateService.setHeatModuleStateTrayStatus(heatModuleId, 2);
}); });
} }
} }

Loading…
Cancel
Save