添加测试数据

src/main/java/com/dreamworks/boditech/controller/DeviceController.java

@@ -124,23 +124,12 @@ public class DeviceController extends BaseController {
         return this.success(Integer.valueOf("100"));
     }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
     @ResponseBody
-    @PostMapping("/api/device/status")
+    @PostMapping("/api/device/status-get")
     public ApiResponse status() {
-        return this.success(this.deviceService.status());
+        return this.success(Map.of(
+                "status", "WAIT_FOR_TUBE_RACK"
+        ));
     }
 
     @ResponseBody
@@ -201,20 +190,6 @@ public class DeviceController extends BaseController {
     }
 
     @ResponseBody
-    @PostMapping("/api/device/test-emergency-append")
-    public ApiResponse testEmergencyAppend( @RequestBody ParamTestEmergencyAppend param) {
-        this.deviceService.testEmergencyAppend(param);
-        return this.success();
-    }
-
-    @ResponseBody
-    @PostMapping("/api/device/test-regular-append")
-    public ApiResponse testRegularAppend(@RequestBody ParamTestRegularAppend param ) {
-        this.deviceService.regularTaskAppend(param);
-        return this.success();
-    }
-
-    @ResponseBody
     @PostMapping("/api/device/incubator-status-get")
     public ApiResponse incubatorStatusGet() {
         List<Map<String,Object>> slots = new ArrayList<>();
@@ -238,6 +213,7 @@ public class DeviceController extends BaseController {
         }
 
         return this.success(Map.of(
+            "temperature", 37,
             "slots", slots
         ));
     }
@@ -264,6 +240,7 @@ public class DeviceController extends BaseController {
         }
 
         return this.success(Map.of(
+                "type" , "AUTO",
             "tubes", tubes
         ));
     }

src/main/java/com/dreamworks/boditech/controller/IdChipController.java

@@ -0,0 +1,39 @@
+package com.dreamworks.boditech.controller;
+import com.dreamworks.boditech.controller.entity.ApiResponse;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Controller
+public class IdChipController extends BaseController {
+    @ResponseBody
+    @RequestMapping("/api/id-chip/search")
+    public ApiResponse search() {
+        List<Map<String,Object>> list = new ArrayList<>();
+        for ( int i=0; i<10; i++ ) {
+            Map<String,Object> item = new HashMap<>();
+            item.put("item","NT-proBNP");
+            item.put("lotCode", "123456");
+            item.put("expireDate","2012-12-15");
+            item.put("version", "5");
+            list.add(item);
+        }
+
+        return this.success(Map.of(
+                "totalCount", 100,
+                "list",list
+        ));
+    }
+
+    @ResponseBody
+    @RequestMapping("/api/id-chip/batch-delete")
+    public ApiResponse batchDelete() {
+        return this.success();
+    }
+}

src/main/java/com/dreamworks/boditech/controller/TestController.java

@@ -0,0 +1,78 @@
+package com.dreamworks.boditech.controller;
+import com.dreamworks.boditech.controller.entity.ApiResponse;
+import com.dreamworks.boditech.entity.ParamTestEmergencyAppend;
+import com.dreamworks.boditech.entity.ParamTestRegularAppend;
+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
+public class TestController extends BaseController {
+    @ResponseBody
+    @PostMapping("/api/test/list")
+    public ApiResponse list(@RequestBody Map<String,Object> params) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (int i = 0; i < 20; i++) {
+            Map<String,Object> item = new HashMap<>();
+            item.put("recordUUID", "202110-01");
+            item.put("samplePID", "ABCD1234");
+            item.put("sampleUID", "016");
+            item.put("projectName", "hsCRP");
+            item.put("lotCode", "1234567890");
+            item.put("tubeIndex", "05");
+            item.put("tubeType", "WB");
+            item.put("sampleType", "FB");
+            item.put("incubateStartedAt", "2012-12-15 00:00:44");
+            item.put("incubateTime", "3600");
+            item.put("status", "INUSE");
+            item.put("slotIndex", Integer.toString(i));
+            list.add(item);
+        }
+        return this.success(list);
+    }
+
+    @ResponseBody
+    @PostMapping("/api/test/emergency-append")
+    public ApiResponse testEmergencyAppend( @RequestBody ParamTestEmergencyAppend param) {
+        // this.deviceService.testEmergencyAppend(param);
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/test/regular-append")
+    public ApiResponse testRegularAppend(@RequestBody ParamTestRegularAppend param ) {
+        // this.deviceService.regularTaskAppend(param);
+        return this.success();
+    }
+
+    @ResponseBody
+    @PostMapping("/api/test/search")
+    public ApiResponse search( @RequestBody Map<String,Object> params ) {
+        List<Map<String,Object>> list = new ArrayList<>();
+        for (int i = 0; i < 20; i++) {
+            Map<String,Object> item = new HashMap<>();
+            item.put("recordUUID", "202110-01");
+            item.put("samplePID", "ABCD1234");
+            item.put("sampleUID", "016");
+            item.put("projectName", "hsCRP");
+            item.put("lotCode", "1234567890");
+            item.put("tubeIndex", "05");
+            item.put("tubeType", "WB");
+            item.put("sampleType", "FB");
+            item.put("incubateStartedAt", "2012-12-15 00:00:44");
+            item.put("incubateTime", "3600");
+            item.put("status", "INUSE");
+            item.put("slotIndex", Integer.toString(i));
+            list.add(item);
+        }
+
+        return this.success(Map.of(
+                "totalCount", "100",
+                "list", list
+        ));
+    }
+}

src/main/java/com/dreamworks/boditech/driver/consumable/CsmTestCardManager.java

@@ -14,9 +14,18 @@ public class CsmTestCardManager {
     // constructor
     public CsmTestCardManager(Device device) {
         this.device = device;
+
+        String[] colors = new String[]{"red", "green", "blue", "yellow", "purple", "orange"};
+
         for ( int i=0; i<6; i++ ) {
             CsmTestCardBox box = new CsmTestCardBox();
             box.index = i;
+
+            // @TODO : demo 数据
+            box.projectName = "demo" + i;
+            box.projectId = 1;
+            box.projectColor = colors[i];
+
             this.testCardBoxes.add(box);
         }
     }

src/main/java/com/dreamworks/boditech/entity/ParamTestEmergencyAppend.java

@@ -1,13 +1,9 @@
 package com.dreamworks.boditech.entity;
 public class ParamTestEmergencyAppend {
-    // sample tube barcode
-    public String barcode;
-    // user id
-    public String patientId;
-    // project name
-    public String projectName;
-    // blood type
-    public String bloodType;
-    // position
     public String position;
+    public String barcode;
+    public String sampleUid;
+    public String sampleType;
+    public Integer projectId;
+    public String processType;
 }

src/main/java/com/dreamworks/boditech/entity/ParamTestRegularAppend.java

@@ -1,6 +1,7 @@
 package com.dreamworks.boditech.entity;
 import java.util.List;
 public class ParamTestRegularAppend {
+    public String id;
     // tasks
-    public List<ParamTestRegularAppendTask> tasks;
+    public List<ParamTestRegularAppendTask> tubes;
 }

src/main/java/com/dreamworks/boditech/entity/ParamTestRegularAppendTask.java

@@ -6,11 +6,11 @@ public class ParamTestRegularAppendTask {
     // tube type
     public String tubeType;
     // project name
-    public List<String> projectNames;
+    public List<Integer> projectIds;
     // blood type
-    public String bloodType;
+    public String sampleType;
     // bar code
     public String barCode;
     // user id
-    public String patientCode;
+    public String sampleUid;
 }

src/main/java/com/dreamworks/boditech/service/DeviceService.java

@@ -129,9 +129,9 @@ public class DeviceService {
     public void testEmergencyAppend(ParamTestEmergencyAppend param) {
         TaskTestEmergency task = new TaskTestEmergency();
         task.barcode = param.barcode;
-        task.patientId = param.patientId;
-        task.projectName = param.projectName;
-        task.bloodType = param.bloodType;
+//        task.patientId = param.patientId;
+//        task.projectName = param.projectName;
+//        task.bloodType = param.bloodType;
         task.position = param.position;
         this.taskAppend(task);
     }
@@ -140,14 +140,14 @@ public class DeviceService {
     public void regularTaskAppend(ParamTestRegularAppend param) {
         TaskBatchTubePrepare task = new TaskBatchTubePrepare();
         task.tests = new ArrayList<>();
-        for (ParamTestRegularAppendTask taskItem : param.tasks) {
+        for (ParamTestRegularAppendTask taskItem : param.tubes) {
             TaskBatchTubeTestInfo test = new TaskBatchTubeTestInfo();
-            test.tubeIndex = taskItem.tubeIndex;
-            test.patientCode = taskItem.patientCode;
-            test.barcode = taskItem.barCode;
-            test.testTube = taskItem.tubeType;
-            test.projectNames = taskItem.projectNames;
-            test.blood = taskItem.bloodType;
+//            test.tubeIndex = taskItem.tubeIndex;
+//            test.patientCode = taskItem.patientCode;
+//            test.barcode = taskItem.barCode;
+//            test.testTube = taskItem.tubeType;
+//            test.projectNames = taskItem.projectNames;
+//            test.blood = taskItem.bloodType;
             task.tests.add(test);
         }
         this.taskAppend(task);