Merge remote-tracking branch 'origin/master'

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

@@ -242,8 +242,8 @@ public class StandardsRegulationsService {
                                     if (StringUtil.isEmpty(sceneName)
                                             || StringUtil.isEmpty(regulationType)
                                             || StringUtil.isEmpty(standardType)
-                                            || StringUtil.isEmpty(osgb)
-                                            || StringUtil.isEmpty(xodr)
+                                          /*  || StringUtil.isEmpty(osgb)
+                                            || StringUtil.isEmpty(xodr)*/
                                     ) {
                                         sceneImportPO.setStatus(DictConstants.SCENE_IMPORT_STATUS_2);
                                         sceneImportPO.setErrorMessage("文件" + adress + " 与标准法规场景类型不匹配，解析失败。");

simulation-resource-server/src/main/resources/bootstrap-dev.yaml

@@ -9,3 +9,17 @@ spring:
         server-addr: 10.12.10.70:8848
         namespace: 3698bfc2-a612-487a-b2a2-aaad16cd9d9d
         file-extension: yaml
+  kafka:
+    bootstrap-servers: 10.12.10.70:9092
+    listener:
+      missing-topics-fatal: false
+    producer:
+      retries: 3
+      acks: 1
+      batch-size: 16384
+      buffer-memory: 33554432
+      key-serializer: org.apache.kafka.common.serialization.StringSerializer
+      value-serializer: org.apache.kafka.common.serialization.StringSerializer
+      properties:
+        linger:
+          ms: 0

simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -344,13 +344,15 @@ public class VideoService {
         log.info("VideoService--vehicleById 车辆类型为：" + car);
     */
       String car=vehicleInfo.getModelLabel();
-       String carPath=dictMapper.getCarPath(car);
+       /*String carPath=dictMapper.getCarPath(car);
         if(null!=carPath&&!carPath.equals("")){
             po.setVehicleCategory(car);
             po.setModel3d(carPath);
         }else{
             po.setVehicleCategory("car");
-        }
+        }*/
+        po.setVehicleCategory(car);
+        po.setModel3d(vehicleInfo.getVehicleTopView());
         //车前距
         BigDecimal frontDistance = vehicleInfo.getFrontDistance();
         //车后距