diff --git a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java index 97c8eba..2c0d744 100644 --- a/src/main/java/com/dreamworks/boditech/controller/DeviceController.java +++ b/src/main/java/com/dreamworks/boditech/controller/DeviceController.java @@ -61,6 +61,12 @@ public class DeviceController extends BaseController { @PostMapping("/api/device/load") public ApiResponse load() { if ( !this.deviceEnable ) { // @TODO: 测试完成后删除 +// this.deviceService.device.testCards.appendByBoxCode(0, "1||CAGGB66U||2024.03.26||1279||06"); +// this.deviceService.device.testCards.appendByBoxCode(1, "2||CAGGB66U||2024.03.26||1279||06"); +// this.deviceService.device.testCards.appendByBoxCode(2, "3||CAGGB66U||2024.03.26||1279||06"); +// this.deviceService.device.testCards.appendByBoxCode(3, "4||CAGGB66U||2024.03.26||1279||06"); +// this.deviceService.device.testCards.appendByBoxCode(4, "5||CAGGB66U||2024.03.26||1279||06"); +// this.deviceService.device.testCards.appendByBoxCode(5, "6||CAGGB66U||2024.03.26||1279||06"); return this.success(); } diff --git a/src/main/java/com/dreamworks/boditech/controller/IdChipController.java b/src/main/java/com/dreamworks/boditech/controller/IdChipController.java index 885c997..908493f 100644 --- a/src/main/java/com/dreamworks/boditech/controller/IdChipController.java +++ b/src/main/java/com/dreamworks/boditech/controller/IdChipController.java @@ -18,6 +18,7 @@ public class IdChipController extends BaseController { List> list = new ArrayList<>(); for ( int i=0; i<10; i++ ) { Map item = new HashMap<>(); + item.put("id",1); item.put("item","NT-proBNP"); item.put("lotCode", "123456"); item.put("expireDate","2012-12-15"); diff --git a/src/main/java/com/dreamworks/boditech/controller/TestController.java b/src/main/java/com/dreamworks/boditech/controller/TestController.java index 9237479..7640677 100644 --- a/src/main/java/com/dreamworks/boditech/controller/TestController.java +++ b/src/main/java/com/dreamworks/boditech/controller/TestController.java @@ -37,23 +37,71 @@ public class TestController extends BaseController { @ResponseBody @PostMapping("/api/test/emergency-append") - public ApiResponse testEmergencyAppend( @RequestBody ParamTestEmergencyAppend param) { + public ApiResponse testEmergencyAppend( @RequestBody Object param) { // this.deviceService.testEmergencyAppend(param); return this.success(); } @ResponseBody - @PostMapping("/api/test/regular-append") + @PostMapping("/api/test/test-tube-rack-append") public ApiResponse testRegularAppend(@RequestBody ParamTestRegularAppend param ) { // this.deviceService.regularTaskAppend(param); return this.success(); } @ResponseBody + @PostMapping("/api/test/test-tube-rack-list") + public ApiResponse testTubeRackList( @RequestBody Map params ) { + List> list = new ArrayList<>(); + for ( int i=0; i<2; i++ ) { + Map item = new HashMap<>(); + item.put("tubeIndex", Integer.toString(i)); + item.put("tubeType", "WB"); + item.put("sampleType", "FB"); + item.put("projectIds", new int[]{1,2,3,4,5}); + item.put("barCode", "123456"); + item.put("sampleUid", "123"); + item.put("appendBy", "manual"); + item.put("status", "WAITING"); + item.put("locked", false); + item.put("editable", true); + list.add(item); + } + + return this.success(); + } + + @ResponseBody + @PostMapping("/api/test/test-tube-rack-update") + public ApiResponse testTubeRackUpdate( @RequestBody Map params ) { + return this.success(); + } + + @ResponseBody + @PostMapping("/api/test/test-tube-rack-lock") + public ApiResponse testTubeRackLock() { + return this.success(); + } + + @ResponseBody + @PostMapping("/api/test/test-tube-rack-unlock") + public ApiResponse testTubeRackUnlock() { + return this.success(); + } + + @ResponseBody @PostMapping("/api/test/search") public ApiResponse search( @RequestBody Map params ) { List> list = new ArrayList<>(); for (int i = 0; i < 20; i++) { + List> results = new ArrayList<>(); + for (int j = 0; j < 2; j++) { + Map result = new HashMap<>(); + result.put("name", "sth01"); + result.put("value", "123.45mg/L"); + results.add(result); + } + Map item = new HashMap<>(); item.put("recordUUID", "202110-01"); item.put("samplePID", "ABCD1234"); @@ -67,6 +115,7 @@ public class TestController extends BaseController { item.put("incubateTime", "3600"); item.put("status", "INUSE"); item.put("slotIndex", Integer.toString(i)); + item.put("results", results); list.add(item); } diff --git a/src/main/java/com/dreamworks/boditech/service/ProjectService.java b/src/main/java/com/dreamworks/boditech/service/ProjectService.java index 1c7cf72..8799215 100644 --- a/src/main/java/com/dreamworks/boditech/service/ProjectService.java +++ b/src/main/java/com/dreamworks/boditech/service/ProjectService.java @@ -24,6 +24,12 @@ public class ProjectService { // active project public Project activeProjectByCodeNum(Integer codeNum) { + for ( Project project : this.projects ) { + if ( project.codeNum.equals(codeNum) ) { + return project; + } + } + Project project = this.findByCodeNum(codeNum); if ( project == null ) { throw new RuntimeException("PROJECT_CODE_NOT_AVAILABLE"); @@ -35,6 +41,11 @@ public class ProjectService { return project; } + // find by code number + public Project findByCodeNum(Integer codeNum) { + return projectMapper.findByCodeNum(codeNum); + } + @@ -52,10 +63,7 @@ public class ProjectService { return projectMapper.findById(id); } - // find by code number - public Project findByCodeNum(Integer codeNum) { - return projectMapper.findByCodeNum(codeNum); - } + // find by name public Project findByName(String name) {