项目终止删除消息体

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

@@ -284,7 +284,6 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         // 已经完成的项目再次运行
         if (DictConstants.PROJECT_COMPLETED.equals(po.getNowRunState())) {
-
             po.createPo(AuthUtil.getCurrentUserId());
             // 生成id
             createProjectId(po);
@@ -307,11 +306,11 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             simulationProjectMapper.updateDetailsById(projectId, infoJson);
             // Kafka推送消息
             projectRunToKafka(po);
-
         } else if (DictConstants.PROJECT_TERMINATED.equals(param.getNowRunState())) {   //项目终止，推送到kafka
             String projectId = param.getId();
             ApacheKafkaUtil.deleteTopic(kafkaAdminClient, projectId);
             projectStopToKafka(po);
+            simulationProjectMapper.updateProjectNowRunState(param);
         } else {    // 创建新的项目
             // 查询项目详情信息并保存
             String projectId = param.getId();
@@ -330,10 +329,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 //设置完成时间
                 param.setFinishTime(new Date());
             }
-            int i = simulationProjectMapper.updateProjectNowRunState(param);
-            if (i <= 0) {
-                return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
-            }
+            simulationProjectMapper.updateProjectNowRunState(param);
         }
 
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
@@ -432,18 +428,24 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
     @SneakyThrows
     public ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsById(SimulationManualProjectParam param) {
 
-        String detail = null;
+        ProjectDetailsVo projectDetailsVo = null;
         String evaluationLevel = null;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(param.getProjectType())) {   // 手动运行任务
             SimulationManualProjectPo po = simulationProjectMapper.selectProjectById(param);
-            detail = po.getDetails();
-            evaluationLevel = po.getEvaluationLevel();
+            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVo.class);
+            projectDetailsVo.setEvaluationLevel(po.getEvaluationLevel());
+            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);
-            detail = po.getDetails();
-            evaluationLevel = po.getEvaluationLevel();
+            projectDetailsVo = JsonUtil.jsonToBean(po.getDetails(), ProjectDetailsVo.class);
+            projectDetailsVo.setEvaluationLevel(po.getEvaluationLevel());
+            projectDetailsVo.setFinishTime(getRqStr(po.getFinishTime(), 1));
+            projectDetailsVo.setNowRunState(po.getNowRunState());
+            projectDetailsVo.setNowRunStateName(getDictName(DictConstants.PROJECT_RUN_STATE, po.getNowRunState()));
+
         }
-        ProjectDetailsVo projectDetailsVo = JsonUtil.jsonToBean(detail, ProjectDetailsVo.class);
         //获取测试得分列表
         List<AlgorithmScoreVo> firstTargetScore = getFirstTargetScore(param.getId());
         projectDetailsVo.setAlgorithmScoreList(firstTargetScore);
@@ -477,6 +479,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         projectDetailsVo.setResultScoreList(resultScoreList);
         projectDetailsVo.setStateList(projectRunStateNumVos);
         projectDetailsVo.setEvaluationLevel(getDictName(DictConstants.EVALUATION_LEVEL, evaluationLevel));
+
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, projectDetailsVo);
     }
 //    @Override