小缓冲液测试数据更新

src/main/java/com/dreamworks/boditech/controller/DeviceController.java

@@ -47,6 +47,25 @@ public class DeviceController extends BaseController {
         return this.success(this.deviceService.device.testCards.getAll());
     }
 
+    @ResponseBody
+    @PostMapping("/api/device/buffer-tube-load")
+    public ApiResponse bufferTubeLoad() {
+//        List<CsmBufferTube> list = this.deviceService.bufferTubeLoad();
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/device/buffer-tube-update-by-box")
+    public ApiResponse bufferTubeUpdateByBox( @RequestBody ParamBufferTubeUpdateByBox param) {
+        this.deviceService.bufferTubeUpdateByBox(param);
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/device/buffer-tube-status-get")
+    public ApiResponse bufferTubeStatusGet() {
+        return this.success(this.deviceService.device.bufferTubes.getAll());
+    }
 
 
 
@@ -73,19 +92,7 @@ public class DeviceController extends BaseController {
         return this.success();
     }
 
-    @ResponseBody
-    @PostMapping("/api/device/buffer-tube-load")
-    public ApiResponse bufferTubeLoad() {
-        List<CsmBufferTube> list = this.deviceService.bufferTubeLoad();
-        return this.success(list);
-    }
 
-    @ResponseBody
-    @PostMapping("/api/device/buffer-tube-update-by-box")
-    public ApiResponse bufferTubeUpdateByBox( @RequestBody ParamBufferTubeUpdateByBox param) {
-        this.deviceService.bufferTubeUpdateByBox(param);
-        return this.success();
-    }
 
     @ResponseBody
     @PostMapping("/api/device/status")

src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeBox.java

@@ -0,0 +1,7 @@
+package com.dreamworks.boditech.driver.consumable;
+public class CsmBufferTubeBox {
+    public Integer index;
+    public Integer projectId;
+    public String projectName;
+    public Integer tubeAmount;
+}

src/main/java/com/dreamworks/boditech/driver/consumable/CsmBufferTubeManager.java

@@ -7,14 +7,41 @@ import java.util.List;
 public class CsmBufferTubeManager {
     // device instance
     private final Device device;
-    // list of buffer tube
-    private final List<CsmBufferTube> bufferTubeList = new ArrayList<>();
+    // list of buffer tube boxes
+    private final List<CsmBufferTubeBox> bufferTubeBoxes = new ArrayList<>();
 
     // constructor
     public CsmBufferTubeManager(Device device) {
         this.device = device;
+
+        // @TODO : 移除demo数据
+        for ( int i=0; i<6; i++ ) {
+            CsmBufferTubeBox box = new CsmBufferTubeBox();
+            box.tubeAmount = 25;
+            box.projectName = "demo" + i;
+            box.index = i;
+            this.bufferTubeBoxes.add(box);
+        }
     }
 
+    public List<CsmBufferTubeBox> getAll() {
+        return this.bufferTubeBoxes;
+    }
+
+    // update by box
+    public void updateByBox(ParamBufferTubeUpdateByBox param ) {
+        CsmBufferTubeBox box = this.bufferTubeBoxes.get(param.index);
+        box.tubeAmount = param.tubeAmount;
+    }
+
+
+
+
+    // list of buffer tube
+    private final List<CsmBufferTube> bufferTubeList = new ArrayList<>();
+
+
+
     // get device
     public Device getDevice() {
         return this.device;
@@ -32,10 +59,10 @@ public class CsmBufferTubeManager {
         throw new RuntimeException("no buffer tube for project " + projectName);
     }
 
-    // get all buffer tube A
-    public List<CsmBufferTube> getAll() {
-        return this.bufferTubeList;
-    }
+//    // get all buffer tube A
+//    public List<CsmBufferTube> getAll() {
+//        return this.bufferTubeList;
+//    }
 
     // append buffer tube A
     public void appendByCode( Integer areaIndex, String code ) {
@@ -61,18 +88,5 @@ public class CsmBufferTubeManager {
         }
     }
 
-    // update by box
-    public void updateByBox(ParamBufferTubeUpdateByBox param ) {
-        // remove all buffer tube B with matched zoneIndex
-        this.bufferTubeList.removeIf(bufferTube -> bufferTube.areaIndex.equals(param.areaIndex));
 
-        for ( int i=0; i< param.amount; i++ ) {
-            CsmBufferTube bufferTube = new CsmBufferTube(this);
-            bufferTube.coverType = param.coverType;
-            bufferTube.areaIndex = param.areaIndex;
-            bufferTube.position = i;
-            bufferTube.projectName = param.projectName;
-            this.bufferTubeList.add(bufferTube);
-        }
-    }
 }

src/main/java/com/dreamworks/boditech/driver/entity/ParamBufferTubeUpdateByBox.java

@@ -1,11 +1,7 @@
 package com.dreamworks.boditech.driver.entity;
 public class ParamBufferTubeUpdateByBox {
-    // type
-    public String coverType;
     // area index
-    public Integer areaIndex;
-    // project name
-    public String projectName;
+    public Integer index;
     // amount
-    public Integer amount;
+    public Integer tubeAmount;
 }

src/main/java/com/dreamworks/boditech/service/DeviceService.java

@@ -53,10 +53,9 @@ public class DeviceService {
     }
 
     // load buffer tubes
-    public List<CsmBufferTube> bufferTubeLoad() {
+    public void bufferTubeLoad() {
         TaskBufferTubeLoad task = new TaskBufferTubeLoad();
         Executor.executeTask(this.device, task);
-        return this.device.bufferTubes.getAll();
     }
 
     // update buffer tubes by box
@@ -98,14 +97,6 @@ public class DeviceService {
         for ( int i=0; i<bufferTubeAreas.length; i++ ) {
             bufferTubeAreas[i] = new BufferTubeArea();
         }
-        List<CsmBufferTube> bufferTubeList = this.device.bufferTubes.getAll();
-        for ( CsmBufferTube bufferTube : bufferTubeList ) {
-            Integer index = bufferTube.areaIndex;
-            bufferTubeAreas[index].areaIndex = index;
-            bufferTubeAreas[index].amount ++;
-            bufferTubeAreas[index].projectName = bufferTube.projectName;
-        }
-        status.put("bufferTubeAreas", bufferTubeAreas);
 
         return status;
     }