diff --git a/src/main/java/com/iflytop/sgs/app/controller/HeatController.java b/src/main/java/com/iflytop/sgs/app/controller/HeatController.java index fc1ab8a..d25c3f0 100644 --- a/src/main/java/com/iflytop/sgs/app/controller/HeatController.java +++ b/src/main/java/com/iflytop/sgs/app/controller/HeatController.java @@ -1,5 +1,6 @@ package com.iflytop.sgs.app.controller; +import com.iflytop.sgs.app.model.vo.SetHeatModuleEnableVO; import com.iflytop.sgs.app.model.vo.SetTargetTemperatureVO; import com.iflytop.sgs.app.service.api.HeatService; import com.iflytop.sgs.common.result.Result; @@ -30,4 +31,12 @@ public class HeatController { heatModuleService.setTargetTemperature(setTargetTemperatureVO); return Result.success(); } + + @Operation(summary = "设定加热模块是否启用") + @PostMapping("/set-enable") + public Result setEnable(@Valid @RequestBody SetHeatModuleEnableVO setHeatModuleEnableVO) { + heatModuleService.setEnable(setHeatModuleEnableVO); + return Result.success(); + } + } diff --git a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java index 6a1c8f5..b9e2f59 100644 --- a/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java +++ b/src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java @@ -10,8 +10,8 @@ public class HeatModuleState { @Schema(description = "加热模块code") private HeatModuleCode moduleCode; - @Schema(description = "托盘升降状态,0为降下,1为抬起") - private int trayUp = 0; + @Schema(description = "加热模块是否启用") + private boolean enable = true; @Schema(description = "托盘状态,0为无托盘,1为有托盘") private int trayStatus = 0; diff --git a/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java b/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java new file mode 100644 index 0000000..b3acdfc --- /dev/null +++ b/src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java @@ -0,0 +1,21 @@ +package com.iflytop.sgs.app.model.vo; + +import com.iflytop.sgs.common.enums.HeatModuleCode; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = false) +@Data +public class SetHeatModuleEnableVO { + + @Schema(description = "加热模块code") + private HeatModuleCode moduleCode; + + @Schema(description = "是否启用") + private Boolean enable; + + +} diff --git a/src/main/java/com/iflytop/sgs/app/service/api/HeatService.java b/src/main/java/com/iflytop/sgs/app/service/api/HeatService.java index 12b4610..4c6d8e5 100644 --- a/src/main/java/com/iflytop/sgs/app/service/api/HeatService.java +++ b/src/main/java/com/iflytop/sgs/app/service/api/HeatService.java @@ -1,5 +1,6 @@ package com.iflytop.sgs.app.service.api; +import com.iflytop.sgs.app.model.vo.SetHeatModuleEnableVO; import com.iflytop.sgs.app.model.vo.SetTargetTemperatureVO; import com.iflytop.sgs.app.service.device.DeviceStateService; import lombok.RequiredArgsConstructor; @@ -16,4 +17,8 @@ public class HeatService { public void setTargetTemperature(SetTargetTemperatureVO setTargetTemperatureVO) { deviceStateService.setHeatModuleStatePreSetTemperature(setTargetTemperatureVO.getModuleCode(), setTargetTemperatureVO); } + + public void setEnable(SetHeatModuleEnableVO setHeatModuleEnableVO){ + deviceStateService.getDeviceState().getHeatModuleByCode(setHeatModuleEnableVO.getModuleCode()).setEnable(setHeatModuleEnableVO.getEnable()); + } } 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 a17995a..6047e78 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 @@ -42,6 +42,7 @@ public class CraftsStepService { //第四步:烘干后将托盘转移至退火工位,在400℃下退火5min。 //第五步:将托盘取走放置在下料工位。 + //具体操作流程:(单批样品操作流程) //1 人员上料、设定及开始 : // 人员手动将样品放至上料工位,设定分金时间,记录分金编号,按开始键开始分金。