diff --git a/app.db b/app.db
index 1956d7b..b562b49 100644
Binary files a/app.db and b/app.db differ
diff --git a/pom.xml b/pom.xml
index bac5b3b..a12c09f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
com.iflytop
uf
- 0.0.38
+ 0.0.40
diff --git a/src/main/java/com/iflytop/a800/controller/DeviceController.java b/src/main/java/com/iflytop/a800/controller/DeviceController.java
index 9858a32..3970e8b 100644
--- a/src/main/java/com/iflytop/a800/controller/DeviceController.java
+++ b/src/main/java/com/iflytop/a800/controller/DeviceController.java
@@ -22,9 +22,9 @@ public class DeviceController extends UfApiControllerBase {
@PostMapping("/api/device/temperature-get")
@ResponseBody
public UfApiResponse temperatureGet() {
- String testCardWarehouseTempText = UfActuatorCmdExecutor.execute("TestCardWarehouse", "read_temperature");
- int testCardWarehouseTempInt = Integer.parseInt(testCardWarehouseTempText);
- Double testCardWarehouseTemp = (double) testCardWarehouseTempInt / 100.0;
+// String testCardWarehouseTempText = UfActuatorCmdExecutor.execute("TestCardWarehouse", "read_temperature");
+// int testCardWarehouseTempInt = Integer.parseInt(testCardWarehouseTempText);
+ Double testCardWarehouseTemp = 0.0; //(double) testCardWarehouseTempInt / 100.0;
return this.success(Map.of(
"testCardBoxCase", testCardWarehouseTemp
));
diff --git a/src/main/java/com/iflytop/a800/controller/TestController.java b/src/main/java/com/iflytop/a800/controller/TestController.java
index 1687c29..fe5ea86 100644
--- a/src/main/java/com/iflytop/a800/controller/TestController.java
+++ b/src/main/java/com/iflytop/a800/controller/TestController.java
@@ -1,9 +1,6 @@
package com.iflytop.a800.controller;
import com.iflytop.a800.TaskManager;
-import com.iflytop.a800.model.MdbEmergencyTestTask;
-import com.iflytop.a800.model.MdbProject;
-import com.iflytop.a800.model.MdbTubeRackTestTask;
-import com.iflytop.a800.model.MdbTubeRackTestTaskTube;
+import com.iflytop.a800.model.*;
import com.iflytop.a800.resource.TestTube;
import com.iflytop.a800.task.TubeRackTask;
import com.iflytop.a800.task.TubeTestTask;
@@ -16,9 +13,7 @@ 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.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Controller
@@ -149,4 +144,38 @@ public class TestController extends UfApiControllerBase {
task.save();
return this.success();
}
+
+ @PostMapping("/api/test/test-tube-rack-status-get")
+ @ResponseBody
+ public UfApiResponse tubeRackStatusGet() {
+ var statusProcessing = UfMdbDictItem.getValue("TUBE_RACK_TASK_STATUS", "PROCESSING");
+ var rack = UfActiveRecord.findOne(MdbTubeRackTestTask.class, Map.of("status", statusProcessing));
+ if ( null == rack ) {
+ return this.success(null);
+ }
+
+ var tubeList = new ArrayList