1、联动查询节点、任务、算例2
This commit is contained in:
@@ -146,21 +146,21 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC
|
||||
}
|
||||
|
||||
@GetMapping(value = "statisticDisciplineConfidence")
|
||||
public SdmResponse statisticDisciplineConfidence(@RequestParam("poolName") String poolName)
|
||||
public SdmResponse statisticDisciplineConfidence(@RequestParam("poolName") String poolName,@RequestParam("nodeType") String nodeType)
|
||||
{
|
||||
return service.statisicDisciplineConfidence(poolName);
|
||||
return service.statisicDisciplineConfidence(poolName,nodeType);
|
||||
}
|
||||
|
||||
@GetMapping(value = "statisticDisciplineConfidenceTrend")
|
||||
public SdmResponse statisticDisciplineConfidenceTrend(@RequestParam("poolName") String poolName,@RequestParam("timeRange")String timeRange)
|
||||
public SdmResponse statisticDisciplineConfidenceTrend(@RequestParam("poolName") String poolName,@RequestParam("timeRange")String timeRange,@RequestParam("nodeType")String nodeType)
|
||||
{
|
||||
return service.staticDisciplineConfidenceTrend(poolName,timeRange);
|
||||
return service.staticDisciplineConfidenceTrend(poolName,timeRange,nodeType);
|
||||
}
|
||||
|
||||
@GetMapping(value = "statisticDisciplineDifficulty")
|
||||
public SdmResponse statisticDisciplineDifficulty(@RequestParam("poolName") String poolName)
|
||||
public SdmResponse statisticDisciplineDifficulty(@RequestParam("poolName") String poolName,@RequestParam("nodeType") String nodeType)
|
||||
{
|
||||
return service.statisicDisciplineDifficulty(poolName);
|
||||
return service.statisicDisciplineDifficulty(poolName,nodeType);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -62,10 +62,10 @@ public interface ISimulationTaskPoolService {
|
||||
|
||||
SdmResponse updateFlowTaskRelate(BindTaskAndFlowTemplateReq req);
|
||||
|
||||
SdmResponse statisicDisciplineConfidence(String poolName);
|
||||
SdmResponse statisicDisciplineConfidence(String poolName,String nodeType);
|
||||
|
||||
SdmResponse staticDisciplineConfidenceTrend(String poolName,String timeRange);
|
||||
SdmResponse staticDisciplineConfidenceTrend(String poolName,String timeRange,String nodeType);
|
||||
|
||||
SdmResponse statisicDisciplineDifficulty(String poolName);
|
||||
SdmResponse statisicDisciplineDifficulty(String poolName,String nodeType);
|
||||
|
||||
}
|
||||
|
||||
@@ -2340,10 +2340,10 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
* @param poolName
|
||||
* @return
|
||||
*/
|
||||
public SdmResponse statisicDisciplineConfidence(String poolName)
|
||||
public SdmResponse statisicDisciplineConfidence(String poolName,String nodeType)
|
||||
{
|
||||
SdmResponse response = SdmResponse.success();
|
||||
syncProjectTaskConfidence();
|
||||
syncProjectTaskConfidence(nodeType);
|
||||
List<String> disciplineNames = mapper.queryTaskPoolAllDiscipline(poolName);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
|
||||
String month = sdf.format(new Date());
|
||||
@@ -2379,10 +2379,10 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
* @param timeRange
|
||||
* @return
|
||||
*/
|
||||
public SdmResponse staticDisciplineConfidenceTrend(String poolName,String timeRange)
|
||||
public SdmResponse staticDisciplineConfidenceTrend(String poolName,String timeRange,String nodeType)
|
||||
{
|
||||
SdmResponse response = SdmResponse.success();
|
||||
syncProjectTaskConfidence();
|
||||
syncProjectTaskConfidence(nodeType);
|
||||
if(timeRange == null || timeRange.isEmpty())
|
||||
{
|
||||
response = SdmResponse.failed("时间范围为空");
|
||||
@@ -2419,10 +2419,10 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
* @param poolName
|
||||
* @return
|
||||
*/
|
||||
public SdmResponse statisicDisciplineDifficulty(String poolName)
|
||||
public SdmResponse statisicDisciplineDifficulty(String poolName,String nodeType)
|
||||
{
|
||||
SdmResponse response = SdmResponse.success();
|
||||
syncProjectTaskDifficulty();
|
||||
syncProjectTaskDifficulty(nodeType);
|
||||
List<String> disciplineNames = mapper.queryTaskPoolAllDiscipline(poolName);
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
|
||||
String month = sdf.format(new Date());
|
||||
@@ -2529,9 +2529,9 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
* 同步更新系统仿真任务置信度
|
||||
* @return
|
||||
*/
|
||||
private SdmResponse syncProjectTaskConfidence()
|
||||
private SdmResponse syncProjectTaskConfidence(String nodeType)
|
||||
{
|
||||
SdmResponse response = simulationTaskFeignClient.getTaskConfidenceStatistics();
|
||||
SdmResponse response = simulationTaskFeignClient.getTaskConfidenceStatistics(nodeType);
|
||||
if(response.isSuccess())
|
||||
{
|
||||
List<JSONObject> taskConfidences = (List<JSONObject>)response.getData();
|
||||
@@ -2544,9 +2544,9 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
|
||||
* 同步更新系统仿真任务难度系数
|
||||
* @return
|
||||
*/
|
||||
private SdmResponse syncProjectTaskDifficulty()
|
||||
private SdmResponse syncProjectTaskDifficulty(String nodeType)
|
||||
{
|
||||
SdmResponse response = simulationTaskFeignClient.getTaskDifficultStatistics();
|
||||
SdmResponse response = simulationTaskFeignClient.getTaskDifficultStatistics(nodeType);
|
||||
if(response.isSuccess())
|
||||
{
|
||||
List<JSONObject> taskDifficulty = (List<JSONObject>)response.getData();
|
||||
|
||||
Reference in New Issue
Block a user