mlx

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/consumer/ProjectConsumer.java

@@ -190,6 +190,7 @@ public class ProjectConsumer {
         //1 读取 kafka 的 project 信息
         ProjectMessageDTO projectMessageDTO = JsonUtil.jsonToBean(projectJson, ProjectMessageDTO.class);
         String projectId = projectMessageDTO.getProjectId();    // 项目 id
+        String projectType = projectMessageDTO.getType();    // 项目 id
         String packageId = projectMessageDTO.getScenePackageId();   // 场景测试包 id
         Long maxSimulationTime = projectMessageDTO.getMaxSimulationTime(); // 最大仿真时间，即生成视频的时间长度
         String vehicleConfigId = projectMessageDTO.getVehicleConfigId();// 模型配置 id
@@ -215,6 +216,7 @@ public class ProjectConsumer {
         projectService.transferAndRunYaml(
                 jobTemplate + "job-template.yaml",
                 projectId,
+                projectType,
                 algorithmDockerImage,
                 scenePOList.size(),
                 parallelism,

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

@@ -340,7 +340,7 @@ public class ProjectService {
      * @param jobTemplateYamlPathTarget 执行文件
      */
     @SneakyThrows
-    public void transferAndRunYaml(String jobTemplateYamlPathSource, String projectId, String algorithmDockerImage, long completions, long parallelism, String jobTemplateYamlPathTarget) {
+    public void transferAndRunYaml(String jobTemplateYamlPathSource, String projectId, String projectType, String algorithmDockerImage, long completions, long parallelism, String jobTemplateYamlPathTarget) {
         log.info("ProjectConsumer--transferYaml 项目 " + projectId + " 的完成度为：" + completions);
         log.info("ProjectConsumer--transferYaml 项目 " + projectId + " 的并行度为：" + parallelism);
         String yamlSource = FileUtil.read(jobTemplateYamlPathSource);
@@ -354,6 +354,13 @@ public class ProjectService {
         String replace6 = replace5.replace("parallelism-number", parallelism + "");
         String replace7 = replace6.replace("apiVers1on", "apiVersion");
         String replace8 = replace7.replace("1atch/v1", "batch/v1");
+        String finalYaml;
+        if(DictConstants.PROJECT_TYPE_MANUAL.equals(projectType)){
+            finalYaml = replace8;
+        }else if (DictConstants.PROJECT_TYPE_AUTO_SUB.equals(projectType)){
+            //1 获取 git 仓库地址
+            
+        }
         log.info("ProjectConsumer--parseManualProject 开始执行 yaml 文件" + replace8);
         FileUtil.writeStringToLocalFile(replace8, jobTemplateYamlPathTarget);
         //  启动