标准化测试

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/api/controller/TaskController.java

@@ -17,19 +17,17 @@ public class TaskController {
 
     @Resource
     private TaskService taskService;
-
-    // -------------------------------- Comment --------------------------------
+    //* -------------------------------- Comment --------------------------------
 
     /**
-     * 修改任务状态
+     * 任务执行前调用该接口，确定该任务没有被终止
      */
-    @GetMapping("/state")
-    public void state(@RequestParam("taskId") String taskId, @RequestParam("state") String state, @RequestParam("podName") String podName) {
-        taskService.state(taskId, state, podName);
+    @GetMapping("/confirm")
+    public Boolean confirm(@RequestParam("taskId") String taskId) {
+        return taskService.confirm(taskId);
     }
 
-    //* -------------------------------- Comment --------------------------------
-
+    // -------------------------------- Comment --------------------------------
 
     /**
      * Pod 的心跳接口
@@ -38,13 +36,14 @@ public class TaskController {
     public void tick(@RequestParam("taskId") String taskId) {
         taskService.tick(taskId);
     }
+    //* -------------------------------- Comment --------------------------------
 
     /**
-     * 任务执行前调用该接口，确定该任务没有被终止
+     * 修改任务状态
      */
-    @GetMapping("/confirm")
-    public Boolean confirm(@RequestParam("taskId") String taskId) {
-        return taskService.confirm(taskId);
+    @GetMapping("/state")
+    public void state(@RequestParam("taskId") String taskId, @RequestParam("state") String state, @RequestParam("podName") String podName) {
+        taskService.state(taskId, state, podName);
     }
 
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/application/service/TaskService.java

@@ -165,8 +165,8 @@ public class TaskService {
             }
         } catch (Exception e) {
             log.error("项目报错。", e);
-            final ProjectEntity project = projectDomainService.getProjectByProjectId(projectId);
-            projectService.stopProject(projectId, project.getProjectType(), e.getMessage());
+//            final ProjectEntity project = projectDomainService.getProjectByProjectId(projectId);
+//            projectService.stopProject(projectId, project.getProjectType(), e.getMessage());
             throw new RuntimeException(e);
         } finally {
             customRedisClient.unlock(lock1);

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/domain/service/TaskDomainService.java

@@ -315,9 +315,8 @@ public class TaskDomainService {
     }
 
     public Boolean taskConfirm(String taskId) {
-        // 查询 task 如果不是 pending 则不执行
         String state = taskMapper.selectStateById(taskId);
-        return DictConstants.TASK_PENDING.equals(state);
+        return !DictConstants.TASK_COMPLETED.equals(state);
     }
 
     public void taskTick(String taskId) {

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/infrastructure/persistence/mysql/mapper/AutoSubProjectMapper.java

@@ -24,7 +24,7 @@ public interface AutoSubProjectMapper {
     @Select("select sas.id,\n" +
             "       sap.scene,\n" +
             "       sas.create_user_id,\n" +
-            "       sas.parallelism,\n" +
+            "       sap.parallelism,\n" +
             "       sas.now_run_state,\n" +
             "       '2' project_type,\n" +
             "       sap.is_choice_gpu,\n" +