Merge remote-tracking branch 'origin/master'

api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -14,6 +14,7 @@ public class DictConstants {
     public static final String MODEL_LABEL = "modelLabel";//车辆模型
     public static final String VEHICLE_TYPE = "vehicleType";//车辆类型
     public static final String DRIVE_TYPE = "driveType";//驱动方式
+    public static final String FRAME_RATE = "frameRate";//帧率
     public static final String COORDINATE = "coordinate";//坐标系
     public static final String TARGET_FILTER = "targetFilter";//目标物筛选
     public static final String REGULATION_TYPE = "regulationType"; // 法规类型

api-common/src/main/java/api/common/pojo/param/algorithm/AlgorithmParameter.java

@@ -13,7 +13,7 @@ public class AlgorithmParameter extends PageParameter {
     //算法名称
     private String algorithmName;
 
-    //算法名称
+    //算法ID
     private String algorithmCode;
 
     //算法描述

api-common/src/main/java/api/common/pojo/po/model/VehiclePO.java

@@ -22,8 +22,10 @@ public class VehiclePO extends CommonPO {
     private String vehicleModel;
     //车辆颜色
     private String vehicleColour;
-    //车辆图片
-    private String vehicleImage;
+    //车辆前视图
+    private String vehicleFrontView;
+    //车辆俯视图
+    private String vehicleTopView;
     //最大速度（千米/小时）
     private BigDecimal maxSpeed;
     //发动机功率（千瓦）

api-common/src/main/java/api/common/pojo/vo/model/ConfigVO.java

@@ -23,7 +23,7 @@ public class ConfigVO {
     //车辆描述
     private String vehicleDescription;
     //车辆图片
-    private String vehicleImage;
+    private String vehicleTopView;
     //是否分享
     private String share;
 

api-common/src/main/java/api/common/pojo/vo/model/VehicleDefaultValueVO.java

@@ -0,0 +1,50 @@
+package api.common.pojo.vo.model;
+
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class VehicleDefaultValueVO {
+
+    //车辆前视图
+    private String vehicleFrontView;
+    //车辆俯视图
+    private String vehicleTopView;
+    //最大速度（千米/小时）
+    private BigDecimal maxSpeed;
+    //发动机功率（千瓦）
+    private BigDecimal enginePower;
+    //最大减速度（米/秒2）
+    private BigDecimal maxDeceleration;
+    //最大转角（度）
+    private BigDecimal maxSteeringAngle;
+    //质量（千克）
+    private BigDecimal mass;
+    //前表面有效面积（平方米）
+    private BigDecimal frontSurfaceEffective;
+    //空气阻力系数
+    private BigDecimal airDragCoefficient;
+    //滚动阻力系数
+    private BigDecimal rollingResistanceCoefficient;
+    //车轮直径（米）
+    private BigDecimal wheelDiameter;
+    //驱动方式
+    private String wheelDrive;
+    //总效率
+    private BigDecimal overallEfficiency;
+    //车前距（米）
+    private BigDecimal frontDistance;
+    //车后距（米）
+    private BigDecimal rearDistance;
+    //车左距（米）
+    private BigDecimal leftDistance;
+    //车右距（米）
+    private BigDecimal rightDistance;
+    //车高（米）
+    private BigDecimal heightDistance;
+    //轴距（米）
+    private BigDecimal wheelbase;
+
+}

api-common/src/main/java/api/common/pojo/vo/model/VehicleTempVO.java

@@ -0,0 +1,66 @@
+package api.common.pojo.vo.model;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class VehicleTempVO {
+
+    //主键id
+    private String id;
+    //车辆编码
+    private String vehicleCode;
+    //车辆名称
+    private String vehicleName;
+    //车辆描述
+    private String description;
+    //车辆类型（字典代码）
+    private String vehicleType;
+    //车辆型号
+    private String vehicleModel;
+    //车辆颜色
+    private String vehicleColour;
+    //车辆前视图
+    private String vehicleFrontView;
+    //车辆俯视图
+    private String vehicleTopView;
+    //最大速度（千米/小时）
+    private BigDecimal maxSpeed;
+    //发动机功率（千瓦）
+    private BigDecimal enginePower;
+    //最大减速度（米/秒2）
+    private BigDecimal maxDeceleration;
+    //最大转角（度）
+    private BigDecimal maxSteeringAngle;
+    //质量（千克）
+    private BigDecimal mass;
+    //前表面有效面积（平方米）
+    private BigDecimal frontSurfaceEffective;
+    //空气阻力系数
+    private BigDecimal airDragCoefficient;
+    //滚动阻力系数
+    private BigDecimal rollingResistanceCoefficient;
+    //车轮直径（米）
+    private BigDecimal wheelDiameter;
+    //驱动方式
+    private String wheelDrive;
+    //总效率
+    private BigDecimal overallEfficiency;
+    //车前距（米）
+    private BigDecimal frontDistance;
+    //车后距（米）
+    private BigDecimal rearDistance;
+    //车左距（米）
+    private BigDecimal leftDistance;
+    //车右距（米）
+    private BigDecimal rightDistance;
+    //车高（米）
+    private BigDecimal heightDistance;
+    //轴距（米）
+    private BigDecimal wheelbase;
+    //是否启用
+    private String valid;
+    //序号
+    private int sort;
+}

api-common/src/main/java/api/common/pojo/vo/model/VehicleVO.java

@@ -24,8 +24,10 @@ public class VehicleVO {
     private String vehicleModel;
     //车辆颜色
     private String vehicleColour;
-    //车辆图片
-    private String vehicleImage;
+    //车辆前视图
+    private String vehicleFrontView;
+    //车辆俯视图
+    private String vehicleTopView;
     //最大速度（千米/小时）
     private BigDecimal maxSpeed;
     //发动机功率（千瓦）

api-common/src/main/java/api/common/pojo/vo/project/ProjectDetailsVo.java

@@ -49,7 +49,7 @@ public class ProjectDetailsVo {
     private String vehicleDescribe;
 
     //车辆图片地址
-    private String vehicleImage;
+    private String vehicleTopView;
 
     //摄像头
     private List<SensorBaseInfoVo> sensorCameraList;

api-common/src/main/java/api/common/pojo/vo/project/ProjectReportVo.java

@@ -48,7 +48,7 @@ public class ProjectReportVo {
 
     private List<Map> sceneScoreLiTitle;
 
-    private List<SublistScoreVo> sceneScoreLi;
+    private List<SceneScListVo> sceneScoreLi;
 
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/ctrl/VehicleTempCtrl.java

@@ -0,0 +1,27 @@
+package com.css.simulation.resource.model.ctrl;
+
+import api.common.pojo.common.ResponseBodyVO;
+import com.css.simulation.resource.model.service.VehicleTempService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("/vehicleTemp")
+public class VehicleTempCtrl {
+
+    @Autowired
+    VehicleTempService vehicleTempService;
+
+    /**
+     * 获取车辆模型下拉
+     */
+    @RequestMapping("/getVehicleTempTree")
+    @ResponseBody
+    public ResponseBodyVO getVehicleList(){
+        ResponseBodyVO response = new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
+        response.setInfo(vehicleTempService.getVehicleTempTree());
+        return response;
+    }
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/model/mapper/VehicleTempMapper.java

@@ -0,0 +1,14 @@
+package com.css.simulation.resource.model.mapper;
+
+import api.common.pojo.vo.model.VehicleTempVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface VehicleTempMapper {
+
+    List<VehicleTempVO> getVehicleTempTree();
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/ConfigService.java

@@ -50,8 +50,6 @@ public class ConfigService {
 
     public ConfigVO getConfigInfo(ConfigVO configVO) {
         configVO = configMapper.getConfigInfo(configVO);
-        String vehicleImage = configVO.getVehicleImage();
-        configVO.setVehicleImage(vehicleImage.replaceFirst("Front side","Top"));
         List<ConfigSensorVO> sensorList = configMapper.getConfigSensors(configVO);
         Map<String, List<ConfigSensorVO>> configSensors = sensorList.stream().collect(Collectors.groupingBy(ConfigSensorVO::getSensorType));
         configVO.setConfigSensors(configSensors);

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/VehicleService.java

@@ -34,12 +34,6 @@ public class VehicleService {
         vehicleParam.setCreateUserId(AuthUtil.getCurrentUserId());
         vehicleParam.setShare(DictConstants.NO);
         List<VehicleVO> list = vehicleMapper.getVehicleList(vehicleParam);
-        list.stream().forEach(vo->{
-            String vehicleImage = vo.getVehicleImage();
-            if(ObjectUtil.isNotNull(vehicleImage)){
-                vo.setVehicleImage(vehicleImage.replaceFirst("Front side","Top"));
-            }
-        });
         return list;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/VehicleTempService.java

@@ -0,0 +1,52 @@
+package com.css.simulation.resource.model.service;
+
+import api.common.pojo.vo.model.VehicleDefaultValueVO;
+import api.common.pojo.vo.model.VehicleTempVO;
+import api.common.util.ObjectUtil;
+import com.css.simulation.resource.model.mapper.VehicleTempMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class VehicleTempService {
+
+
+    @Autowired
+    VehicleTempMapper vehicleTempMapper;
+
+    public Object getVehicleTempTree() {
+        List<VehicleTempVO> list = vehicleTempMapper.getVehicleTempTree();
+        List<Map> treeList = new ArrayList<>();
+        Map<String, List<VehicleTempVO>> typeCollect = list.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleType,LinkedHashMap::new, Collectors.toList()));
+        typeCollect.forEach((typeKey,typeValue)->{
+            Map typeMap = new HashMap();
+            typeMap.put("code",typeKey);
+            typeMap.put("name",typeValue.get(0).getVehicleName());
+            List<Object> modelList = new LinkedList();
+            Map<String, List<VehicleTempVO>> modelCollect = typeValue.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleModel,LinkedHashMap::new, Collectors.toList()));
+            modelCollect.forEach((modelKey,modelValue)->{
+                Map modelMap = new HashMap();
+                modelMap.put("code",modelKey);
+                modelMap.put("name",modelKey);
+                List<Object> colourList = new LinkedList();
+                modelValue.forEach(vo->{
+                    Map colourMap = new HashMap();
+                    colourMap.put("code",vo.getVehicleColour());
+                    colourMap.put("name",vo.getVehicleColour());
+                    VehicleDefaultValueVO defaultValueVO = new VehicleDefaultValueVO();
+                    ObjectUtil.voToPo(vo,defaultValueVO);
+                    colourMap.put("vo",defaultValueVO);
+                    colourList.add(colourMap);
+                });
+                modelMap.put("children",colourList);
+                modelList.add(modelMap);
+            });
+            typeMap.put("children",modelList);
+            treeList.add(typeMap);
+        });
+        return treeList;
+    }
+}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -317,10 +317,10 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             ConfigPO configVehicleVO = configVehicleVOS.get(0);
             vehicleBaseInfoVo = simulationProjectMapper.selectVehicleBaseInfoById(configVehicleVO.getVehicleId()).get(0);
         }
-        String vehicleImage = vehicleBaseInfoVo.getVehicleImage();
+        /*String vehicleImage = vehicleBaseInfoVo.getVehicleImage();
         if(!isEmpty(vehicleImage)){
             vehicleBaseInfoVo.setVehicleImage(vehicleImage.replaceFirst("Front side","Top"));
-        }
+        }*/
 
         List<ConfigSensorPO> vehicleSensorVos = simulationProjectMapper.selectVehicleSensor(vehicleConfigId);
 
@@ -394,7 +394,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if(vehicleBaseInfoVo != null){
             projectDetailsVo.setVehicleName(vehicleBaseInfoVo.getVehicleName());
             projectDetailsVo.setVehicleDescribe(vehicleBaseInfoVo.getDescription());
-            projectDetailsVo.setVehicleImage(vehicleBaseInfoVo.getVehicleImage());
+            projectDetailsVo.setVehicleTopView(vehicleBaseInfoVo.getVehicleTopView());
 
         }
         projectDetailsVo.setSensorCameraList(sensorCameraList);
@@ -468,13 +468,29 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         vo.setConfigId(vs.getConfigId());
         vo.setSensorId(vs.getSensorId());
         vo.setSensorType(vs.getSensorType());
-        vo.setSensorX(saveTwoDecimalPlaces(vs.getSensorX().doubleValue()));
-        vo.setSensorY(saveTwoDecimalPlaces(vs.getSensorY().doubleValue()));
-        vo.setSensorZ(saveTwoDecimalPlaces(vs.getSensorZ().doubleValue()));
-        vo.setSensorH(saveTwoDecimalPlaces(vs.getSensorH().doubleValue()));
-        vo.setSensorP(saveTwoDecimalPlaces(vs.getSensorP().doubleValue()));
-        vo.setSensorR(saveTwoDecimalPlaces(vs.getSensorR().doubleValue()));
-        vo.setSensorPort(vs.getSensorPort());
+        if(StringUtil.isNotEmpty(vs.getSensorX())){
+            vo.setSensorX(saveTwoDecimalPlaces(vs.getSensorX().doubleValue()));
+        }
+        if(StringUtil.isNotEmpty(vs.getSensorY())){
+            vo.setSensorY(saveTwoDecimalPlaces(vs.getSensorY().doubleValue()));
+        }
+        if(StringUtil.isNotEmpty(vs.getSensorZ())){
+            vo.setSensorZ(saveTwoDecimalPlaces(vs.getSensorZ().doubleValue()));
+        }
+        if(StringUtil.isNotEmpty(vs.getSensorH())){
+            vo.setSensorH(saveTwoDecimalPlaces(vs.getSensorH().doubleValue()));
+        }
+        if(StringUtil.isNotEmpty(vs.getSensorP())){
+            vo.setSensorP(saveTwoDecimalPlaces(vs.getSensorP().doubleValue()));
+        }
+        if(StringUtil.isNotEmpty(vs.getSensorR())){
+            vo.setSensorR(saveTwoDecimalPlaces(vs.getSensorR().doubleValue()));
+        }
+        if(StringUtil.isNotEmpty(vs.getSensorPort())){
+            vo.setSensorPort(vs.getSensorPort());
+        }
+
+
     }
 
 
@@ -597,7 +613,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 //        Map<String, Object> maps = selectSceneScore(pos, po.getId());
         Map<String, Object> maps = selectSceneScore(po.getScene(), po.getId());
         projectReportVo.setSceneScoreLiTitle((List<Map>) maps.get("cloums"));
-        projectReportVo.setSceneScoreLi((List<SublistScoreVo>) maps.get("result"));
+        projectReportVo.setSceneScoreLi((List<SceneScListVo>) maps.get("result"));
 
         return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, projectReportVo);
     }
@@ -790,7 +806,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
         List<DropDownVo> algorithmList = new ArrayList<>();
 
-        if(algorithmType.equals(ProjectConstants.SY_ALGORITHM_TYPE)){
+        if(ProjectConstants.SY_ALGORITHM_TYPE.equals(algorithmType)){
             //第三方算法平台获取（索为）
             String sort = "algorithmId-desc";
             Integer page = 1;
@@ -1854,6 +1870,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".pdf");
             os = new BufferedOutputStream(response.getOutputStream());
 
+            //监听生成pdf数据
             PdfWriter.getInstance(document, os);
 
             // 以下生成PDF
@@ -1942,17 +1959,116 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             document.add(pdfPTable1);
 
 
-            //新的一页
-            document.newPage();
+            //新的一页，横向显示
             document.setPageSize(PageSize.A4.rotate());
-            PdfPTable pdfPTable2 = new PdfPTable(5);
-            addTitleList(pdfPTable2, font, new String[]{"测试项目","90<总分<100","80<总分<90","70<总分<80","0<总分<70"});
-            addDataList(pdfPTable2, font, new String[]{"评价等级","优秀（G）","良好（A）","一般（M）","较差（P）",
-                    "评价等级","++++++","+++++","++++","+++",});
+            document.newPage();
+
+            //指标得分列表
+            Paragraph subListScoreElements = new Paragraph(
+                    50,
+                    "算法测试评分细则",
+                    defaultFont(font));
+            subListScoreElements.setAlignment(Element.ALIGN_CENTER); //居中
+            document.add(subListScoreElements);
+
+            setBlankLineSpacing(20,font,document);
+
+            List<Map> subListScoreLiTitle = vo.getSubListScoreLiTitle();
+            int size = subListScoreLiTitle.size();
+            PdfPTable pdfPTable2 = new PdfPTable(size);
+            pdfPTable2.setHeaderRows(1);
+            String[] slt = new String[size];
+            for(int i=0; i<size; i++){
+                slt[i] = subListScoreLiTitle.get(i).get("label").toString();
+            }
+            addTitleList(pdfPTable2, font, slt);
+
+            List<SubScListVo> subListScoreLi = vo.getSubListScoreLi();
+
+
+            for(SubScListVo slv : subListScoreLi){
+                String[] slsi = new String[size];
+                for(int i=0;i<size;i++){
+                    slsi[i] = "";
+                }
+                //目前最多支持到6级指标
+                for(int i=0; i<size-4; i++){
+                    if(i==0){
+                        slsi[i] = slv.getSublistName1();
+                    }else if(i==1){
+                        slsi[i] = slv.getSublistName2();
+                    }else if(i==2){
+                        slsi[i] = slv.getSublistName3();
+                    }else if(i==3){
+                        slsi[i] = slv.getSublistName4();
+                    }else if(i==4){
+                        slsi[i] = slv.getSublistName5();
+                    }else if(i==5){
+                        slsi[i] = slv.getSublistName6();
+                    }
+                }
+                slsi[size-4] = slv.getSceneNum();
+                slsi[size-3] = slv.getNotStandardSceneNum();
+                slsi[size-2] = slv.getLastScore();
+                slsi[size-1] = slv.getFirstScore();
+
+                addDataList(pdfPTable2, font, slsi);
+            }
             document.add(pdfPTable2);
 
+            /*
+            场景得分列表
+             */
+            Paragraph sceneScoreElements = new Paragraph(
+                    50,
+                    "详细得分情况",
+                    defaultFont(font));
+            sceneScoreElements.setAlignment(Element.ALIGN_CENTER); //居中
+            document.add(sceneScoreElements);
+
+            setBlankLineSpacing(20,font,document);
+
+            List<Map> scoreLiTitle = vo.getSceneScoreLiTitle();
+            int size2 = scoreLiTitle.size();
+            PdfPTable pdfPTable3 = new PdfPTable(size2);
+            pdfPTable3.setHeaderRows(1);
+            String[] slt2 = new String[size2];
+            for(int i=0; i<size2; i++){
+                slt2[i] = scoreLiTitle.get(i).get("label").toString();
+            }
+            addTitleList(pdfPTable3, font, slt2);
+            List<SceneScListVo> sceneScoreLi = vo.getSceneScoreLi();
 
+            for(SceneScListVo sslv : sceneScoreLi){
+                String[] ssli = new String[size2];
+                for(int i=0;i<size2;i++){
+                    ssli[i] = "";
+                }
+                //目前最多支持到6级指标
+                for(int i=0; i<size2-5; i++){
+                    if(i==0){
+                        ssli[i] = sslv.getSublistName1();
+                    }else if(i==1){
+                        ssli[i] = sslv.getSublistName2();
+                    }else if(i==2){
+                        ssli[i] = sslv.getSublistName3();
+                    }else if(i==3){
+                        ssli[i] = sslv.getSublistName4();
+                    }else if(i==4){
+                        ssli[i] = sslv.getSublistName5();
+                    }else if(i==5){
+                        ssli[i] = sslv.getSublistName6();
+                    }
+                }
+                ssli[size2-5] = sslv.getSceneId();
+                ssli[size2-4] = sslv.getSceneIdType();
+                ssli[size2-3] = sslv.getSceneScore();
+                ssli[size2-2] = sslv.getTargetEvaluate();
+                ssli[size2-1] = sslv.getScoreExplain();
 
+                addDataList(pdfPTable3, font, ssli);
+            }
+            document.add(pdfPTable3);
 
 
         } finally {

simulation-resource-server/src/main/resources/mapper/model/ConfigMapper.xml

@@ -57,7 +57,7 @@
             c.share,
             v.vehicle_name,
             v.description as vehicleDescription,
-            v.vehicle_image
+            v.vehicle_top_view
         FROM model_config c
         LEFT JOIN model_vehicle v ON v.id = c.vehicle_id
         WHERE c.is_deleted = '0'

simulation-resource-server/src/main/resources/mapper/model/VehicleMapper.xml

@@ -35,7 +35,7 @@
           id,
           vehicle_name,
           description,
-          vehicle_image,
+          vehicle_top_view,
           share
         from model_vehicle v
         where v.is_deleted = '0'
@@ -61,7 +61,8 @@
             vehicle_type,
             vehicle_model,
             vehicle_colour,
-            vehicle_image,
+            vehicle_front_view,
+            vehicle_top_view,
             max_speed,
             engine_power,
             max_deceleration,
@@ -108,7 +109,8 @@
             vehicle_type,
             vehicle_model,
             vehicle_colour,
-            vehicle_image,
+            vehicle_front_view,
+            vehicle_top_view,
             max_speed,
             engine_power,
             max_deceleration,
@@ -141,7 +143,8 @@
             #{vehicleType,jdbcType=VARCHAR},
             #{vehicleModel,jdbcType=VARCHAR},
             #{vehicleColour,jdbcType=VARCHAR},
-            #{vehicleImage,jdbcType=VARCHAR},
+            #{vehicleFrontView,jdbcType=VARCHAR},
+            #{vehicleTopView,jdbcType=VARCHAR},
             #{maxSpeed,jdbcType=DECIMAL},
             #{enginePower,jdbcType=DECIMAL},
             #{maxDeceleration,jdbcType=DECIMAL},
@@ -175,7 +178,8 @@
             vehicle_type = #{vehicleType,jdbcType=VARCHAR},
             vehicle_model = #{vehicleModel,jdbcType=VARCHAR},
             vehicle_colour = #{vehicleColour,jdbcType=VARCHAR},
-            vehicle_image = #{vehicleImage,jdbcType=VARCHAR},
+            vehicle_front_view = #{vehicleFrontView,jdbcType=VARCHAR},
+            vehicle_top_view = #{vehicleTopView,jdbcType=VARCHAR},
             max_speed = #{maxSpeed,jdbcType=DECIMAL},
             engine_power = #{enginePower,jdbcType=DECIMAL},
             max_deceleration = #{maxDeceleration,jdbcType=DECIMAL},

simulation-resource-server/src/main/resources/mapper/model/VehicleTempMapper.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.css.simulation.resource.model.mapper.VehicleTempMapper" >
+
+    <select id="getVehicleTempTree" resultType="api.common.pojo.vo.model.VehicleTempVO">
+        SELECT
+            id,
+            vehicle_code,
+            vehicle_name,
+            description,
+            vehicle_type,
+            vehicle_model,
+            vehicle_colour,
+            vehicle_front_view,
+            vehicle_top_view,
+            max_speed,
+            engine_power,
+            max_deceleration,
+            max_steering_angle,
+            mass,
+            front_surface_effective,
+            air_drag_coefficient,
+            rolling_resistance_coefficient,
+            wheel_diameter,
+            wheel_drive,
+            overall_efficiency,
+            front_distance,
+            rear_distance,
+            left_distance,
+            right_distance,
+            height_distance,
+            wheelbase,
+            valid,
+            sort
+        FROM model_vehicle_template
+        WHERE valid = '1' AND is_deleted = '0'
+        ORDER BY sort
+    </select>
+</mapper>

simulation-resource-server/src/main/resources/mapper/project/SimulationProjectMapper.xml

@@ -233,7 +233,7 @@
 
     <!--获取车辆基本信息-->
     <select id="selectVehicleBaseInfoById" parameterType="string" resultType="api.common.pojo.po.model.VehiclePO">
-        select a.id, a.vehicle_name, a.description, a.vehicle_image
+        select a.id, a.vehicle_name, a.description, a.vehicle_top_view
         from model_vehicle a
         where is_deleted = '0'
         <if test="id != null and id != ''">