git

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/ProjectApplicationService.java

@@ -631,7 +631,7 @@ public class ProjectApplicationService {
         }
         log.info("项目" + projectId + "已经启动" + yamlList.size());
         for (MultiCreateYamlRet redisKey : yamlList) {
-            taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.RUN_STATUS.getProjectStatus(), redisKey.getTaskId(), 0);
+            taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndStart(MultiSimulationTaskStatusEnum.RUN_STATUS.getProjectStatus(), redisKey.getTaskId(), 0, System.currentTimeMillis());
         }
 //         保存每个机器的并行度
 //        projectDomainService.setMultiNodeMapUse(isChoiceGpu, multiNodeMapToUse);
@@ -1070,7 +1070,7 @@ public class ProjectApplicationService {
             for (MultiSimulationProjectTaskRecordPO po: recordPOList) {
                 Integer recordStatus = po.getStatus();
                 if (recordStatus == MultiSimulationTaskStatusEnum.RUN_STATUS.getProjectStatus()){
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.PERSON_CANCEL_STATUS.getProjectStatus(), po.getId(), 0);
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndEnd(MultiSimulationTaskStatusEnum.PERSON_CANCEL_STATUS.getProjectStatus(), po.getId(), 0, System.currentTimeMillis());
                     // 删除pod
                     String nodeNameKey = "multi-taskId:" + po.getId();
                     String value = stringRedisTemplate.opsForValue().get(nodeNameKey);
@@ -1087,7 +1087,7 @@ public class ProjectApplicationService {
 
                 } else if (recordStatus == MultiSimulationTaskStatusEnum.INIT_STATUS.getProjectStatus()) {
                     // 初始状态时
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.PERSON_CANCEL_STATUS.getProjectStatus(), po.getId(), 0);
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndEnd(MultiSimulationTaskStatusEnum.PERSON_CANCEL_STATUS.getProjectStatus(), po.getId(), 0, System.currentTimeMillis());
                 }else if (recordStatus == MultiSimulationTaskStatusEnum.NEED_ANALYSIS_STATUS.getProjectStatus() || recordStatus == MultiSimulationTaskStatusEnum.AUTO_TERMINATED_STATUS.getProjectStatus()) {
                     // 不作处理了
                 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/TaskApplicationService.java

@@ -276,7 +276,7 @@ public class TaskApplicationService {
                 stringRedisTemplate.delete(nodeNameKey);
                 // 执行完成待分析状态
                 if (DictConstants.TASK_ANALYSIS.equals(state)){
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.NEED_ANALYSIS_STATUS.getProjectStatus(), taskEntity.getId(), 0);
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndEnd(MultiSimulationTaskStatusEnum.NEED_ANALYSIS_STATUS.getProjectStatus(), taskEntity.getId(), 0, System.currentTimeMillis());
                     // 进行仿真评价
                     String taskBody = taskEntity.getTaskBody();
                     MultiTaskMessageEntity messageEntity = JSONObject.parseObject(taskBody, MultiTaskMessageEntity.class);
@@ -363,11 +363,11 @@ public class TaskApplicationService {
                     } else {
                         log.info("taskId:{}未找到csv文件", taskId);
                     }
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.COMPLETED_STATUS.getProjectStatus(), taskEntity.getId(), 0);
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndEnd(MultiSimulationTaskStatusEnum.COMPLETED_STATUS.getProjectStatus(), taskEntity.getId(), 0, System.currentTimeMillis());
                 } else if (DictConstants.TASK_ABORTED.equals(state)) {
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.AUTO_TERMINATED_STATUS.getProjectStatus(), taskEntity.getId(), 0);
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndEnd(MultiSimulationTaskStatusEnum.AUTO_TERMINATED_STATUS.getProjectStatus(), taskEntity.getId(), 0,System.currentTimeMillis());
                 } else if (DictConstants.TASK_TERMINATED.equals(state)) {
-                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatus(MultiSimulationTaskStatusEnum.TERMINATED_STATUS.getProjectStatus(), taskEntity.getId(), 0);
+                    taskRecordMapper.updateMultiSimulationProjectTaskRecordStatusAndEnd(MultiSimulationTaskStatusEnum.TERMINATED_STATUS.getProjectStatus(), taskEntity.getId(), 0, System.currentTimeMillis());
                 } else {
                     // 终止
                     log.info("未知的反馈状态类型projectId:{},taskId:{},state:{}", projectId, taskId, state);