|
@ -9,6 +9,7 @@ import com.iflytop.gd.app.ws.server.WebSocketSender; |
|
|
import com.iflytop.gd.common.enums.HeatingType; |
|
|
import com.iflytop.gd.common.enums.HeatingType; |
|
|
import com.iflytop.gd.common.enums.data.DevicePositionCode; |
|
|
import com.iflytop.gd.common.enums.data.DevicePositionCode; |
|
|
import com.iflytop.gd.common.utils.LocalDateTimeUtil; |
|
|
import com.iflytop.gd.common.utils.LocalDateTimeUtil; |
|
|
|
|
|
import jakarta.annotation.PostConstruct; |
|
|
import lombok.RequiredArgsConstructor; |
|
|
import lombok.RequiredArgsConstructor; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.springframework.scheduling.annotation.Scheduled; |
|
|
import org.springframework.scheduling.annotation.Scheduled; |
|
@ -31,12 +32,6 @@ public class HeatCountdownScheduledTask { |
|
|
private final HeatModuleService heatModuleService; |
|
|
private final HeatModuleService heatModuleService; |
|
|
private final WebSocketSender webSocketSender; |
|
|
private final WebSocketSender webSocketSender; |
|
|
|
|
|
|
|
|
private double trayLift; |
|
|
|
|
|
|
|
|
|
|
|
private void init() { |
|
|
|
|
|
trayLift = devicePositionService.getPosition(DevicePositionCode.trayLift).getDistance(); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Scheduled(fixedRate = 1000) |
|
|
@Scheduled(fixedRate = 1000) |
|
|
public void fetchTemperature() { |
|
|
public void fetchTemperature() { |
|
|
try { |
|
|
try { |
|
@ -53,6 +48,7 @@ public class HeatCountdownScheduledTask { |
|
|
LocalDateTime endTime = heatModuleState.getStartHeatTime().minusSeconds(heatModuleState.getTargetTime()); |
|
|
LocalDateTime endTime = heatModuleState.getStartHeatTime().minusSeconds(heatModuleState.getTargetTime()); |
|
|
//判断是否达到目标加热时间 |
|
|
//判断是否达到目标加热时间 |
|
|
if (endTime.isBefore(now)) {//加热完毕 |
|
|
if (endTime.isBefore(now)) {//加热完毕 |
|
|
|
|
|
double trayLift = devicePositionService.getPosition(DevicePositionCode.trayLift).getDistance(); |
|
|
//抬起托盘 |
|
|
//抬起托盘 |
|
|
heatModuleService.heaterMotorMove(heatModuleState.getModuleCode(), trayLift); |
|
|
heatModuleService.heaterMotorMove(heatModuleState.getModuleCode(), trayLift); |
|
|
heatModuleState.setTrayUp(1); |
|
|
heatModuleState.setTrayUp(1); |
|
|