diff --git a/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java b/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java index 386e5e5..9c42647 100644 --- a/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java +++ b/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Component; */ @Data @Component -@JsonIgnoreProperties({"advisors", "declaredPointcut", "classFilter"}) public class DeviceStatus { /** @@ -51,7 +50,7 @@ public class DeviceStatus { /** * 是否完成自检 */ - private volatile boolean selfTestCompleted = true; + private volatile boolean selfTestCompleted = false; /** * 是否按下急停 diff --git a/src/main/java/com/qyft/ms/app/front/cmd/business/SyringePipelineWashStop.java b/src/main/java/com/qyft/ms/app/front/cmd/business/SyringePipelineWashStop.java index 40796f3..6216570 100644 --- a/src/main/java/com/qyft/ms/app/front/cmd/business/SyringePipelineWashStop.java +++ b/src/main/java/com/qyft/ms/app/front/cmd/business/SyringePipelineWashStop.java @@ -38,7 +38,7 @@ public class SyringePipelineWashStop extends BaseCommandHandler { commandWait(syringePumpStopCommandFuture, threeWayValveCloseAllCommandFuture); deviceStatus.setCleaningSyringePipeline(false); - deviceStatus.setCleaningNozzlePipeline(true); + deviceStatus.setCleaningNozzlePipeline(false); }); } diff --git a/src/main/java/com/qyft/ms/app/model/vo/SelfTestVO.java b/src/main/java/com/qyft/ms/app/model/vo/SelfTestVO.java index 705ee0d..60619d2 100644 --- a/src/main/java/com/qyft/ms/app/model/vo/SelfTestVO.java +++ b/src/main/java/com/qyft/ms/app/model/vo/SelfTestVO.java @@ -1,5 +1,6 @@ package com.qyft.ms.app.model.vo; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -13,77 +14,90 @@ public class SelfTestVO { * X 轴是否正常 */ @Schema(description = "X 轴是否正常") + @JsonProperty("xAxisNormal") private boolean xAxisNormal = false; /** * Y 轴是否正常 */ @Schema(description = "Y 轴是否正常") + @JsonProperty("yAxisNormal") private boolean yAxisNormal = false; /** * Z 轴是否正常 */ @Schema(description = "Z 轴是否正常") + @JsonProperty("zAxisNormal") private boolean zAxisNormal = false; /** * 注射泵是否正常 */ @Schema(description = "注射泵是否正常") + @JsonProperty("syringePumpNormal") private boolean syringePumpNormal = false; /** * 三通阀是否正常 */ @Schema(description = "三通阀是否正常") + @JsonProperty("threeWayValveNormal") private boolean threeWayValveNormal = false; /** * 清洗阀是否正常 */ @Schema(description = "清洗阀是否正常") + @JsonProperty("washValveNormal") private boolean washValveNormal = false; /** * 喷嘴阀是否正常 */ @Schema(description = "喷嘴阀是否正常") + @JsonProperty("nozzleValveNormal") private boolean nozzleValveNormal = false; /** * 除湿阀是否正常 */ @Schema(description = "除湿阀是否正常") + @JsonProperty("dehumidifierValveNormal") private boolean dehumidifierValveNormal = false; /** * 照明灯是否正常 */ @Schema(description = "照明灯是否正常") + @JsonProperty("lightingPanelNormal") private boolean lightingPanelNormal = false; /** * 电压控制器是否正常 */ @Schema(description = "电压控制器是否正常") + @JsonProperty("highVoltageNormal") private boolean highVoltageNormal = false; /** * X 轴是否在原点 */ @Schema(description = "X 轴是否在原点") + @JsonProperty("xAxisAtOrigin") private boolean xAxisAtOrigin = false; /** * Y 轴是否在原点 */ @Schema(description = "Y 轴是否在原点") + @JsonProperty("yAxisAtOrigin") private boolean yAxisAtOrigin = false; /** * Z 轴是否在原点 */ @Schema(description = "Z 轴是否在原点") + @JsonProperty("zAxisAtOrigin") private boolean zAxisAtOrigin = false; } diff --git a/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java b/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java index dabbe1a..e4a652b 100644 --- a/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java +++ b/src/main/java/com/qyft/ms/system/controller/FrontCmdController.java @@ -36,12 +36,12 @@ public class FrontCmdController { String cmdId = form.getCmdId(); String cmdCode = form.getCmdCode(); try { -// if(!"motor_xyz_origin".equals(cmdCode)){ -// if (!deviceStatus.isSelfTestCompleted()) { -// log.error("未进行自检,无法执行业务指令"); -// return Result.failed("未进行自检,无法执行业务指令"); -// } -// } + if(!"motor_xyz_origin".equals(cmdCode)){ + if (!deviceStatus.isSelfTestCompleted()) { + log.error("未进行自检,无法执行业务指令"); + return Result.failed("未进行自检,无法执行业务指令"); + } + } webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RECEIVE, "已收到业务指令请求,开始处理")); CommandHandler commandHandler = registry.getHandler(cmdCode); if (commandHandler == null) {