wangzhiqiang 2 жил өмнө
parent
commit
99ab59c9a1

+ 31 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/mapper/VehicleMapper.java

@@ -1,5 +1,6 @@
 package com.css.simulation.resource.scheduler.mapper;
 
+import api.common.pojo.vo.model.VehicleVO;
 import com.css.simulation.resource.scheduler.pojo.po.VehiclePO;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.type.JdbcType;
@@ -53,4 +54,34 @@ public interface VehicleMapper {
             "    where mc.id = #{vehicleConfigId}\n" +
             ")")
     VehiclePO selectByVehicleConfigId(@Param("vehicleConfigId") String vehicleConfigId);
+
+    @Select("select id,\n" +
+            "       vehicle_code,\n" +
+            "       vehicle_name,\n" +
+            "       description,\n" +
+            "       vehicle_type,\n" +
+            "       model_label,\n" +
+            "       vehicle_front_view,\n" +
+            "       vehicle_top_view,\n" +
+            "       max_speed,\n" +
+            "       engine_power,\n" +
+            "       max_deceleration,\n" +
+            "       max_steering_angle,\n" +
+            "       mass,\n" +
+            "       front_surface_effective,\n" +
+            "       air_drag_coefficient,\n" +
+            "       rolling_resistance_coefficient,\n" +
+            "       wheel_diameter,\n" +
+            "       wheel_drive\n" +
+            "       overall_efficiency\n" +
+            "       front_distance\n" +
+            "       rear_distance\n" +
+            "       left_distance\n" +
+            "       right_distance\n" +
+            "       height_distance\n" +
+            "       wheelbase\n" +
+            "       share\n" +
+            "from model_vehicle\n" +
+            "where  id = #{vehicleId}\n")
+    VehicleVO getVehicleInfo(@Param("vehicleId") String vehicleId);
 }

+ 3 - 4
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/GenerateVideoService.java

@@ -62,10 +62,9 @@ public class GenerateVideoService {
         }else if (projectType.equals("2")){
             vehicle = simulationAutomaticProjectMapper.vehicleByZdId(id);
         }
-        vehicle=configMapper.getVehicleId(vehicle);
-        VehicleParam vo=new VehicleParam();
-        vo.setId(vehicle);
-        VehicleVO vehicleInfo = vehicleMapper.getVehicleInfo(vo);
+        String vehicleId=configMapper.getVehicleId(vehicle);
+
+        VehicleVO vehicleInfo = vehicleMapper.getVehicleInfo(vehicleId);
 
         //自车模型
         String car= vehicleInfo.getVehicleTypeStr().substring(0,vehicleInfo.getVehicleTypeStr().indexOf(","));