commit

simulation-resource-scene/src/main/java/com/css/simulation/resource/scene/service/SceneImportService.java

@@ -14,6 +14,7 @@ import io.minio.MinioClient;
 import io.minio.RemoveObjectArgs;
 import io.minio.UploadObjectArgs;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -22,6 +23,7 @@ import java.io.File;
 import java.util.Date;
 import java.util.List;
 
+@Slf4j
 @Service
 public class SceneImportService {
 
@@ -83,7 +85,7 @@ public class SceneImportService {
             List<String> ls = FileUtil.ls(dataDirectory);
             return ObjectUtil.isNotNull(ls);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
             return false;
         }
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneAccidentService.java

@@ -849,6 +849,7 @@ public class SceneAccidentService {
                                     sceneAccidentPO.setOsgbAddress(adress);
                                 } else if (adress.contains(".mp4")) {
                                     sceneAccidentPO.setVideoAddress(adress);
+                                    sceneAccidentPO.setVideoPreview(adress);
                                 }
                             }
                             if (isupdate.equals("0")) {

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneNaturalService.java

@@ -554,12 +554,12 @@ public class SceneNaturalService {
                 if (filePath.contains("/Scenarios")) {
                     MI.setObjectName(filePath);
                     List<String> listScene = fileDownService.listDeepOne(MI).getInfo();
-                    log.info("共需要上传 " + listScene.size() + " 个自然驾驶场景");
+                    log.info("共需要上传 {} 个自然驾驶场景", listScene.size());
                     String taskId = api.common.util.StringUtil.getRandomUUID();
                     SceneEvaluationComputeParam sceneComplexityEvaluationComputeParam = new SceneEvaluationComputeParam();
                     sceneComplexityEvaluationComputeParam.setSceneEvaluationComputeSubParam(new ArrayList<>());
                     HashSet<String> strings = new HashSet<>(listScene);
-                    log.info("去重之后还剩 " + strings.size() + " 个自然驾驶场景");
+                    log.info("去重之后还剩 {} 个自然驾驶场景", strings.size());
                     int addNumber = 0;
                     int updateNumber = 0;
                     Map<String, String> checkFileName = new HashMap<>();
@@ -671,9 +671,9 @@ public class SceneNaturalService {
                                     sceneNaturalPO.setXodrAddress(address);
                                 } else if (address.contains(".osgb")) {
                                     sceneNaturalPO.setOsgbAddress(address);
-                                } else if (address.contains("simulation.mp4")) {
-                                    sceneNaturalPO.setVideoAddress(address);
                                 } else if (address.contains(".mp4")) {
+                                    // 20241015 修改，发现没有两个视频，其实两个路径相同
+                                    sceneNaturalPO.setVideoAddress(address);
                                     sceneNaturalPO.setVideoPreview(address);
                                 }
                             }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneReferenceLibService.java

@@ -250,9 +250,8 @@ public class SceneReferenceLibService {
                                     sceneReferenceLibPO.setXodrAddress(address);
                                 } else if (address.contains(".osgb")) {
                                     sceneReferenceLibPO.setOsgbAddress(address);
-                                } else if (address.contains("simulation.mp4")) {
-                                    sceneReferenceLibPO.setVideoAddress(address);
                                 } else if (address.contains(".mp4")) {
+                                    sceneReferenceLibPO.setVideoAddress(address);
                                     sceneReferenceLibPO.setVideoPreview(address);
                                 }
                             }

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/service/SceneStandardsService.java

@@ -398,6 +398,7 @@ public class SceneStandardsService {
                                     standardsRegulationsPO.setOsgbAddress(address);
                                 } else if (address.contains(".mp4")) {
                                     standardsRegulationsPO.setVideoAddress(address);
+                                    standardsRegulationsPO.setVideoPreview(address);
                                 }
                             }
                             if (isupdate.equals("0")) {