diff --git a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java index b98f79b..6e732d7 100644 --- a/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java +++ b/src/main/java/com/iflytop/gd/app/service/crafts/CraftsStepService.java @@ -204,25 +204,34 @@ public class CraftsStepService { heatModuleState.setHeatingType(HeatingType.cooling); heatModuleState.setFanOpen(true); + log.info("工艺{},抬升加热模块托盘", heatModuleCode); heatModuleService.heaterMotorMove(heatModuleCode, trayLift);//抬升加热模块托盘 heatModuleState.setTrayUp(1);//加热模块托盘升降状态 log.info("工艺{},等待降温", heatModuleCode); while (heatModuleState.getTemperature() - 1 > targetTemperature) { sleep(1); } + log.info("工艺{},降温完毕,关闭风扇", heatModuleCode); heatModuleService.fanClose(heatModuleCode); heatModuleState.setFanOpen(false); + log.info("工艺{},开始加热至目标温度", heatModuleCode); heatModuleService.heatRodOpen(heatModuleCode, targetTemperature); - heatModuleState.setTemperature(targetTemperature); + heatModuleState.setTargetTemperature(targetTemperature); heatModuleState.setStartHeatTime(LocalDateTime.now()); } else { if (heatModuleState.isFanOpen()) { + log.info("工艺{},关闭风扇", heatModuleCode); heatModuleService.fanClose(heatModuleCode);//工艺加热前,尝试关闭风扇 heatModuleState.setFanOpen(false); } + if(heatModuleState.getTrayUp() == 0){ + log.info("工艺{},温度不达标,抬起托盘等待升温", heatModuleCode); + heatModuleService.heaterMotorMove(heatModuleCode, trayLift);//抬升加热位托盘 + heatModuleState.setTrayUp(1);//加热模块托盘升降状态 + } log.info("工艺{},开启加热棒", heatModuleCode); heatModuleService.heatRodOpen(heatModuleCode, targetTemperature); - heatModuleState.setTemperature(targetTemperature); + heatModuleState.setTargetTemperature(targetTemperature); heatModuleState.setHeatingType(HeatingType.warm_up); log.info("工艺{},等待升温", heatModuleCode); if (inTemperature != null) { @@ -295,7 +304,7 @@ public class CraftsStepService { * 延时等待 */ private boolean delay(JSONObject params) { - Integer seconds = params.getInt("seconds", 0); + Integer seconds = params.getInt("second", 0); sleep(seconds); return true; }