From 6072a7970bf74c0055e442e66cb2ffac84d79be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com>
Date: Tue, 27 May 2025 09:13:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=9A=E5=8A=A1=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/iflytop/sgs/app/cmd/control/CleanStartCommand.java     |  2 +-
 .../java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java  |  2 +-
 .../java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java |  8 +++++++-
 .../com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java   |  3 ++-
 .../sgs/app/service/device/module/SolutionModuleService.java   | 10 ++++++++++
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java
index 32744f2..fa66270 100644
--- a/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java
+++ b/src/main/java/com/iflytop/sgs/app/cmd/control/CleanStartCommand.java
@@ -25,7 +25,7 @@ import java.util.concurrent.CompletableFuture;
 @Slf4j
 @Component
 @RequiredArgsConstructor
-@CommandMapping("heat_start")//业务指令注解
+@CommandMapping("clean_start")//业务指令注解
 public class CleanStartCommand extends BaseCommandHandler {
     private final SolutionModuleService solutionModuleService;
     private final DevicePositionService devicePositionService;
diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java
index 14e7a25..ccdb47b 100644
--- a/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java
+++ b/src/main/java/com/iflytop/sgs/app/cmd/control/DryStartCommand.java
@@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture;
 @Slf4j
 @Component
 @RequiredArgsConstructor
-@CommandMapping("_start")//业务指令注解
+@CommandMapping("dry_start")//业务指令注解
 public class DryStartCommand extends BaseCommandHandler {
     private final HeatModuleService heatModuleService;
     private final DeviceStateService deviceStateService;
diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java
index 89ae9d6..dc15c2d 100644
--- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java
+++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidAddCommand.java
@@ -38,9 +38,15 @@ public class LiquidAddCommand extends BaseCommandHandler {
 
     @Override
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
+        //todo "params": {
+        //         "columns":[{"column":1,"solutionId":1,"volume":10},
+        //                   {"column":2,"solutionId":2,"volume":10},
+        //                   {"column":3,"solutionId":3,"volume":10}]
+        //    }
+
         String solution = cmdDTO.getStringParam("solution");
         ValveStateCode valveStateCode = ValveStateCode.valueOf(solution);//解析加液通道
-        double volume = cmdDTO.getDoubleParam("volume");//解析加液量
+        double volume = cmdDTO.getDoubleParam("column");//解析加液量
         JSONArray jsonArray = cmdDTO.getJSONArrayParam("index");//解析加液列
         Double scale = Double.valueOf(systemConfigService.getSystemConfigValueByCode(valveStateCode.getSystemConfigCode()));//获取转换系数
         Double position = volume * scale;
diff --git a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java
index 609d8ee..ce7658c 100644
--- a/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java
+++ b/src/main/java/com/iflytop/sgs/app/cmd/control/LiquidReduceCommand.java
@@ -38,7 +38,8 @@ public class LiquidReduceCommand extends BaseCommandHandler {
 
     @Override
     public CompletableFuture<Void> handle(CmdDTO cmdDTO) {
-        double volume=cmdDTO.getDoubleParam("volume");//解析加液量
+        //todo 无参数
+        double volume=cmdDTO.getDoubleParam("column");//解析加液量
         JSONArray jsonArray =cmdDTO.getJSONArrayParam("index");//解析加液列
         Double position = volume;//蠕动泵移动距离
         Point3D liquidAreaTrayPoint = devicePositionService.getPosition(DevicePositionCode.liquidAreaTrayPoint).getPoint3D(); //获取加液区上方点位
diff --git a/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java b/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java
index a0472de..07ab1f2 100644
--- a/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java
+++ b/src/main/java/com/iflytop/sgs/app/service/device/module/SolutionModuleService.java
@@ -112,6 +112,16 @@ public class SolutionModuleService {
         CommandUtil.wait(deviceCommandFuture);
 
     }
+
+    /**
+     * 加液泵排空
+     */
+    public void liquidPumpEmpty(String cmdId, String cmdCode, double position) throws Exception {
+        DeviceCommandBundle deviceCommandBundle = DeviceCommandGenerator.liquidPumpMoveBy(position);
+        CommandFuture deviceCommandFuture = deviceCommandService.sendCommand(cmdId, cmdCode, deviceCommandBundle);
+        CommandUtil.wait(deviceCommandFuture);
+
+    }
     /**
      * 电磁阀转换通道
      * */