mlx

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

@@ -21,9 +21,9 @@ import java.util.List;
 public class AlgorithmScheduler {
 
     @Resource
-    DockerConfiguration dockerConfiguration;
+   private DockerConfiguration dockerConfiguration;
     @Resource
-    AlgorithmMapper algorithmMapper;
+    private  AlgorithmMapper algorithmMapper;
 
 
     /**

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

@@ -26,7 +26,7 @@ public class ProjectScheduler {
     /**
      * 调度项目启动
      */
-    @Scheduled(fixedDelay = 60 * 1000)
+    @Scheduled(fixedDelay = 1000)
     public void dispatchProject() {
         List<String> projectMessageKeys = projectUtil.getWaitingProjectMessageKeys();
         if (!CollectionUtil.isEmpty(projectMessageKeys)) {

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

@@ -167,15 +167,12 @@ public class TaskManager {
     }
 
 
-    public void prepareScore(String projectRunningKey) {
-        stringRedisTemplate.delete(projectRunningKey);
-    }
-
     /**
      * @param userId 项目创建用户的 id
      */
     @SneakyThrows
-    public void score(String userId, String projectId, String projectType) {
+    public void score(String projectRunningKey,String userId, String projectId, String projectType) {
+        stringRedisTemplate.delete(projectRunningKey);
         // -------------------------------- 打分 --------------------------------
         ProjectEntity projectEntity = null;
         if (DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)) {

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

@@ -39,20 +39,16 @@ public class TaskService {
             String maxSimulationTime = projectEntity.getMaxSimulationTime();  // 项目类型
             String userId = taskEntity.getCreateUserId();   // 用户 id
             PrefixEntity redisPrefix = projectUtil.getRedisPrefixByUserIdAndProjectIdAndTaskId(userId, projectId, taskId);  // 项目前缀
-            log.info("判断项目 {} 是否已完成。", projectId);
             boolean projectCompleted = taskManager.isProjectCompleted(redisPrefix, projectId, projectType, maxSimulationTime, taskId, state, podName);
-            if (!projectCompleted) {
-                return;
+            if (projectCompleted) {
+                log.info("项目 {} 开始打分。", projectId);
+                taskManager.score(redisPrefix.getProjectRunningKey(), userId, projectId, projectType);
+                log.info("项目 {} 计算评价等级。", projectId);
+                taskManager.evaluationLevel(projectId);
+                log.info("项目 {} 开始释放资源。", projectId);
+                taskManager.done(redisPrefix, projectId, projectType);
+                log.info("项目 {} 运行结束。", projectId);
             }
-            log.info("项目 {} 准备打分。", projectId);
-            taskManager.prepareScore(redisPrefix.getProjectRunningKey());
-            log.info("项目 {} 开始打分。", projectId);
-            taskManager.score(userId, projectId, projectType);
-            log.info("项目 {} 计算评价等级。", projectId);
-            taskManager.evaluationLevel(projectId);
-            log.info("项目 {} 开始释放资源。", projectId);
-            taskManager.done(redisPrefix, projectId, projectType);
-            log.info("项目 {} 运行结束。", projectId);
         } finally {
             customRedisClient.unlock(lockName);
         }

simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -138,9 +138,9 @@ public class VideoService {
 //        FileUtil.rm(csv1PathOfLinux);
 //        FileUtil.rm(csv2PathOfLinux);
         } catch (Exception e) {
-            throw new RuntimeException("视频生成失败。");
+            throw new RuntimeException("视频生成失败。", e);
         } finally {
-            customRedisClient.decrement(cpuNodeParallelismKey, 1);
+            customRedisClient.increment(cpuNodeParallelismKey, 1);
             customRedisClient.unlock(lockName);
         }
     }
@@ -317,12 +317,12 @@ public class VideoService {
         } else if (projectType.equals("2")) {
             vehicle = simulationAutomaticProjectMapper.vehicleByZdId(projectId);
         }
-        log.info("vehicleById() 车辆配置 Id 为：" + vehicle);
+        log.info("车辆配置 Id 为：" + vehicle);
         String vehicleId = configMapper.getVehicleId(vehicle);
 
-        log.info("vehicleById() 车辆 Id 为：" + vehicleId);
+        log.info("车辆 Id 为：" + vehicleId);
         VehicleEntity vehicleInfo = vehicleMapper.getVehicleInfo(vehicleId);
-        log.info("vehicleById() 车辆信息为：" + vehicleInfo);
+        log.info("车辆信息为：" + vehicleInfo);
 
         //自车模型
     /*    String car = vehicleInfo.getVehicleType().substring(0, vehicleInfo.getVehicleType().indexOf(","));