From b3d49f827778e41fce16d7dccf1883e0aafc2c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 13 Jun 2025 16:22:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=B7=A5=E8=89=BA=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E5=8A=A0=E7=83=AD=EF=BC=8C=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E8=BF=9E=E7=BB=AD=E5=8A=A0=E7=83=AD=E6=97=B6=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=8E=A7=E5=88=B6=E6=98=AF=E5=90=A6=E6=8A=AC=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iflytop/gd/app/service/crafts/CraftsStepService.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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; }