修复流程模版及分析项库故障
This commit is contained in:
@@ -63,9 +63,9 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC
|
||||
|
||||
@GetMapping(value = "/getTaskPoolPerformance")
|
||||
@ResponseBody
|
||||
SdmResponse getSimulationTaskToolPerformance(@RequestParam String poolName)
|
||||
SdmResponse getSimulationTaskToolPerformance(@RequestParam String poolName,@RequestParam String version)
|
||||
{
|
||||
return service.getSimulationPoolPerformance(poolName);
|
||||
return service.getSimulationPoolPerformanceByVersion(poolName,version);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/getTaskPoolVersions")
|
||||
|
||||
@@ -31,6 +31,8 @@ public interface ISimulationTaskPoolService {
|
||||
|
||||
SdmResponse getSimulationPoolPerformance(String poolName);
|
||||
|
||||
SdmResponse getSimulationPoolPerformanceByVersion(String poolName,String version);
|
||||
|
||||
SdmResponse getSimulationPoolTasks(String poolName,String version);
|
||||
|
||||
SdmResponse<Map<String, TaskBaseInfo>> getSimulationTasksByPoolId(long poolId);
|
||||
|
||||
@@ -712,6 +712,77 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
* 遍历节点下所有的性能指标
|
||||
* @param node
|
||||
* @param performances
|
||||
*/
|
||||
private void traverseNodePerformance(JSONObject node,List<TaskPoolPerformance> performances)
|
||||
{
|
||||
JSONArray children = node.getJSONArray("children");
|
||||
if(children == null)
|
||||
return;
|
||||
for(int index=0; index<children.size(); index++)
|
||||
{
|
||||
JSONObject child = children.getJSONObject(index);
|
||||
String levelType = child.getString("levelType");
|
||||
if(levelType == null)
|
||||
continue;
|
||||
if(levelType.equals("node"))
|
||||
{
|
||||
traverseNodePerformance(child,performances);
|
||||
}
|
||||
else if(levelType.equals("task"))
|
||||
{
|
||||
ObjectMapper objectMapper = new ObjectMapper();
|
||||
TaskPoolItem taskPoolItem = objectMapper.convertValue(child,TaskPoolItem.class);
|
||||
JSONArray performancesArray = child.getJSONArray("children");
|
||||
if(performancesArray == null)
|
||||
continue;
|
||||
for(int i=0; i<performancesArray.size(); i++)
|
||||
{
|
||||
JSONObject performanceObject = performancesArray.getJSONObject(i);
|
||||
TaskPoolPerformance performance = objectMapper.convertValue(performanceObject,TaskPoolPerformance.class);
|
||||
performance.taskName = taskPoolItem.nodeName;
|
||||
performance.standard = taskPoolItem.standard;
|
||||
performance.pId = taskPoolItem.id;
|
||||
performance.pUuid = taskPoolItem.uuid;
|
||||
performances.add(performance);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询分析库版本中的所有指标
|
||||
* @param poolName
|
||||
* @param version
|
||||
* @return
|
||||
*/
|
||||
public SdmResponse getSimulationPoolPerformanceByVersion(String poolName,String version)
|
||||
{
|
||||
SdmResponse response = new SdmResponse();
|
||||
String poolContents = mapper.queryTaskPoolVersionContent(poolName,version);
|
||||
List<TaskPoolPerformance> performances = new ArrayList<>();
|
||||
try {
|
||||
JSONObject taskTreeObject = JSONObject.parseObject(poolContents);
|
||||
JSONArray nodeArray = taskTreeObject.getJSONArray("nodes");
|
||||
if(nodeArray != null)
|
||||
{
|
||||
for(int i = 0; i < nodeArray.size(); i++)
|
||||
{
|
||||
JSONObject nodeObject = nodeArray.getJSONObject(i);
|
||||
traverseNodePerformance(nodeObject,performances);
|
||||
}
|
||||
}
|
||||
|
||||
}catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
response.setData(performances);
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取分析库中所有指标
|
||||
* @param poolName
|
||||
@@ -1475,6 +1546,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
mapper.addTaskPoolBreif(currPoolBrief);
|
||||
poolVersion.poolId = currPoolBrief.id;
|
||||
TaskPoolTree poolTree = (TaskPoolTree) treeRespond.getData();
|
||||
poolTree.poolBrief = currPoolBrief;
|
||||
poolVersion.versionContents = JSONObject.toJSONString(poolTree);
|
||||
mapper.addTaskPoolVersion(poolVersion);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user