commit

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/configuration/feign/fallback/VideoFeignClientFallBack.java

@@ -6,7 +6,7 @@ import com.css.simulation.resource.scheduler.configuration.feign.VideoFeignClien
 
 public class VideoFeignClientFallBack implements VideoFeignClient {
     @Override
-    public ResponseBodyVO<String> generateVideo(String projectId, String projectType,String maxSimulationTime, String taskId) {
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
+    public ResponseBodyVO<String> generateVideo(String generateVideoKey, String nodeName, String projectId, String projectType, String maxSimulationTime, String taskId) {
+        return null;
     }
 }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/FileController.java → simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/controller/CpuNodeController.java

@@ -13,7 +13,7 @@ import javax.annotation.Resource;
 @RequestMapping("/file")
 @RestController
 @Slf4j
-public class FileController {
+public class CpuNodeController {
     @Resource
     private FileService fileService;
 

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/util/TaskUtil.java

@@ -142,15 +142,14 @@ public class TaskUtil {
                 taskMapper.updateFailStateWithStopTime(taskId, state, TimeUtil.getNowForMysql(), DictConstants.TASK_ERROR_REASON_3);
             } else if (DictConstants.TASK_ANALYSIS.equals(state)) { // 该状态只会获得一次
                 taskMapper.updateSuccessStateWithStopTime(taskId, state, TimeUtil.getNowForMysql());
-                // 查询项目是否使用 gpu 生成视频（0是1否）
+                // 查询项目是否使用 CPU 生成视频
                 String isChoiceGpu = projectUtil.getProjectByProjectId(projectId).getIsChoiceGpu();
-                if (DictConstants.VIDEO_GPU.equals(isChoiceGpu)) {
-                    log.info("项目 {} 使用 GPU 生成视频。", projectId);
-                } else if (DictConstants.VIDEO_CPU.equals(isChoiceGpu)) {
+                if (DictConstants.VIDEO_CPU.equals(isChoiceGpu)) {
                     log.info("项目 {} 使用 CPU 生成视频。", projectId);
                     String generateVideoKey = "task:" + taskId + ":generateVideo";
                     customRedisClient.set(generateVideoKey, "0");
                     videoFeignClient.generateVideo(generateVideoKey, nodeName, projectId, projectType, maxSimulationTime, taskId);
+                    log.info("任务 {} 的视频生成开始。", taskId);
                     while (true) {
                         TimeUnit.SECONDS.sleep(1);
                         final String generateVideoValue = customRedisClient.get(generateVideoKey);
@@ -158,8 +157,7 @@ public class TaskUtil {
                             break;
                         }
                     }
-                } else {
-                    throw new RuntimeException("未设置视频生成。");
+                    log.info("等待任务 {} 的视频生成结束。", taskId);
                 }
             }
             // -------------------------------- 判断项目是否结束 --------------------------------

simulation-resource-scheduler/src/main/resources/bootstrap-dev.yaml

@@ -6,7 +6,7 @@ server:
 #* -------------------------------- Comment --------------------------------
 constant:
   temporary-directory: "/mnt/disk001/simulation-cloud/simulation-resource-scheduler-8004/temp/"
-  upload-osgb-url: "http://simulation-resource-video/simulation/resource/video/uploadOsgb"
+  upload-osgb-url: "http://simulation-resource-video/simulation/resource/video/uploadToLocal"
 
 scheduler:
   simulation-cloud-ip: 10.14.85.241

simulation-resource-video/src/main/java/com/css/simulation/resource/video/configuration/constant/ConstantConfiguration.java

@@ -13,6 +13,4 @@ public class ConstantConfiguration {
     private String esminiCommand;
     private String xoscGenerateCommand;
     private String linuxTempDirectory;
-    private String[] esminiNodeList;
-
 }

simulation-resource-video/src/main/resources/bootstrap-dev.yaml

@@ -60,15 +60,12 @@ constant:
   xosc-generate-command: "python3 /mnt/disk001/simulation-cloud/simulation-resource-video-8007/python/simulation_my.py"
   video-test-command: "/root/disk1/simulation-cloud/esmini/code-examples-bin/image-capture /root/disk1/simulation-cloud/esmini/resources/xosc/lane_change_crest.xosc /root/disk1/simulation-cloud/esmini/test/screenshot"
   linux-temp-directory: "/mnt/disk001/simulation-cloud/simulation-resource-video-8007/temp/"
-  minio-project-result-directory: "/project/"
   esmini-osgb-directory: "/root/disk1/simulation-cloud/esmini/resources/models/"
-  esmini-node-list:
-    - "10.14.86.16"
-    - "10.14.86.20"
 
 minio:
   endpoint: http://10.14.85.242:9000/
   access-key: minioadmin
   secret-key: 1qaz2wsx!
   bucket-name: simulation-cloud
+  project-result-directory: "/project/"