|
@ -1,11 +1,13 @@ |
|
|
package com.iflytop.a800.controller; |
|
|
package com.iflytop.a800.controller; |
|
|
import com.fasterxml.jackson.databind.JsonNode; |
|
|
import com.fasterxml.jackson.databind.JsonNode; |
|
|
import com.iflytop.a800.TaskManager; |
|
|
import com.iflytop.a800.TaskManager; |
|
|
|
|
|
import com.iflytop.a800.device.Device; |
|
|
import com.iflytop.a800.model.*; |
|
|
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; |
|
|
import com.iflytop.uf.UfActiveRecord; |
|
|
import com.iflytop.uf.UfActiveRecord; |
|
|
|
|
|
import com.iflytop.uf.UfActiveRecordCriteria; |
|
|
import com.iflytop.uf.controller.UfApiControllerBase; |
|
|
import com.iflytop.uf.controller.UfApiControllerBase; |
|
|
import com.iflytop.uf.controller.UfApiResponse; |
|
|
import com.iflytop.uf.controller.UfApiResponse; |
|
|
import com.iflytop.uf.model.UfMdbDictItem; |
|
|
import com.iflytop.uf.model.UfMdbDictItem; |
|
@ -66,7 +68,10 @@ public class TestController extends UfApiControllerBase { |
|
|
@PostMapping("/api/test/test-tube-rack-list") |
|
|
@PostMapping("/api/test/test-tube-rack-list") |
|
|
@ResponseBody |
|
|
@ResponseBody |
|
|
public UfApiResponse testTubeRackList() { |
|
|
public UfApiResponse testTubeRackList() { |
|
|
var tasks = UfActiveRecord.find(MdbTubeRackTestTask.class); |
|
|
|
|
|
|
|
|
var criteria = new UfActiveRecordCriteria(); |
|
|
|
|
|
criteria.conditions = new HashMap<>(); |
|
|
|
|
|
criteria.conditions.put("status", List.of("CONFIGURING","WAITING","PROCESSING")); |
|
|
|
|
|
var tasks = UfActiveRecord.find(MdbTubeRackTestTask.class, criteria); |
|
|
|
|
|
|
|
|
var list = new ArrayList<Map<String, Object>>(); |
|
|
var list = new ArrayList<Map<String, Object>>(); |
|
|
for ( var task : tasks ) { |
|
|
for ( var task : tasks ) { |
|
@ -193,4 +198,26 @@ public class TestController extends UfApiControllerBase { |
|
|
} |
|
|
} |
|
|
return this.success(list); |
|
|
return this.success(list); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/api/test/search") |
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
public UfApiResponse search(@RequestBody Map<String, Object> params) { |
|
|
|
|
|
var criteria = new UfActiveRecordCriteria(); |
|
|
|
|
|
criteria.limit = (Integer)params.get("limit"); |
|
|
|
|
|
criteria.offset = (Integer)params.get("offset"); |
|
|
|
|
|
var list = UfActiveRecord.find(MdbTest.class, criteria); |
|
|
|
|
|
return this.success(Map.of("list", list)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/api/test/print") |
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
public UfApiResponse print(@RequestBody Map<String, Object> params) { |
|
|
|
|
|
var printer = Device.getInstance().printer; |
|
|
|
|
|
List<String> ids = (List<String>) params.get("ids"); |
|
|
|
|
|
for ( var id : ids ) { |
|
|
|
|
|
var test = UfActiveRecord.findOne(MdbTest.class, id); |
|
|
|
|
|
printer.printTest(test); |
|
|
|
|
|
} |
|
|
|
|
|
return this.success(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |