|
|
@ -24,17 +24,10 @@ public class TestController extends BaseController { |
|
|
|
private ProjectService projectService; |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
@PostMapping("/api/test/test-tube-rack-save") |
|
|
|
public ApiResponse testTubeRackTaskSave(@RequestBody ParamTestTubeRackTaskSave param ) { |
|
|
|
MdbTestTubeRackTestTask task = this.testService.testTubeRackTaskSave(param); |
|
|
|
return this.success(task); |
|
|
|
} |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
@PostMapping("/api/test/test-tube-rack-list") |
|
|
|
public ApiResponse testTubeRackList() { |
|
|
|
List<Map<String,Object>> list = new ArrayList<>(); |
|
|
|
List<MdbTestTubeRackTestTask> racks = this.testService.testTubeRackTaskList(); |
|
|
|
List<MdbTestTubeRackTestTask> racks = this.testService.regularTaskEditableList(); |
|
|
|
for ( MdbTestTubeRackTestTask rack : racks ) { |
|
|
|
Map<String,Object> item = MyCommon.objectToMap(rack); |
|
|
|
|
|
|
@ -43,21 +36,7 @@ public class TestController extends BaseController { |
|
|
|
List<Map<String,Object>> tubeList = new ArrayList<>(); |
|
|
|
for ( MdbTestTubeRackTestTaskTube tube : tubes ) { |
|
|
|
Map<String,Object> tubeItem = MyCommon.objectToMap(tube); |
|
|
|
|
|
|
|
// attach projects to tube |
|
|
|
if ( tube.projectIds.isEmpty() ) { |
|
|
|
tube.projectIds = "[]"; |
|
|
|
} |
|
|
|
List<Integer> projectIds = MyCommon.jsonToObject(tube.projectIds, List.class); |
|
|
|
List<Map<String,Object>> projectList = new ArrayList<>(); |
|
|
|
for ( Integer projectId : projectIds ) { |
|
|
|
Project project = this.projectService.activeProjectGetById(projectId); |
|
|
|
Map<String,Object> projectItem = MyCommon.objectToMap(project); |
|
|
|
projectItem.remove("steps"); |
|
|
|
projectList.add(projectItem); |
|
|
|
} |
|
|
|
tubeItem.put("projects", projectList); |
|
|
|
tubeItem.put("projectIds", projectIds.isEmpty() ? new ArrayList<>() : projectIds); |
|
|
|
this.attachProjectsToMap(tubeItem, tube.projectIds); |
|
|
|
tubeList.add(tubeItem); |
|
|
|
} |
|
|
|
item.put("tubes", tubeList); |
|
|
@ -66,6 +45,34 @@ public class TestController extends BaseController { |
|
|
|
return this.success(list); |
|
|
|
} |
|
|
|
|
|
|
|
// attach projects to map |
|
|
|
private void attachProjectsToMap(Map<String,Object> map, String projectIdsJsonStr) { |
|
|
|
// attach projects to tube |
|
|
|
if ( projectIdsJsonStr.isEmpty() ) { |
|
|
|
projectIdsJsonStr = "[]"; |
|
|
|
} |
|
|
|
List<Integer> projectIds = MyCommon.jsonToObject(projectIdsJsonStr, List.class); |
|
|
|
if ( projectIds.isEmpty() ) { |
|
|
|
projectIds = new ArrayList<>(); |
|
|
|
} |
|
|
|
List<Map<String,Object>> projectList = new ArrayList<>(); |
|
|
|
for ( Integer projectId : projectIds ) { |
|
|
|
Project project = this.projectService.activeProjectGetById(projectId); |
|
|
|
Map<String,Object> projectItem = MyCommon.objectToMap(project); |
|
|
|
projectItem.remove("steps"); |
|
|
|
projectList.add(projectItem); |
|
|
|
} |
|
|
|
map.put("projects", projectList); |
|
|
|
map.put("projectIds", projectIds); |
|
|
|
} |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
@PostMapping("/api/test/test-tube-rack-save") |
|
|
|
public ApiResponse testTubeRackTaskSave(@RequestBody ParamTestTubeRackTaskSave param ) { |
|
|
|
MdbTestTubeRackTestTask task = this.testService.testTubeRackTaskSave(param); |
|
|
|
return this.success(task); |
|
|
|
} |
|
|
|
|
|
|
|
@ResponseBody |
|
|
|
@PostMapping("/api/test/test-tube-rack-delete") |
|
|
|
public ApiResponse testTubeRackBatchDelete( @RequestBody Map<String,Object> params ) { |
|
|
|