|
|
@ -134,7 +134,7 @@ public class MatrixSprayStart extends BaseCommandHandler { |
|
|
|
List<Map<String, Object>> positionList = (List<Map<String, Object>>) form.getParams().get("position"); |
|
|
|
|
|
|
|
nonNullCheck(matrixPathType, form.getCmdId(), form.getCmdCode(), motorZHeight, gasPressure, volume, highVoltage, spacing, movingSpeed, times, positionList); |
|
|
|
if (highVoltageValue > 6000) { |
|
|
|
if (highVoltageValue != null && highVoltageValue > 6000) { |
|
|
|
webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(form.getCmdId(), form.getCmdCode(), CommandStatus.DEVICE_ERROR, "电压不能大于6000V")); |
|
|
|
throw new RuntimeException("电压不能大于6000V"); |
|
|
|
} |
|
|
@ -341,7 +341,7 @@ public class MatrixSprayStart extends BaseCommandHandler { |
|
|
|
CommandFuture[] commandFutureArray = futureList.toArray(new CommandFuture[0]); |
|
|
|
commandWait(commandFutureArray); |
|
|
|
|
|
|
|
DeviceCommand threeWayValveOpenSyringePipelineCommand = DeviceCommandGenerator.threeWayValveOpenSyringePipeline();//打开三通阀喷嘴管路 |
|
|
|
DeviceCommand threeWayValveOpenSyringePipelineCommand = DeviceCommandGenerator.threeWayValveOpenNozzlePipeline();//打开三通阀注射器管路 |
|
|
|
CommandFuture threeWayValveOpenSyringePipelineCommandFuture = deviceCommandService.sendCommand(form.getCmdId(), form.getCmdCode(), threeWayValveOpenSyringePipelineCommand); |
|
|
|
commandWait(threeWayValveOpenSyringePipelineCommandFuture); |
|
|
|
|
|
|
|