Browse Source

优化项目启动前文件复制

LingxinMeng 11 months ago
parent
commit
bebef2631b

+ 3 - 9
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/app/service/ProjectApplicationService.java

@@ -312,30 +312,24 @@ public class ProjectApplicationService {
                             String xoscName = splitXosc[splitXosc.length - 1];
                             String[] xoscNameSplit = xoscName.split("\\.");
                             String xoscSuffix = xoscNameSplit[xoscNameSplit.length - 1];
-                            String xoscPathOfLinux = linuxTempPath + "video/" + projectId + "/" + taskId + "/" + xoscName;
                             String xoscPathOfMinio = projectResultPathOfMinio + projectId + "/" + taskId + "/" + taskId + "." + xoscSuffix;
-                            MinioUtil.downloadToFile(minioClient, bucketName, scenarioOsc, xoscPathOfLinux);
-                            MinioUtil.uploadFromFile(minioClient, xoscPathOfLinux, bucketName, xoscPathOfMinio);
+                            MinioUtil.copyFile(minioClient, bucketName, scenarioOsc, xoscPathOfMinio);
 
                             String scenarioOdr = sceneEntity.getScenarioOdr();
                             String[] splitXodr = scenarioOdr.split("/");
                             String xodrName = splitXodr[splitXodr.length - 1];
                             String[] xodrNameSplit = xodrName.split("\\.");
                             String xodrSuffix = xodrNameSplit[xodrNameSplit.length - 1];
-                            String xodrPathOfLinux = linuxTempPath + "video/" + projectId + "/" + taskId + "/" + xodrName;
                             String xodrPathOfMinio = projectResultPathOfMinio + projectId + "/" + taskId + "/" + taskId + "." + xodrSuffix;
-                            MinioUtil.downloadToFile(minioClient, bucketName, scenarioOdr, xodrPathOfLinux);
-                            MinioUtil.uploadFromFile(minioClient, xodrPathOfLinux, bucketName, xodrPathOfMinio);
+                            MinioUtil.copyFile(minioClient, bucketName, scenarioOdr, xodrPathOfMinio);
 
                             String scenarioOsgb = sceneEntity.getScenarioOsgb();
                             String[] splitOsgb = scenarioOsgb.split("/");
                             String osgbName = splitOsgb[splitOsgb.length - 1];
                             String[] osgbNameSplit = osgbName.split("\\.");
                             String osgbSuffix = osgbNameSplit[osgbNameSplit.length - 1];
-                            String osgbPathOfLinux = linuxTempPath + "video/" + projectId + "/" + taskId + "/" + osgbName;
                             String osgbPathOfMinio = projectResultPathOfMinio + projectId + "/" + taskId + "/" + taskId + "." + osgbSuffix;
-                            MinioUtil.downloadToFile(minioClient, bucketName, scenarioOsgb, osgbPathOfLinux);
-                            MinioUtil.uploadFromFile(minioClient, osgbPathOfLinux, bucketName, osgbPathOfMinio);
+                            MinioUtil.copyFile(minioClient, bucketName, scenarioOsgb, osgbPathOfMinio);
                             log.info("已经将 xosc、xodr、osgb 上传到 minio 的结果文件目录:" + projectResultPathOfMinio);
 
                             // 组装 task 消息