代码优化

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskManager.java

@@ -419,16 +419,16 @@ public class TaskManager {
 
 
     @SneakyThrows
-    public void done(PrefixTO redisPrefix, SshClient sshClient, ClientSession clientSession, String projectId,String projectType) {
+    public void done(PrefixTO redisPrefix, SshClient sshClient, ClientSession clientSession, String projectId, String projectType) {
 
         // 关闭 ssh 连接
         clientSession.close();
         sshClient.stop();
 
         // 更新项目状态为已完成
-        if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)){
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
             manualProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
-        }else if(DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)){
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
             autoSubProjectMapper.updateProjectState(projectId, DictConstants.PROJECT_COMPLETED, TimeUtil.getNowForMysql());
         }
 
@@ -452,12 +452,13 @@ public class TaskManager {
             projectUtil.addOneParallelismToNode(nodeName);
         }
 
-        // 删除 redis 中的键值对
-        Set<String> keys = stringRedisTemplate.keys(redisPrefix.getProjectRunningKey() + "*");
-        if (CollectionUtil.isNotEmpty(keys)) {
-            keys.forEach(key -> stringRedisTemplate.delete(key));
-        } else {
-            log.error("TaskService--taskState 前缀为 " + redisPrefix.getProjectRunningKey() + " 的 key 为空！");
+        // 删除 redis 中的 项目运行信息 键值对
+        RedisUtil.deleteByPrefix(stringRedisTemplate, redisPrefix.getProjectRunningKey());
+
+        if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {
+            log.info("TaskManager--done 手动运行项目 " + projectId + " 执行完成！");
+        } else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)) {
+            log.info("TaskManager--done 自动运行子项目 " + projectId + " 执行完成！");
         }
 
 

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

@@ -61,7 +61,7 @@ public class TaskService {
         taskManager.score(redisPrefix, userId, projectId, projectType, clientSession);
         //4 结束
         taskManager.done(redisPrefix, sshClient, clientSession, projectId, projectType);
-        log.info("TaskService--taskState 项目 " + projectId + " 执行完成！");
+
     }