|
@ -1,9 +1,6 @@ |
|
|
package com.iflytop.a800.controller; |
|
|
package com.iflytop.a800.controller; |
|
|
import com.iflytop.a800.TaskManager; |
|
|
import com.iflytop.a800.TaskManager; |
|
|
import com.iflytop.a800.model.MdbEmergencyTestTask; |
|
|
|
|
|
import com.iflytop.a800.model.MdbProject; |
|
|
|
|
|
import com.iflytop.a800.model.MdbTubeRackTestTask; |
|
|
|
|
|
import com.iflytop.a800.model.MdbTubeRackTestTaskTube; |
|
|
|
|
|
|
|
|
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; |
|
@ -16,9 +13,7 @@ import org.springframework.stereotype.Controller; |
|
|
import org.springframework.web.bind.annotation.PostMapping; |
|
|
import org.springframework.web.bind.annotation.PostMapping; |
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
import org.springframework.web.bind.annotation.RequestBody; |
|
|
import org.springframework.web.bind.annotation.ResponseBody; |
|
|
import org.springframework.web.bind.annotation.ResponseBody; |
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
import java.util.ArrayList; |
|
|
import java.util.HashMap; |
|
|
|
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
@Controller |
|
|
@Controller |
|
@ -149,4 +144,38 @@ public class TestController extends UfApiControllerBase { |
|
|
task.save(); |
|
|
task.save(); |
|
|
return this.success(); |
|
|
return this.success(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/api/test/test-tube-rack-status-get") |
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
public UfApiResponse tubeRackStatusGet() { |
|
|
|
|
|
var statusProcessing = UfMdbDictItem.getValue("TUBE_RACK_TASK_STATUS", "PROCESSING"); |
|
|
|
|
|
var rack = UfActiveRecord.findOne(MdbTubeRackTestTask.class, Map.of("status", statusProcessing)); |
|
|
|
|
|
if ( null == rack ) { |
|
|
|
|
|
return this.success(null); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var tubeList = new ArrayList<Map<String, Object>>(); |
|
|
|
|
|
var tubes = rack.getTubes(); |
|
|
|
|
|
for ( var tube : tubes ) { |
|
|
|
|
|
var tubeItem = tube.toMap(); |
|
|
|
|
|
tubeItem.put("projects", tube.getProjects()); |
|
|
|
|
|
tubeList.add(tubeItem); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var result = rack.toMap(); |
|
|
|
|
|
result.put("tubes", tubeList); |
|
|
|
|
|
return this.success(result); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("/api/test/active-batch-list") |
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
public UfApiResponse activeBatchList() { |
|
|
|
|
|
var tests = UfActiveRecord.find(MdbTest.class); |
|
|
|
|
|
var list = new ArrayList<Map<String, Object>>(); |
|
|
|
|
|
for ( var test : tests ) { |
|
|
|
|
|
var item = test.toMap(); |
|
|
|
|
|
list.add(item); |
|
|
|
|
|
} |
|
|
|
|
|
return this.success(list); |
|
|
|
|
|
} |
|
|
} |
|
|
} |