diff --git a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java index f4bafa3..8d4a5b6 100644 --- a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java +++ b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java @@ -72,13 +72,27 @@ public class DeviceController extends BaseController { @ResponseBody @PostMapping("/api/device/temperature-get") public ApiResponse temperatureGet() { - ActModuleTestCardBoxCaseTemperature module = (ActModuleTestCardBoxCaseTemperature)this.deviceService.device.getActuator(ActuatorModule.TEST_CARD_BOX_CASE_TEMPERATURE); + Integer mid = ActuatorModule.TEST_CARD_BOX_CASE_TEMPERATURE; + ActModuleTestCardBoxCaseTemperature module = (ActModuleTestCardBoxCaseTemperature)this.deviceService.device.getActuator(mid); Double temperature = module.getTemperature(); return this.success(Map.of( "testCardBoxCase", temperature )); } + @ResponseBody + @PostMapping("/api/device/pipette-tip-update-by-box") + public ApiResponse pipetteTipUpdate( @RequestBody ParamPipetteTipUpdate param ) { + this.deviceService.pipetteTipUpdateByBox(param); + return this.success(); + } + + @ResponseBody + @PostMapping("/api/device/pipette-tip-box-status-get") + public ApiResponse pipetteTipStatusGet() { + return this.success(this.deviceService.device.pipetteTips.getAll()); + } + @@ -275,19 +289,6 @@ public class DeviceController extends BaseController { } @ResponseBody - @PostMapping("/api/device/pipette-tip-update-by-box") - public ApiResponse pipetteTipUpdate( @RequestBody ParamPipetteTipUpdate param ) { - this.deviceService.pipetteTipUpdateByBox(param); - return this.success(); - } - - @ResponseBody - @PostMapping("/api/device/pipette-tip-status-get") - public ApiResponse pipetteTipStatusGet() { - return this.success(this.deviceService.device.pipetteTips.getAll()); - } - - @ResponseBody @PostMapping("/api/device/emergency-slot-status-get") public ApiResponse emergencySlotStatusGet() { return this.success(Map.of( diff --git a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipBox.java b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipBox.java index fd83c6c..011642a 100644 --- a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipBox.java +++ b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipBox.java @@ -1,5 +1,7 @@ package com.dreamworks.boditech.driver.consumable; public class CsmPipetteTipBox { - public Integer position; + // position index + public Integer index; + // tip amount public Integer tipAmount; } diff --git a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipManager.java b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipManager.java index 331bbac..7c3a4e0 100644 --- a/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipManager.java +++ b/src/main/java/com/dreamworks/boditech/driver/consumable/CsmPipetteTipManager.java @@ -13,16 +13,15 @@ public class CsmPipetteTipManager { // constructor public CsmPipetteTipManager(Device device) { this.device = device; - - // @TODO : 测试数据 for ( int i=0; i<3; i++ ) { CsmPipetteTipBox box = new CsmPipetteTipBox(); - box.tipAmount = 120; - box.position = i; + box.index = i; + box.tipAmount = 0; this.pipetteTipBoxes.add(box); } } + // update by box public void updateByBox( ParamPipetteTipUpdate param ) { CsmPipetteTipBox box = this.pipetteTipBoxes.get(param.index); box.tipAmount = param.tipAmount; @@ -35,6 +34,14 @@ public class CsmPipetteTipManager { + + + + + + + + // list of test cards private final List pipetteTips = new ArrayList<>();