From 708938943f9012f58af8483146a0e28514526fe4 Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Tue, 19 Dec 2023 16:49:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=BC=93=E5=86=B2=E6=B6=B2=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boditech/controller/DeviceController.java      | 42 +++++++++++++++-------
 .../driver/consumable/CsmLargeBufferTube.java      |  3 ++
 .../consumable/CsmLargeBufferTubeManager.java      | 11 +++++-
 .../driver/entity/ParamLargeBufferTubeUpdate.java  |  2 +-
 4 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java
index 950ebb4..0ddbcc7 100644
--- a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java
+++ b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java
@@ -68,6 +68,32 @@ public class DeviceController extends BaseController {
     }
 
     @ResponseBody
+    @PostMapping("/api/device/large-buffer-tube-load")
+    public ApiResponse largeBufferTubeLoad() {
+//        List< CsmLargeBufferTube> list = this.deviceService.largeBufferTubeLoad();
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/device/large-buffer-tube-update")
+    public ApiResponse largeBufferTubeUpdate(@RequestBody ParamLargeBufferTubeUpdate param) {
+        this.deviceService.largeBufferTubeUpdate(param);
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/device/large-buffer-tube-status-get")
+    public ApiResponse largeBufferTubeStatusGet() {
+        return this.success(this.deviceService.device.largeBufferTubes.getAll());
+    }
+
+
+
+
+
+
+
+    @ResponseBody
     @PostMapping("/api/device/temperature-get")
     public ApiResponse temperatureGet() {
         return this.success(Integer.valueOf("100"));
@@ -76,6 +102,10 @@ public class DeviceController extends BaseController {
 
 
 
+
+
+
+
     @ResponseBody
     @PostMapping("/api/device/pipette-tip-update")
     public ApiResponse pipetteTipUpdate( @RequestBody ParamPipetteTipUpdate param ) {
@@ -83,19 +113,7 @@ public class DeviceController extends BaseController {
         return this.success();
     }
 
-    @ResponseBody
-    @PostMapping("/api/device/large-buffer-tube-load")
-    public ApiResponse largeBufferTubeLoad() {
-        List< CsmLargeBufferTube> list = this.deviceService.largeBufferTubeLoad();
-        return this.success(list);
-    }
 
-    @ResponseBody
-    @PostMapping("/api/device/large-buffer-tube-update")
-    public ApiResponse largeBufferTubeUpdate(@RequestBody ParamLargeBufferTubeUpdate param) {
-        this.deviceService.largeBufferTubeUpdate(param);
-        return this.success();
-    }
 
 
 
diff --git a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTube.java b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTube.java
index 7215d22..b95ba16 100644
--- a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTube.java
+++ b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTube.java
@@ -4,6 +4,9 @@ public class CsmLargeBufferTube {
     public Integer position = -1;
     // project name
     public String projectName = "";
+    // amount
+    public Integer amount;
+
     // manager
     private final CsmLargeBufferTubeManager manager;
 
diff --git a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTubeManager.java b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTubeManager.java
index d376330..ac127e8 100644
--- a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTubeManager.java
+++ b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmLargeBufferTubeManager.java
@@ -13,6 +13,15 @@ public class CsmLargeBufferTubeManager {
     // constructor
     public CsmLargeBufferTubeManager(Device device) {
         this.device = device;
+
+        //@TODO: demo 数据
+        for ( int i=0; i<6; i++ ) {
+            CsmLargeBufferTube tube = new CsmLargeBufferTube(this);
+            tube.position = i;
+            tube.amount = 15;
+            tube.projectName = "demo" + i;
+            this.largeBufferTubes.add(tube);
+        }
     }
 
     // get all large buffer tubes
@@ -73,7 +82,7 @@ public class CsmLargeBufferTubeManager {
 
         CsmLargeBufferTube largeBufferTube = new CsmLargeBufferTube(this);
         largeBufferTube.position = param.position;
-        largeBufferTube.projectName = param.projectName;
+//        largeBufferTube.projectName = param.projectName;
         this.largeBufferTubes.add(largeBufferTube);
     }
 }
diff --git a/src/main/java/com/dreamworks/boditech/driver/entity/ParamLargeBufferTubeUpdate.java b/src/main/java/com/dreamworks/boditech/driver/entity/ParamLargeBufferTubeUpdate.java
index d5fda54..c5d068a 100644
--- a/src/main/java/com/dreamworks/boditech/driver/entity/ParamLargeBufferTubeUpdate.java
+++ b/src/main/java/com/dreamworks/boditech/driver/entity/ParamLargeBufferTubeUpdate.java
@@ -1,5 +1,5 @@
 package com.dreamworks.boditech.driver.entity;
 public class ParamLargeBufferTubeUpdate {
     public Integer position;
-    public String projectName;
+    public String amount;
 }