diff --git a/app.db b/app.db index 6a0fe34..ce753d5 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/com/iflytop/digester/controller/HeatSlotController.java b/src/main/java/com/iflytop/digester/controller/HeatSlotController.java index fe8cec2..18436e5 100644 --- a/src/main/java/com/iflytop/digester/controller/HeatSlotController.java +++ b/src/main/java/com/iflytop/digester/controller/HeatSlotController.java @@ -5,6 +5,7 @@ import com.iflytop.digester.underframework.controller.UfApiResponse; import jakarta.annotation.Resource; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import java.util.Map; @Controller @@ -18,4 +19,29 @@ public class HeatSlotController extends UfApiControllerBase { var heatSlots = this.device.heatingTurntable.getSlots(); return this.success(Map.of("slots", heatSlots)); } + + @ResponseBody + @PostMapping("/api/heat-slot/alloc") + public UfApiResponse alloc(@RequestBody Map params) { + String tubeRackNo = (String)params.get("tubeRackNo"); + try { + var slot = this.device.heatingTurntable.allocSlot(tubeRackNo); + return this.success(slot); + } catch ( Exception e ) { + return this.error(e.getMessage()); + } + } + + @ResponseBody + @PostMapping("/api/heat-slot/release") + public UfApiResponse release(@RequestBody Map params) { + Integer slotIndex = (Integer)params.get("slotIndex"); + try { + var slot = this.device.heatingTurntable.getSlotByIndex(slotIndex); + slot.setTubeRackNo(null); + return this.success(); + } catch ( Exception e ) { + return this.error(e.getMessage()); + } + } } diff --git a/src/main/java/com/iflytop/digester/model/MdbDigestionSolution.java b/src/main/java/com/iflytop/digester/model/MdbDigestionSolution.java index ece80a3..aeefdac 100644 --- a/src/main/java/com/iflytop/digester/model/MdbDigestionSolution.java +++ b/src/main/java/com/iflytop/digester/model/MdbDigestionSolution.java @@ -10,6 +10,9 @@ import java.util.ArrayList; import java.util.List; public class MdbDigestionSolution extends UfActiveRecord { @UfActiveRecordField + public String oreCatName; + + @UfActiveRecordField public String name; @UfActiveRecordField diff --git a/web b/web index 53712a5..e2b8752 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 53712a58ceb4f19c7dba9204587134b88d86e3e5 +Subproject commit e2b87526304961b2bac163b58e372fd54ebffdb3