From 6519895b8730d2564919b4a89fe1e6d5b705c4be Mon Sep 17 00:00:00 2001
From: sige <sige@sige.com>
Date: Sat, 13 Apr 2024 10:22:45 +0800
Subject: [PATCH] ~

---
 app.db                                             | Bin 299008 -> 299008 bytes
 .../digester/controller/HeatSlotController.java    |  26 +++++++++++++++++++++
 .../digester/model/MdbDigestionSolution.java       |   3 +++
 web                                                |   2 +-
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app.db b/app.db
index 6a0fe3416876ec59f6e4387a5bd25e5aec4991af..ce753d55c20c1c9dcc7957038c150e2b397539f1 100644
GIT binary patch
delta 3891
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
O@sa0aL$8$HBmV)m=^Weu

delta 4540
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
alfpl%lD`Q5ta8Pn{TeEZLycd;mj3};nTiwu

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<String,Object> 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<String,Object> 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