Browse Source

接口补充

tags/v0
sige 1 year ago
parent
commit
ddb050ac15
  1. BIN
      app.db
  2. 2
      pom.xml
  3. 6
      src/main/java/com/iflytop/a800/controller/DeviceController.java
  4. 41
      src/main/java/com/iflytop/a800/controller/TestController.java

BIN
app.db

2
pom.xml

@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>com.iflytop</groupId> <groupId>com.iflytop</groupId>
<artifactId>uf</artifactId> <artifactId>uf</artifactId>
<version>0.0.38</version>
<version>0.0.40</version>
</dependency> </dependency>
</dependencies> </dependencies>

6
src/main/java/com/iflytop/a800/controller/DeviceController.java

@ -22,9 +22,9 @@ public class DeviceController extends UfApiControllerBase {
@PostMapping("/api/device/temperature-get") @PostMapping("/api/device/temperature-get")
@ResponseBody @ResponseBody
public UfApiResponse temperatureGet() { 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( return this.success(Map.of(
"testCardBoxCase", testCardWarehouseTemp "testCardBoxCase", testCardWarehouseTemp
)); ));

41
src/main/java/com/iflytop/a800/controller/TestController.java

@ -1,9 +1,6 @@
package com.iflytop.a800.controller; package com.iflytop.a800.controller;
import com.iflytop.a800.TaskManager; 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.resource.TestTube;
import com.iflytop.a800.task.TubeRackTask; import com.iflytop.a800.task.TubeRackTask;
import com.iflytop.a800.task.TubeTestTask; 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.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Controller @Controller
@ -149,4 +144,38 @@ public class TestController extends UfApiControllerBase {
task.save(); task.save();
return this.success(); 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<Map<String, Object>>();
var tubes = rack.getTubes();
for ( var tube : tubes ) {
var tubeItem = tube.toMap();
tubeItem.put("projects", tube.getProjects());
tubeList.add(tubeItem);
}
var result = rack.toMap();
result.put("tubes", tubeList);
return this.success(result);
}
@PostMapping("/api/test/active-batch-list")
@ResponseBody
public UfApiResponse activeBatchList() {
var tests = UfActiveRecord.find(MdbTest.class);
var list = new ArrayList<Map<String, Object>>();
for ( var test : tests ) {
var item = test.toMap();
list.add(item);
}
return this.success(list);
}
} }
Loading…
Cancel
Save