From a910692142dd4a529be00c6b78799b41c4a50772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Fri, 1 Aug 2025 18:45:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=AE=9A=E9=87=8F=E9=A2=84=E5=85=85?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E8=AE=A1=E7=AE=97=E5=8A=A0=E6=B6=B2=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/command/control/SolutionDrainStartCommand.java | 8 +++++--- .../iflytop/handacid/app/service/ChannelCtrlService.java | 14 +++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/iflytop/handacid/app/command/control/SolutionDrainStartCommand.java b/src/main/java/com/iflytop/handacid/app/command/control/SolutionDrainStartCommand.java index de7afa8..368d552 100644 --- a/src/main/java/com/iflytop/handacid/app/command/control/SolutionDrainStartCommand.java +++ b/src/main/java/com/iflytop/handacid/app/command/control/SolutionDrainStartCommand.java @@ -1,6 +1,7 @@ package com.iflytop.handacid.app.command.control; import com.iflytop.handacid.app.common.annotation.CommandMapping; +import com.iflytop.handacid.app.common.enums.ChannelCode; import com.iflytop.handacid.app.common.enums.ChannelStateCode; import com.iflytop.handacid.app.common.enums.SystemConfigKey; import com.iflytop.handacid.app.common.utils.CommandUtil; @@ -36,17 +37,18 @@ public class SolutionDrainStartCommand extends BaseCommandHandler { @Override public CompletableFuture handle(CommandDTO commandDTO) { - List channelCodeList = deviceState.filterChannelStatesIsPre(); return runAsync(() -> { List commandFutureList = new ArrayList<>(); - for (ChannelState channelState : channelCodeList) { + for(ChannelCode channelCode : ChannelCode.values()){ + ChannelState channelState = deviceState.getChannelStateMap().get(channelCode); channelState.setStateCode(ChannelStateCode.DRAIN); Double drainRevolutions = systemConfigService.getValueByKeyToDouble(SystemConfigKey.DRAIN_REVOLUTIONS); DeviceCommand deviceCommand = channelCtrlService.getPumpMoveByCommandByChannel(channelState.getChannelCode(), -drainRevolutions); commandFutureList.add(deviceCommandService.sendCommand(deviceCommand)); } CommandUtil.wait(commandFutureList); - for (ChannelState channelState : channelCodeList) { + for(ChannelCode channelCode : ChannelCode.values()){ + ChannelState channelState = deviceState.getChannelStateMap().get(channelCode); channelState.setStateCode(ChannelStateCode.IDLE); } }); 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 d10715d..5b12b9e 100644 --- a/src/main/java/com/iflytop/handacid/app/service/ChannelCtrlService.java +++ b/src/main/java/com/iflytop/handacid/app/service/ChannelCtrlService.java @@ -158,13 +158,13 @@ public class ChannelCtrlService { } CommandUtil.wait(commandFutureList); - for (ChannelState channelState : channelStateList) {//与缓存的位置比较计算加液量 - PreFill preFill = preFillService.lambdaQuery() - .eq(PreFill::getSolutionId, channelState.getSolutionId()) - .eq(PreFill::getConcentration, channelState.getConcentration()) - .one(); - handleCalculateActualDispensedVolume(channelState, preFill.getVolume(), preFill.getConcentration()); - } +// for (ChannelState channelState : channelStateList) {//与缓存的位置比较计算加液量 +// PreFill preFill = preFillService.lambdaQuery() +// .eq(PreFill::getSolutionId, channelState.getSolutionId()) +// .eq(PreFill::getConcentration, channelState.getConcentration()) +// .one(); +// handleCalculateActualDispensedVolume(channelState, preFill.getVolume(), preFill.getConcentration()); +// } } catch (Exception e) { throw new RuntimeException(e); }