|
@@ -189,7 +189,8 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
|
|
Integer projectStatus = projectVO.getProjectStatus();
|
|
Integer projectStatus = projectVO.getProjectStatus();
|
|
Integer status = param.getProjectStatus();
|
|
Integer status = param.getProjectStatus();
|
|
int res = 0;
|
|
int res = 0;
|
|
- if (projectStatus == MultiSimulationStatusEnum.INIT_STATUS.getProjectStatus() || projectStatus == MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus()){
|
|
|
|
|
|
+ if (projectStatus == MultiSimulationStatusEnum.INIT_STATUS.getProjectStatus() || projectStatus == MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus() ||
|
|
|
|
+ projectStatus == MultiSimulationStatusEnum.COMPLETED_STATUS.getProjectStatus()){
|
|
if (status != MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus()){
|
|
if (status != MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus()){
|
|
return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前任务状态不允许执行此操作");
|
|
return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前任务状态不允许执行此操作");
|
|
}
|
|
}
|
|
@@ -220,8 +221,6 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
|
|
MultiSimulationProjectKafkaParam multiSimulationProjectKafkaParam = buildSendKafkaParam(projectId, projectVO.getProjectMaxSeconds(), simulationMageGroupId);
|
|
MultiSimulationProjectKafkaParam multiSimulationProjectKafkaParam = buildSendKafkaParam(projectId, projectVO.getProjectMaxSeconds(), simulationMageGroupId);
|
|
projectRunToKafka(multiSimulationProjectKafkaParam);
|
|
projectRunToKafka(multiSimulationProjectKafkaParam);
|
|
res = multiSimulationProjectMapper.updateMultiSimulationProjectStatus(param);
|
|
res = multiSimulationProjectMapper.updateMultiSimulationProjectStatus(param);
|
|
- } else if (projectStatus == MultiSimulationStatusEnum.COMPLETED_STATUS.getProjectStatus()) {
|
|
|
|
- return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前状态已完成,不允许操作");
|
|
|
|
} else if (projectStatus == MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus()) {
|
|
} else if (projectStatus == MultiSimulationStatusEnum.RUN_STATUS.getProjectStatus()) {
|
|
if (status != MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus()){
|
|
if (status != MultiSimulationStatusEnum.TERMINATED_STATUS.getProjectStatus()){
|
|
return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前任务状态不允许执行此操作");
|
|
return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "当前任务状态不允许执行此操作");
|