项目详情任务饼图

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/impl/SimulationProjectServiceImpl.java

@@ -402,45 +402,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             throw new RuntimeException("未知项目类型：" + projectType);
         }
         projectDetailsVO = JsonUtil.jsonToBean(details, ProjectDetailsVO.class);
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectDetailsVO);
-    }
-
-    /**
-     * 查询项目详情，不使用详情字段中的某些字段，例如项目运行状态，并查询任务列表
-     */
-    @Override
-    @SneakyThrows
-    public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(SimulationManualProjectParam param) {
-
-        ProjectDetailsVO projectDetailsVo = null;
-        if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
-            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
-            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
-            projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
-            projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
-            projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
-            projectDetailsVo.setNowRunState(po.getNowRunState());
-            projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
-        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(param.getProjectType())) {
-            SimulationManualProjectVO po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
-            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
-            projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
-            projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
-            projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
-            projectDetailsVo.setNowRunState(po.getNowRunState());
-            projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
 
-        }
-        // 获取测试得分列表
-        List<AlgorithmScoreVO> firstTargetScore = getFirstTargetScore(param.getId());
-        projectDetailsVo.setAlgorithmScoreList(firstTargetScore);
-        // 任务运行状态统计
+        //* -------------------------------- 任务 --------------------------------
         List<ProjectRunStateNumVo> states = null;
-
-        // 任务运行结果统计
         List<ProjectRunResultRatioNumVo> resultScoreList = null;
-
-        // 任务信息
         ProjectTaskParam projectTaskParam = new ProjectTaskParam();
         projectTaskParam.setPId(param.getId());
         List<ProjectRunResultRatioNumVo> projectRunResultRatioNumVos = null;
@@ -460,8 +425,8 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             }
             taskScore(resultScoreList, size);
         }
-        projectDetailsVo.setResultList(projectRunResultRatioNumVos);
-        projectDetailsVo.setResultScoreList(resultScoreList);
+        projectDetailsVO.setResultList(projectRunResultRatioNumVos);
+        projectDetailsVO.setResultScoreList(resultScoreList);
         // 汉化
         if (CollectionUtil.isNotEmpty(states)) {
             states.forEach(state -> {
@@ -491,8 +456,39 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 }
             });
         }
-        projectDetailsVo.setStateList(states);
+        projectDetailsVO.setStateList(states);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectDetailsVO);
+    }
+
+    /**
+     * 查询项目详情，不使用详情字段中的某些字段，例如项目运行状态，并查询任务列表
+     */
+    @Override
+    @SneakyThrows
+    public ResponseBodyVO<ProjectDetailsVO> selectProjectDetailsByIdForScheduler(SimulationManualProjectParam param) {
+
+        ProjectDetailsVO projectDetailsVo = null;
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) { // 手动运行任务
+            SimulationManualProjectPO po = simulationProjectMapper.selectProjectById(param);
+            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
+            projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
+            projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
+            projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
+            projectDetailsVo.setNowRunState(po.getNowRunState());
+            projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(param.getProjectType())) {
+            SimulationManualProjectVO po = simulationAutomaticSubProjectMapper.selectProjectInfo(param);
+            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVO.class);
+            projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, po.getEvaluationLevel()));
+            projectDetailsVo.setStartTime(getRqStr(po.getStartTime(), 1));
+            projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
+            projectDetailsVo.setNowRunState(po.getNowRunState());
+            projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
 
+        }
+        // 获取测试得分列表
+        List<AlgorithmScoreVO> firstTargetScore = getFirstTargetScore(param.getId());
+        projectDetailsVo.setAlgorithmScoreList(firstTargetScore);
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectDetailsVo);
     }