Merge remote-tracking branch 'origin/20240309-saq-fix' into lcytest

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

@@ -1198,7 +1198,7 @@ public class ProjectApplicationService {
 
                 MultiTaskMessageEntity build = MultiTaskMessageEntity.builder().info(MultiInfoEntity.builder().project_id(projectId).task_id(taskId).scene_id(sceneId)
                         .default_time(Long.valueOf(projectStartMessageEntity.getDefaultTime()))
-                        .task_path(projectResultPathOfMinio + "multiResult/" + minioUploadPath).build())
+                        .task_path(projectResultPathOfMinio + minioUploadPath).build())
                     .scenario(ScenarioEntity.builder().scenario_osc(mapXmlPathOfMinio).scenario_odr(mapDriverPathOfMinio).scenario_osgb(mapOsgPathOfMinio).build())
                     .vehicle(vehicle)
                     .build();

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

@@ -295,7 +295,7 @@ public class TaskApplicationService {
                             continue;
                         }
                         if (StringUtils.contains(split, ".mp4")) {
-                            if (StringUtils.contains(split, "_custom_camera")){
+                            if (StringUtils.contains(split, "_custom_camera") || StringUtils.contains(split, "_overlook_camera")){
 //                                allMp4Url = split;
                                 allMp4Url = str;
                             }else {