Browse Source

启动时关闭测试任务

tags/v0
sige 1 year ago
parent
commit
576bba7c48
  1. 14
      src/main/java/com/iflytop/a800/controller/TestController.java

14
src/main/java/com/iflytop/a800/controller/TestController.java

@ -1,4 +1,5 @@
package com.iflytop.a800.controller; package com.iflytop.a800.controller;
import com.fasterxml.jackson.databind.JsonNode;
import com.iflytop.a800.TaskManager; import com.iflytop.a800.TaskManager;
import com.iflytop.a800.model.*; import com.iflytop.a800.model.*;
import com.iflytop.a800.resource.TestTube; import com.iflytop.a800.resource.TestTube;
@ -14,6 +15,7 @@ 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
@ -175,6 +177,18 @@ public class TestController extends UfApiControllerBase {
var list = new ArrayList<Map<String, Object>>(); var list = new ArrayList<Map<String, Object>>();
for ( var test : tests ) { for ( var test : tests ) {
var item = test.toMap(); var item = test.toMap();
var resultMapList = new ArrayList<Map<String,String>>();
if ( null != test.result ) {
var resultJson = UfJsonHelper.jsonToNode(test.result);
for ( var resultItem : resultJson ) {
Map<String,String> resultMap = new HashMap<>();
resultMap.put("name", resultItem.get("name").asText());
resultMap.put("value", resultItem.get("value").asText());
resultMap.put("unit", resultItem.get("unit").asText());
resultMapList.add(resultMap);
}
}
item.put("result", resultMapList);
list.add(item); list.add(item);
} }
return this.success(list); return this.success(list);

Loading…
Cancel
Save