Browse Source

增加手动关闭加热模块功能

master
白凤吉 2 months ago
parent
commit
46be57f75c
  1. 9
      src/main/java/com/iflytop/sgs/app/controller/HeatController.java
  2. 4
      src/main/java/com/iflytop/sgs/app/model/bo/status/device/HeatModuleState.java
  3. 21
      src/main/java/com/iflytop/sgs/app/model/vo/SetHeatModuleEnableVO.java
  4. 5
      src/main/java/com/iflytop/sgs/app/service/api/HeatService.java
  5. 1
      src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java

9
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<String> setEnable(@Valid @RequestBody SetHeatModuleEnableVO setHeatModuleEnableVO) {
heatModuleService.setEnable(setHeatModuleEnableVO);
return Result.success();
}
}

4
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;

21
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;
}

5
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());
}
}

1
src/main/java/com/iflytop/sgs/app/service/crafts/CraftsStepService.java

@ -42,6 +42,7 @@ public class CraftsStepService {
//第四步烘干后将托盘转移至退火工位在400下退火5min
//第五步将托盘取走放置在下料工位
//具体操作流程单批样品操作流程
//1 人员上料设定及开始
// 人员手动将样品放至上料工位设定分金时间记录分金编号按开始键开始分金

Loading…
Cancel
Save