mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/TaskMapper.java

@@ -68,7 +68,7 @@ public interface TaskMapper {
             "         left join simulation_manual_project smp on smpt.p_id = smp.id\n" +
             "where smpt.is_deleted = '0'\n" +
             "  and smp.is_deleted = '0'\n" +
-            "  and smpt.run_state in ('Running', 'Analysis', 'Analysing')")
+            "  and smpt.run_state in ('Running')")
     List<TaskPO> selectExecuting();
 
     @Select("select id\n" +

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/scheduler/TickScheduler.java

@@ -34,7 +34,7 @@ public class TickScheduler {
         if (CollectionUtil.isEmpty(executingTaskList)) {
             return;
         }
-        log.info("------- TickScheduler 查询出所有执行中的任务（'Running', 'Analysis', 'Analysing'）:" + executingTaskList);
+        log.info("------- TickScheduler 查询出所有执行中的任务（'Running'）:" + executingTaskList);
         //2 根据 key 查出任务的心跳时间
         executingTaskList.forEach(task -> {
             String taskId = task.getId();

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

@@ -258,7 +258,7 @@ public class TaskService {
         // 调用 server 的接口，计算评价等级
         String tokenUrl = tokenUri + "?grant_type=client_credentials"
                 + "&client_id=" + clientId
-                + "client_secret" + clientSecret;
+                + "&client_secret=" + clientSecret;
         log.info("------- /state 获取仿真云平台 token：" + tokenUrl);
         String response = HttpUtil.get(closeableHttpClient, requestConfig, tokenUrl);
         ObjectMapper objectMapper = new ObjectMapper();
@@ -269,6 +269,7 @@ public class TaskService {
         headers.put("Authorization", "Bearer " + accessToken);
         log.info("------- /state 访问仿真云平台评价等级接口：" + accessToken);
         HttpUtil.post(closeableHttpClient, requestConfig, evaluationLevelUri, headers, null);
+        log.info("------- /state 项目 " + projectId + " 打分完成");
 
 
     }