From c0c2b941604683029712815c3ebf4a94deb6d267 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 17:13:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=AD=A5=E9=AA=A4=E6=96=B9=E6=B3=95=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/qyft/gd/device/service/DeviceStepService.java | 9 +++++----
 src/main/java/com/qyft/gd/model/bo/TubeSol.java                 | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

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 afdfa63..6cd83de 100644
--- a/src/main/java/com/qyft/gd/device/service/DeviceStepService.java
+++ b/src/main/java/com/qyft/gd/device/service/DeviceStepService.java
@@ -38,18 +38,19 @@ public class DeviceStepService {
 
     /**
      * 添加溶液
+     *
      * @param tubeSolList 需要添加溶液的试管与溶液
      */
     public boolean addLiquid(List<TubeSol> tubeSolList) {
         List<Boolean> results = new ArrayList<>();
         for (TubeSol tubeSol : tubeSolList) {
-            String[] tubeCoordinateArray = tubeSol.getTubeCoordinate().split(",");
+            String[] tubeCoordinateArray = tubeSol.getTubeNum().split(",");   //TODO 这里应该通过试管编号获取坐标
             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 (TubeSol.AddLiquid addLiquid : tubeSol.getAddLiquidList()) {//依次添加溶液
-                results.add(deviceService.addLiquid(addLiquid.getPumpId(), addLiquid.getVolume()));
+                results.add(deviceService.addLiquid(addLiquid.getSolId(), addLiquid.getVolume()));//TODO 这里应该通过溶液id获取到泵id
             }
         }
         return results.stream().allMatch(Boolean::booleanValue);
@@ -93,12 +94,12 @@ public class DeviceStepService {
     }
 
     //摇匀
-    public boolean shaking() {
+    public boolean shaking(int second) {
         return true;
     }
 
     //开始加热
-    public boolean startHeating(String heaterId) {
+    public boolean startHeating(String heaterId, double temperature) {
         return true;
     }
 
diff --git a/src/main/java/com/qyft/gd/model/bo/TubeSol.java b/src/main/java/com/qyft/gd/model/bo/TubeSol.java
index 94a33e0..09bcfa1 100644
--- a/src/main/java/com/qyft/gd/model/bo/TubeSol.java
+++ b/src/main/java/com/qyft/gd/model/bo/TubeSol.java
@@ -10,9 +10,9 @@ import java.util.List;
 @Data
 public class TubeSol {
     /**
-     * 需要添加溶液的试管坐标list: x,y,z 字符
+     * 需要添加溶液的试管编号
      */
-    private String tubeCoordinate;
+    private String tubeNum;
     /**
      * 需要添加的溶液
      */
@@ -21,9 +21,9 @@ public class TubeSol {
     @Data
     public static class AddLiquid {
         /**
-         * 泵id
+         * 溶液id
          */
-        private Long pumpId;
+        private Long solId;
         /**
          * 加液量
          */