diff --git a/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java b/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java index a0cb9d1..3928cd9 100644 --- a/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java +++ b/src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.iflytop.sgs.app.core.CraftsDebugGenerator; import com.iflytop.sgs.app.model.bo.CraftsStep; import com.iflytop.sgs.app.model.bo.Point3D; @@ -459,6 +460,7 @@ public class CraftsStepService { deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setTargetTemperature(temperature);//将加热温度设定为目标温度 log.info("工艺{},开始加热", heatModuleCode); heatModuleService.fanClose(heatModuleCode);//关闭风扇 + deviceStateService.getDeviceState().getHeatModuleByCode(heatModuleCode).setFanOpen(false); //设置加热区风扇打开 heatModuleService.heatRodOpen(heatModuleCode, temperature);//打开加热棒 while (!heatIsSuitable(heatModuleCode, temperature)) {//判断温度是否到达 delay(1); @@ -873,7 +875,7 @@ public class CraftsStepService { deviceLightSoundService.openBeep(CmdBeepMode.info); delay(2); deviceLightSoundService.closeBeep(); - craftMonitorService.removeById(craftMonitor.getId()); + craftMonitorService.remove(new LambdaQueryWrapper().eq(CraftMonitor::getHeatId, heatModuleCode)); }