Browse Source

fix:修复停止清洗setCleaningNozzlePipeline true的问题

tags/1.0
白凤吉 5 months ago
parent
commit
363b12ee80
  1. 3
      src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java
  2. 2
      src/main/java/com/qyft/ms/app/front/cmd/business/SyringePipelineWashStop.java
  3. 14
      src/main/java/com/qyft/ms/app/model/vo/SelfTestVO.java
  4. 12
      src/main/java/com/qyft/ms/system/controller/FrontCmdController.java

3
src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java

@ -10,7 +10,6 @@ import org.springframework.stereotype.Component;
*/ */
@Data @Data
@Component @Component
@JsonIgnoreProperties({"advisors", "declaredPointcut", "classFilter"})
public class DeviceStatus { public class DeviceStatus {
/** /**
@ -51,7 +50,7 @@ public class DeviceStatus {
/** /**
* 是否完成自检 * 是否完成自检
*/ */
private volatile boolean selfTestCompleted = true;
private volatile boolean selfTestCompleted = false;
/** /**
* 是否按下急停 * 是否按下急停

2
src/main/java/com/qyft/ms/app/front/cmd/business/SyringePipelineWashStop.java

@ -38,7 +38,7 @@ public class SyringePipelineWashStop extends BaseCommandHandler {
commandWait(syringePumpStopCommandFuture, threeWayValveCloseAllCommandFuture); commandWait(syringePumpStopCommandFuture, threeWayValveCloseAllCommandFuture);
deviceStatus.setCleaningSyringePipeline(false); deviceStatus.setCleaningSyringePipeline(false);
deviceStatus.setCleaningNozzlePipeline(true);
deviceStatus.setCleaningNozzlePipeline(false);
}); });
} }

14
src/main/java/com/qyft/ms/app/model/vo/SelfTestVO.java

@ -1,5 +1,6 @@
package com.qyft.ms.app.model.vo; package com.qyft.ms.app.model.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
@ -13,77 +14,90 @@ public class SelfTestVO {
* X 轴是否正常 * X 轴是否正常
*/ */
@Schema(description = "X 轴是否正常") @Schema(description = "X 轴是否正常")
@JsonProperty("xAxisNormal")
private boolean xAxisNormal = false; private boolean xAxisNormal = false;
/** /**
* Y 轴是否正常 * Y 轴是否正常
*/ */
@Schema(description = "Y 轴是否正常") @Schema(description = "Y 轴是否正常")
@JsonProperty("yAxisNormal")
private boolean yAxisNormal = false; private boolean yAxisNormal = false;
/** /**
* Z 轴是否正常 * Z 轴是否正常
*/ */
@Schema(description = "Z 轴是否正常") @Schema(description = "Z 轴是否正常")
@JsonProperty("zAxisNormal")
private boolean zAxisNormal = false; private boolean zAxisNormal = false;
/** /**
* 注射泵是否正常 * 注射泵是否正常
*/ */
@Schema(description = "注射泵是否正常") @Schema(description = "注射泵是否正常")
@JsonProperty("syringePumpNormal")
private boolean syringePumpNormal = false; private boolean syringePumpNormal = false;
/** /**
* 三通阀是否正常 * 三通阀是否正常
*/ */
@Schema(description = "三通阀是否正常") @Schema(description = "三通阀是否正常")
@JsonProperty("threeWayValveNormal")
private boolean threeWayValveNormal = false; private boolean threeWayValveNormal = false;
/** /**
* 清洗阀是否正常 * 清洗阀是否正常
*/ */
@Schema(description = "清洗阀是否正常") @Schema(description = "清洗阀是否正常")
@JsonProperty("washValveNormal")
private boolean washValveNormal = false; private boolean washValveNormal = false;
/** /**
* 喷嘴阀是否正常 * 喷嘴阀是否正常
*/ */
@Schema(description = "喷嘴阀是否正常") @Schema(description = "喷嘴阀是否正常")
@JsonProperty("nozzleValveNormal")
private boolean nozzleValveNormal = false; private boolean nozzleValveNormal = false;
/** /**
* 除湿阀是否正常 * 除湿阀是否正常
*/ */
@Schema(description = "除湿阀是否正常") @Schema(description = "除湿阀是否正常")
@JsonProperty("dehumidifierValveNormal")
private boolean dehumidifierValveNormal = false; private boolean dehumidifierValveNormal = false;
/** /**
* 照明灯是否正常 * 照明灯是否正常
*/ */
@Schema(description = "照明灯是否正常") @Schema(description = "照明灯是否正常")
@JsonProperty("lightingPanelNormal")
private boolean lightingPanelNormal = false; private boolean lightingPanelNormal = false;
/** /**
* 电压控制器是否正常 * 电压控制器是否正常
*/ */
@Schema(description = "电压控制器是否正常") @Schema(description = "电压控制器是否正常")
@JsonProperty("highVoltageNormal")
private boolean highVoltageNormal = false; private boolean highVoltageNormal = false;
/** /**
* X 轴是否在原点 * X 轴是否在原点
*/ */
@Schema(description = "X 轴是否在原点") @Schema(description = "X 轴是否在原点")
@JsonProperty("xAxisAtOrigin")
private boolean xAxisAtOrigin = false; private boolean xAxisAtOrigin = false;
/** /**
* Y 轴是否在原点 * Y 轴是否在原点
*/ */
@Schema(description = "Y 轴是否在原点") @Schema(description = "Y 轴是否在原点")
@JsonProperty("yAxisAtOrigin")
private boolean yAxisAtOrigin = false; private boolean yAxisAtOrigin = false;
/** /**
* Z 轴是否在原点 * Z 轴是否在原点
*/ */
@Schema(description = "Z 轴是否在原点") @Schema(description = "Z 轴是否在原点")
@JsonProperty("zAxisAtOrigin")
private boolean zAxisAtOrigin = false; private boolean zAxisAtOrigin = false;
} }

12
src/main/java/com/qyft/ms/system/controller/FrontCmdController.java

@ -36,12 +36,12 @@ public class FrontCmdController {
String cmdId = form.getCmdId(); String cmdId = form.getCmdId();
String cmdCode = form.getCmdCode(); String cmdCode = form.getCmdCode();
try { 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, "已收到业务指令请求,开始处理")); webSocketService.pushDebugMsg(FrontResponseGenerator.generateJson(cmdId, cmdCode, CommandStatus.RECEIVE, "已收到业务指令请求,开始处理"));
CommandHandler commandHandler = registry.getHandler(cmdCode); CommandHandler commandHandler = registry.getHandler(cmdCode);
if (commandHandler == null) { if (commandHandler == null) {

Loading…
Cancel
Save