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 dffde0c..884aacc 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 @@ -86,7 +86,7 @@ public class CraftsStepService { Double temperature = params.getDouble("temperature"); log.info("工艺{},预热", HeatModuleCode.heat_module_04); //todo - heatModuleService.heatRodOpen(HeatModuleCode.heat_module_04, temperature / 4); + heatModuleService.heatRodOpen(HeatModuleCode.heat_module_04, temperature); deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setTargetTemperature(temperature);//设置加热温度 deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setHeatingType(HeatingType.heating);//加热中 webSocketService.pushCraftsDebug(CraftsDebugGenerator.generateJson(HeatModuleCode.heat_module_04.toString(), "退火区加热中", temperature)); diff --git a/src/main/java/com/iflytop/sgs/app/service/scheduled/FetchTemperatureScheduledTask.java b/src/main/java/com/iflytop/sgs/app/service/scheduled/FetchTemperatureScheduledTask.java index 7991e73..161a568 100644 --- a/src/main/java/com/iflytop/sgs/app/service/scheduled/FetchTemperatureScheduledTask.java +++ b/src/main/java/com/iflytop/sgs/app/service/scheduled/FetchTemperatureScheduledTask.java @@ -29,8 +29,7 @@ public class FetchTemperatureScheduledTask { deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_03).setTemperature(heatModule03Temperature); Double heatModule04Temperature = gdDeviceStatusService.getHeaterRodTemperature("HEATER_ROD4_ID"); - //todo - deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setTemperature(heatModule04Temperature * 4); + deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_04).setTemperature(heatModule04Temperature); } else { Double temperature01 = deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_01).getTemperature(); Double temperature02 = deviceStateService.getDeviceState().getHeatModuleByCode(HeatModuleCode.heat_module_02).getTemperature();