tijiao

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

@@ -1116,7 +1116,7 @@ public class ProjectApplicationService {
                 String taskId = StringUtil.getRandomUUID();
                 String mapId = kafkaParam.getMapId();
                 String sceneId = kafkaParam.getId();
-                String minioUploadPath = projectId + "/" + taskId + "/";
+                String minioUploadPath = "multiResult/" + projectId + "/" + taskId + "/";
                 SimulationMapVO simulationMapVO = mapMapper.selectMapByMapId(mapId);
                 if (Objects.isNull(simulationMapVO)){
                     throw new RuntimeException("地图" + mapId + "不存在");
@@ -1172,10 +1172,6 @@ public class ProjectApplicationService {
                         String carId = sceneCar.getCarId();
                         //1 根据车辆配置id vehicleConfigId, 获取 模型信息和传感器信息
                         com.css.simulation.resource.scheduler.infra.entity.VehicleEntity vehicleEntity = vehicleMapper.selectByVehicleConfigId(carId);   // 车辆
-                        // TODO 上线之前删掉
-//                        com.css.simulation.resource.scheduler.infra.entity.VehicleEntity vehicleEntity = com.css.simulation.resource.scheduler.infra.entity.VehicleEntity.builder()
-//                            .modelLabel("AudiA6_10").maxSpeed(new BigDecimal("67")).enginePower(new BigDecimal("150000"))
-//                            .build();
                         List<CameraEntity> cameraEntityList = sensorCameraMapper.selectCameraByVehicleConfigId(carId);    // 摄像头
                         List<OgtEntity> ogtEntityList = sensorOgtMapper.selectOgtByVehicleId(carId); // 完美传感器
                         vehicle = VehicleEntity.builder().model(ModelEntity.builder().model_label(vehicleEntity.getModelLabel()).build())

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

@@ -291,6 +291,9 @@ public class TaskApplicationService {
                     String simulationMp4Url = null;
                     for (String str : list) {
                         String split = str.substring(str.lastIndexOf("/") + 1);
+                        if (StringUtils.contains(split, "xml") || StringUtils.contains(split, "xodr") || StringUtils.contains(split, "osgb")){
+                            continue;
+                        }
                         if (StringUtils.contains(split, ".mp4")) {
                             if (StringUtils.contains(split, "_custom_camera")){
 //                                allMp4Url = split;
@@ -383,13 +386,15 @@ public class TaskApplicationService {
                 multiSimulationProjectParam.setProjectStatus(MultiSimulationStatusEnum.COMPLETED_STATUS.getProjectStatus());
                 multiSimulationProjectMapper.updateMultiSimulationProjectStatus(multiSimulationProjectParam);
                 // 删除kafka topic
+                // todo 暂时不删除
                 KafkaUtil.deleteTopic(kafkaAdminClient, projectId);
                 //6 删除项目 pod 启动文件
                 FileUtil.deleteFileBySubstring(multiPodYamlDirectory, projectId);
                 //7 删除项目临时文件
                 FileUtil.rm(linuxTempPath + "multiProject/" + projectId + "/");
                 // 删除minio临时文件
-                MinioUtil.rmR(minioClient, bucketName, projectResultPathOfMinio + projectId + "/");
+                // 暂时不删除minio文件，用来排查问题
+//                MinioUtil.rmR(minioClient, bucketName, projectResultPathOfMinio + projectId + "/");
                 // 删除算法key
                 // 删除yaml路径redis
                 // 删除记录podNamekey

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

@@ -275,6 +275,7 @@ public class ProjectDomainService {
 
         log.info("保存项目projectId:" + projectId + "sceneId:" + messageEntity.getInfo().getScene_id() + "的 yaml 文件：" + yamlPath);
         FileUtil.writeStringToLocalFile(podString, yamlPath);
+        FileUtil.writeStringToLocalFile(podString, multiPodYamlDirectory + "bak/" + podYaml);
         // 保存 yaml 地址
         String yamlRedisKey = "multi_project:" + projectId+":scene:" + messageEntity.getInfo().getScene_id() + ":node:" + nodeName + ":yaml:" + podName;
         stringRedisTemplate.opsForValue().set(yamlRedisKey, yamlPath);