From 9dc1e8db230c44496783b704efb7ff4aa85e5a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Fri, 1 Aug 2025 10:10:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=85=85=E5=85=B3=E9=97=AD=E9=98=80?=
 =?UTF-8?q?=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/iflytop/handacid/app/service/ChannelCtrlService.java | 8 ++++++++
 1 file changed, 8 insertions(+)

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<CommandFuture> 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);
                 }
             }
         });