From 5704be8947b7ea103d0e4784e007bb5560105ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= <baifengji@163.com>
Date: Wed, 19 Feb 2025 16:45:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=BA=B6=E6=B6=B2=E6=96=B9=E6=B3=95=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qyft/gd/device/service/DeviceStepService.java  | 15 ++++------
 src/main/java/com/qyft/gd/model/bo/AddLiquid.java  | 16 -----------
 src/main/java/com/qyft/gd/model/bo/TubeSol.java    | 32 ++++++++++++++++++++++
 3 files changed, 38 insertions(+), 25 deletions(-)
 delete mode 100644 src/main/java/com/qyft/gd/model/bo/AddLiquid.java
 create mode 100644 src/main/java/com/qyft/gd/model/bo/TubeSol.java

diff --git a/src/main/java/com/qyft/gd/device/service/DeviceStepService.java b/src/main/java/com/qyft/gd/device/service/DeviceStepService.java
index a7901f5..009f0ce 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceStepService.java
+++ b/src/main/java/com/qyft/gd/device/service/DeviceStepService.java
@@ -1,13 +1,12 @@
 package com.qyft.gd.device.service;
 
-import com.qyft.gd.model.bo.AddLiquid;
+import com.qyft.gd.model.bo.TubeSol;
 import com.qyft.gd.service.BaseDataService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.BooleanSupplier;
 
 /**
  * 设备步骤操作
@@ -39,19 +38,17 @@ public class DeviceStepService {
 
     /**
      * 添加溶液
-     *
-     * @param tubeCoordinateList 需要添加溶液的试管坐标list: x,y,z 字符
-     * @param addLiquidList      需要添加的溶液
+     * @param tubeSolList 需要添加溶液的试管与溶液
      */
-    public boolean addLiquid(List<String> tubeCoordinateList, List<AddLiquid> addLiquidList) {
+    public boolean addLiquid(List<TubeSol> tubeSolList) {
         List<Boolean> results = new ArrayList<>();
-        for (String tubeCoordinate : tubeCoordinateList) {
-            String[] tubeCoordinateArray = tubeCoordinate.split(",");
+        for (TubeSol tubeSol : tubeSolList) {
+            String[] tubeCoordinateArray = tubeSol.getTubeCoordinate().split(",");
             int x = Integer.parseInt(tubeCoordinateArray[0]);
             int y = Integer.parseInt(tubeCoordinateArray[1]);
             int z = Integer.parseInt(tubeCoordinateArray[2]);
             results.add(deviceService.moveLiquidArmToPoint(x, y, z));//加液孔对准试管
-            for (AddLiquid addLiquid : addLiquidList) {//依次添加溶液
+            for (TubeSol.AddLiquid addLiquid : tubeSol.getAddLiquidList()) {//依次添加溶液
                 results.add(deviceService.addLiquid(addLiquid.getPumpId(), addLiquid.getVolume()));
             }
         }
diff --git a/src/main/java/com/qyft/gd/model/bo/AddLiquid.java b/src/main/java/com/qyft/gd/model/bo/AddLiquid.java
deleted file mode 100644
index f8890ac..0000000
--- a/src/main/java/com/qyft/gd/model/bo/AddLiquid.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.qyft.gd.model.bo;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-/**
- * 添加溶液
- */
-@Schema(description = "添加溶液")
-@Data
-public class AddLiquid {
-    @Schema(description = "泵id")
-    private Long pumpId;
-    @Schema(description = "加液量")
-    private Integer volume;
-}
diff --git a/src/main/java/com/qyft/gd/model/bo/TubeSol.java b/src/main/java/com/qyft/gd/model/bo/TubeSol.java
new file mode 100644
index 0000000..94a33e0
--- /dev/null
+++ b/src/main/java/com/qyft/gd/model/bo/TubeSol.java
@@ -0,0 +1,32 @@
+package com.qyft.gd.model.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 试管添加溶液
+ */
+@Data
+public class TubeSol {
+    /**
+     * 需要添加溶液的试管坐标list: x,y,z 字符
+     */
+    private String tubeCoordinate;
+    /**
+     * 需要添加的溶液
+     */
+    private List<AddLiquid> addLiquidList;
+
+    @Data
+    public static class AddLiquid {
+        /**
+         * 泵id
+         */
+        private Long pumpId;
+        /**
+         * 加液量
+         */
+        private Integer volume;
+    }
+}