diff --git a/src/main/java/com/iflytop/handacid/app/service/ChannelCtrlService.java b/src/main/java/com/iflytop/handacid/app/service/ChannelCtrlService.java index 8703ee3..c1f6e3b 100644 --- a/src/main/java/com/iflytop/handacid/app/service/ChannelCtrlService.java +++ b/src/main/java/com/iflytop/handacid/app/service/ChannelCtrlService.java @@ -140,6 +140,11 @@ public class ChannelCtrlService { } List commandFutureList = new ArrayList<>(); for (ChannelState channelState : channelStateList) { + //打开阀门 + DeviceCommand valveOpenDeviceCommand = getValveOpenCommandByChannel(channelState.getChannelCode()); + CommandFuture valveOpenCommandFuture = deviceCommandService.sendCommand(valveOpenDeviceCommand); + CommandUtil.wait(valveOpenCommandFuture); + DeviceCommand deviceCommand = getPumpForwardRotateCommandByChannel(channelState.getChannelCode()); commandFutureList.add(deviceCommandService.sendCommand(deviceCommand)); AuditRecord auditRecord = new AuditRecord(deviceState.getCurrentUser().getId(), deviceState.getCurrentUser().getNickname(), channelState.getSolutionId(), @@ -173,6 +178,9 @@ public class ChannelCtrlService { for (ChannelState channelCode : channelCodeList) { channelCode.setPre(true); channelCode.setStateCode(ChannelStateCode.IDLE); + //关闭阀门 + DeviceCommand valveCloseDeviceCommand = getValveCloseCommandByChannel(channelCode.getChannelCode()); + deviceCommandService.sendCommand(valveCloseDeviceCommand); } } });