Browse Source

试管架测试数据更新

master
sige 2 years ago
parent
commit
3a892afab8
  1. 109
      src/main/java/com/dreamworks/boditech/controller/TestController.java
  2. 20
      src/main/java/com/dreamworks/boditech/driver/consumable/ConsumableBase.java
  3. 11
      src/main/java/com/dreamworks/boditech/driver/consumable/CsmTestCardBox.java
  4. 1
      src/main/java/com/dreamworks/boditech/driver/consumable/CsmTestCardManager.java
  5. 2
      src/main/java/com/dreamworks/boditech/driver/task/TaskLoad.java
  6. 2
      src/main/resources/application-dev.yml

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

@ -50,25 +50,112 @@ public class TestController extends BaseController {
}
@ResponseBody
@PostMapping("/api/test/test-tube-rack-batch-delete")
public ApiResponse testTubeRackBatchDelete( @RequestBody Map<String,Object> params ) {
return this.success();
}
@ResponseBody
@PostMapping("/api/test/test-tube-rack-save")
public ApiResponse testTubeRackSave( @RequestBody Map<String,Object> params ) {
return this.success(Map.of("id", 10));
}
@ResponseBody
@PostMapping("/api/test/test-tube-rack-list")
public ApiResponse testTubeRackList( @RequestBody Map<String,Object> params ) {
List<Map<String,Object>> list = new ArrayList<>();
for ( int i=0; i<2; i++ ) {
Map<String,Object> 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("id", 1);
item.put("status", "WAITING");
item.put("locked", false);
item.put("editable", true);
item.put("tubeTypeDetectType", "AUTO");
item.put("tubeType", "");
item.put("editable", false);
List<Map<String,Object>> tubes = new ArrayList<>();
for ( int i=0; i<10; i++ ) {
Map<String,Object> tube = new HashMap<>();
tube.put("tubeIndex", Integer.toString(i));
tube.put("projectDetectType", "MANUAL");
List<Map<String,Object>> projects = new ArrayList<>();
for ( int pi=0; pi<3; pi++ ) {
Map<String,Object> project = new HashMap<>();
project.put("id", Integer.toString(i));
project.put("name", "hsCRP");
project.put("color", "red");
projects.add(project);
}
tube.put("projects", projects);
tube.put("sampleTypeDetectType", "MANUAL");
tube.put("sampleUid", "016");
tube.put("sampleType","FB");
tube.put("barCode", "123456789");
tube.put("preprocess", Map.of("preprocess",true));
tubes.add(tube);
}
item.put("tubes", tubes);
list.add(item);
Map<String,Object> item2 = new HashMap<>();
item2.put("id", 2);
item2.put("status", "WAITING");
item2.put("tubeTypeDetectType", "AUTO");
item2.put("tubeType", "");
item2.put("editable", false);
List<Map<String,Object>> tubes2 = new ArrayList<>();
for ( int i=0; i<10; i++ ) {
Map<String,Object> tube = new HashMap<>();
tube.put("tubeIndex", Integer.toString(i));
tube.put("projectDetectType", "MANUAL");
List<Map<String,Object>> projects = new ArrayList<>();
for ( int pi=0; pi<1; pi++ ) {
Map<String,Object> project = new HashMap<>();
project.put("id", Integer.toString(i));
project.put("name", "hsCRP");
project.put("color", "red");
projects.add(project);
}
tube.put("projects", projects);
tube.put("sampleTypeDetectType", "MANUAL");
tube.put("sampleUid", "016");
tube.put("sampleType","FB");
tube.put("barCode", "123456789");
tube.put("preprocess", Map.of("preprocess",true));
tubes2.add(tube);
}
item2.put("tubes", tubes);
list.add(item2);
return this.success();
Map<String,Object> item3 = new HashMap<>();
item3.put("id", 3);
item3.put("status", "WAITING");
item3.put("tubeTypeDetectType", "AUTO");
item3.put("tubeType", "");
item3.put("editable", true);
List<Map<String,Object>> tubes3 = new ArrayList<>();
for ( int i=0; i<10; i++ ) {
Map<String,Object> tube = new HashMap<>();
tube.put("tubeIndex", Integer.toString(i));
tube.put("projectDetectType", "MANUAL");
List<Map<String,Object>> projects = new ArrayList<>();
for ( int pi=0; pi<1; pi++ ) {
Map<String,Object> project = new HashMap<>();
project.put("id", Integer.toString(i));
project.put("name", "hsCRP");
project.put("color", "red");
projects.add(project);
}
tube.put("projects", projects);
tube.put("sampleTypeDetectType", "MANUAL");
tube.put("sampleUid", "016");
tube.put("sampleType","FB");
tube.put("barCode", "123456789");
tube.put("preprocess", Map.of("preprocess",true));
tubes3.add(tube);
}
item3.put("tubes", tubes);
list.add(item3);
return this.success(list);
}
@ResponseBody

20
src/main/java/com/dreamworks/boditech/driver/consumable/ConsumableBase.java

@ -1,2 +1,20 @@
package com.dreamworks.boditech.driver.consumable;public class ConsumableBase {
package com.dreamworks.boditech.driver.consumable;
import com.dreamworks.boditech.entity.Project;
public class ConsumableBase {
// project
private Project project;
// set project
public void setProject(Project project) {
this.project = project;
}
// get project id
public Integer getProjectId() {
return this.project.id;
}
// public Integer projectId;
// public String projectName;
// public String projectColor="red";
}

11
src/main/java/com/dreamworks/boditech/driver/consumable/CsmTestCardBox.java

@ -12,15 +12,4 @@ public class CsmTestCardBox {
public String lotCode;
public Integer cardAmount = 0;
// status of test card box : OK
public static final String STATUS_OK = "OK";
/**
* status of test card box :
* <li>- OK
* <li>- NOT_EXIST
* <li>- QR_CODE_INVALID
* <li>- ID_CHIP_INFO_NOT_FOUND
*/
public String status = "NOT_EXIST";
}

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

@ -72,7 +72,6 @@ public class CsmTestCardManager {
box.projectName = project.name;
box.projectColor = project.color;
box.cardAmount = 25;
box.status = CsmTestCardBox.STATUS_OK;
box.isLoaded = true;
}

2
src/main/java/com/dreamworks/boditech/driver/task/TaskLoad.java

@ -18,9 +18,11 @@ public class TaskLoad extends TaskBase {
this.bufferTubeLoad(executor);
this.largeBufferTubeLoad(executor);
} finally {
if ( device.enable ) {
this.armXY.reset();
}
}
}
// load test card
private void testCardLoad(Executor executor) {

2
src/main/resources/application-dev.yml

@ -7,7 +7,7 @@ spring:
app:
device:
enable : true
enable : false
debug : true
connectionType : SerialPort # SerialPort, WebSocket
path : COM3

Loading…
Cancel
Save