sige 1 year ago
parent
commit
4b770873da
  1. BIN
      app.db
  2. 11
      src/main/java/com/iflytop/digester/controller/DeviceController.java
  3. 9
      src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableInstance.java
  4. 2
      src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlot.java

BIN
app.db

11
src/main/java/com/iflytop/digester/controller/DeviceController.java

@ -42,4 +42,15 @@ public class DeviceController extends UfApiControllerBase {
this.device.door.close();
return this.success();
}
@ResponseBody
@PostMapping("/api/device/trans-move-tube-rack-to-heat-plate")
public UfApiResponse transMoveTubeRackToHeatPlate() throws InterruptedException {
var slot = this.device.heatingTurntable.getSlotByLiquidPlateTubeRack();
if (null == slot) {
return this.error("加液盘无试管架");
}
this.device.transferArm.moveTubeRackToHeatingTurntable(slot.index);
return this.success();
}
}

9
src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableInstance.java

@ -22,6 +22,15 @@ public class HeatingTurntableInstance {
return slots;
}
public HeatingTurntableSlot getSlotByLiquidPlateTubeRack() {
for (HeatingTurntableSlot slot : slots) {
if (null != slot.tubeRackNo && slot.tubeRackLocation.equals("liquid-plate")) {
return slot;
}
}
return null;
}
// 分配加热位
synchronized public HeatingTurntableSlot allocSlot( String tubeRackNo ) {
for (HeatingTurntableSlot slot : slots) {

2
src/main/java/com/iflytop/digester/deviceinstance/HeatingTurntableSlot.java

@ -20,6 +20,8 @@ public class HeatingTurntableSlot {
public String heatingStatus = "off"; // off:未加热 on:加热中
// 试管列表
public List<HeatingTurntableSlotTube> tubes = new ArrayList<>();
// 试管架位置
public String tubeRackLocation = null; // heating-turntable:加热转盘 liquid-plate :加液盘
// Constructor
public HeatingTurntableSlot() {

Loading…
Cancel
Save