车辆配置分享

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping(value = "/vehicle",name = LogConstants.MODULE_VEHICLE)
+@RequestMapping(value = "/vehicle", name = LogConstants.MODULE_VEHICLE)
 public class VehicleCtrl {
 
     @Autowired
@@ -29,7 +29,7 @@ public class VehicleCtrl {
      */
     @RequestMapping("/getVehicleList")
     @ResponseBody
-    public ResponseBodyVO<List<VehicleVO>> getVehicleList(@RequestBody VehicleParam vehicleParam){
+    public ResponseBodyVO<List<VehicleVO>> getVehicleList(@RequestBody VehicleParam vehicleParam) {
         ResponseBodyVO<List<VehicleVO>> response = new ResponseBodyVO<List<VehicleVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(vehicleService.getVehicleList(vehicleParam));
         return response;
@@ -40,10 +40,8 @@ public class VehicleCtrl {
      */
     @RequestMapping("/getMyVehicleList")
     @ResponseBody
-    public ResponseBodyVO<List<VehicleVO>> getMyVehicleList(@RequestBody VehicleParam vehicleParam){
-        ResponseBodyVO<List<VehicleVO>> response = new ResponseBodyVO<List<VehicleVO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(vehicleService.getMyVehicleList(vehicleParam));
-        return response;
+    public ResponseBodyVO<List<VehicleVO>> getMyVehicleList() {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleList());
     }
 
     /**
@@ -51,7 +49,7 @@ public class VehicleCtrl {
      */
     @RequestMapping("/getVehicleInfo")
     @ResponseBody
-    public ResponseBodyVO<VehicleVO> getVehicleInfo(@RequestBody VehicleParam vehicleParam){
+    public ResponseBodyVO<VehicleVO> getVehicleInfo(@RequestBody VehicleParam vehicleParam) {
         ResponseBodyVO<VehicleVO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(vehicleService.getVehicleInfo(vehicleParam));
         return response;
@@ -62,14 +60,14 @@ public class VehicleCtrl {
      */
     @RequestMapping("/saveVehicle")
     @ResponseBody
-    public ResponseBodyVO<VehiclePO> saveVehicle(@RequestBody VehicleVO vehicleVO){
-        if(ObjectUtil.isNull(vehicleVO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<VehiclePO> saveVehicle(@RequestBody VehicleVO vehicleVO) {
+        if (ObjectUtil.isNull(vehicleVO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         VehiclePO po = vehicleService.saveVehicle(vehicleVO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "车辆名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO(false, 500, "车辆名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -81,14 +79,14 @@ public class VehicleCtrl {
     @RequestMapping("/shareVehicle")
     @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO<VehiclePO> shareVehicle(@RequestBody VehicleVO vehicleVO){
-        if(ObjectUtil.isNull(vehicleVO)){
-            return new ResponseBodyVO<>(false, 500, "参数必传！",null);
+    public ResponseBodyVO<VehiclePO> shareVehicle(@RequestBody VehicleVO vehicleVO) {
+        if (ObjectUtil.isNull(vehicleVO)) {
+            return new ResponseBodyVO<>(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         VehiclePO po = vehicleService.shareVehicle(vehicleVO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO<>(false, 500, "车辆名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO<>(false, 500, "车辆名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -99,12 +97,12 @@ public class VehicleCtrl {
      */
     @RequestMapping("/delVehicleById")
     @ResponseBody
-    public ResponseBodyVO delVehicleById(@RequestBody VehiclePO vehiclePO){
+    public ResponseBodyVO delVehicleById(@RequestBody VehiclePO vehiclePO) {
         int i = vehicleService.delVehicleById(vehiclePO);
-        if(i>0){
+        if (i > 0) {
             return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        }else{
-            return new ResponseBodyVO(false, 500, "删除失败！",null);
+        } else {
+            return new ResponseBodyVO(false, 500, "删除失败！", null);
         }
     }
 }

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

@@ -16,6 +16,8 @@ public interface VehicleMapper {
 
     List<VehicleVO> getVehicleList(VehicleParam vehicleParam);
 
+    List<VehicleVO> selectPrivateAndPublicByCreateUserId(@Param("createUserId") String createUserId);
+
     VehicleVO getVehicleInfo(VehicleParam vehicleParam);
 
 

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

@@ -216,7 +216,7 @@ public class ConfigService {
     }
 
     public ConfigPO shareConfigByInfo(ConfigVO configVO) {
-        // 构建主表对象
+        // 构建新的车辆配置对象
         ConfigPO configPO = new ConfigPO();
         ObjectUtil.voToPo(configVO, configPO);
         configPO.setDescription(configVO.getConfigDescription());   // 私有转公有
@@ -228,36 +228,16 @@ public class ConfigService {
         // 车辆配置名称相同则覆盖，名称不同则新增
         // 车辆模型名称相同则覆盖，名称不同则新增
         // 传感器模型名称相同则覆盖，名称不同则新增
-        List<ConfigVO> list = configMapper.checkConfigName(configPO);   // 查询公有车辆配置是否有重名
-        if (ObjectUtil.isNotNull(list)) {   // 不为空说明有重名，则将参数覆盖，同时需要删除配置传感器关联表
-            ConfigVO configVO2 = list.get(0);
-            configPO.setId(configVO2.getId());
-            configPO.setModifyUserId(currentUserId);
-            configPO.setModifyTime(currentTime);
-            configPO.setIsDeleted(DictConstants.NO);
-            configMapper.updateConfig(configPO);
-            LogUtil.update();
-        } else {    // 为空说明是新增
-            configPO.setCreateUserId(currentUserId);
-            configPO.setCreateTime(currentTime);
-            configPO.setModifyUserId(currentUserId);
-            configPO.setModifyTime(currentTime);
-            configPO.setIsDeleted(DictConstants.NO);
-            // 单独处理配置描述
-            configPO.setDescription(configVO.getConfigDescription());
-            // 主表主键
-            String configId = StringUtil.getRandomUUID();
-            configPO.setId(configId);
-            configPO.setConfigCode(StringUtil.getRandomCode());
-            configMapper.insertConfig(configPO);
-        }
+
         // 复制车辆表旧数据
+        String vehicleId = null;
         if (configPO.getVehicleId() != null) {
             VehicleParam vehicleParam = new VehicleParam();
             vehicleParam.setId(configPO.getVehicleId());
             VehicleVO vehicleInfo = vehicleMapper.getVehicleInfo(vehicleParam);
             vehicleInfo.setVehicleType(vehicleInfo.getVehicleTypeStr().split(","));
-            VehiclePO po = vehicleService.shareVehicle(vehicleInfo);
+            VehiclePO vehiclePO = vehicleService.shareVehicle(vehicleInfo);
+            vehicleId = vehiclePO.getId();
         }
 
         // 复制传感器表数据
@@ -337,6 +317,31 @@ public class ConfigService {
             relationConfigSensorMapper.deleteByConfigId(configPO.getId());  // 删除配置与传感器关联关系，方便后面重新添加
             configMapper.insertConfigSensors(configSensorPOs);
         }
+
+        List<ConfigVO> list = configMapper.checkConfigName(configPO);   // 查询公有车辆配置是否有重名
+        if (ObjectUtil.isNotNull(list)) {   // 不为空说明有重名，则将参数覆盖
+            configPO.setVehicleId(vehicleId);   // 关联车辆id修改成公有车辆id
+            ConfigVO configVO2 = list.get(0);
+            configPO.setId(configVO2.getId());
+            configPO.setModifyUserId(currentUserId);
+            configPO.setModifyTime(currentTime);
+            configPO.setIsDeleted(DictConstants.NO);
+            configMapper.updateConfig(configPO);
+            LogUtil.update();
+        } else {    // 为空说明是新增
+            configPO.setVehicleId(vehicleId);   // 关联车辆id修改成公有车辆id
+            configPO.setCreateUserId(currentUserId);
+            configPO.setCreateTime(currentTime);
+            configPO.setModifyUserId(currentUserId);
+            configPO.setModifyTime(currentTime);
+            configPO.setIsDeleted(DictConstants.NO);
+            // 单独处理配置描述
+            configPO.setDescription(configVO.getConfigDescription());
+            // 主表主键
+            configPO.setId(StringUtil.getRandomUUID());
+            configPO.setConfigCode(StringUtil.getRandomCode());
+            configMapper.insertConfig(configPO);
+        }
         return configPO;
     }
 

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

@@ -33,11 +33,8 @@ public class VehicleService {
         return list;
     }
 
-    public List<VehicleVO> getMyVehicleList(VehicleParam vehicleParam) {
-        vehicleParam.setCreateUserId(AuthUtil.getCurrentUserId());
-        vehicleParam.setShare(DictConstants.NO);
-        List<VehicleVO> list = vehicleMapper.getVehicleList(vehicleParam);
-        return list;
+    public List<VehicleVO> getMyVehicleList() {
+        return vehicleMapper.selectPrivateAndPublicByCreateUserId(AuthUtil.getCurrentUserId());
     }
 
     public VehicleVO getVehicleInfo(VehicleParam vehicleParam) {
@@ -104,6 +101,7 @@ public class VehicleService {
         return vehiclePO;
     }
 
+
     public int delVehicleById(VehiclePO vehiclePO) {
         PoUtil.initDelPo(vehiclePO);
         LogUtil.delete();

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

@@ -1,42 +1,42 @@
 <?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.VehicleMapper" >
+<mapper namespace="com.css.simulation.resource.model.mapper.VehicleMapper">
 
     <resultMap id="VehicleVOMap" type="api.common.pojo.vo.model.VehicleVO">
-        <id column="ID" property="id" jdbcType="VARCHAR" />
-        <result column="vehicle_code" property="vehicleCode" jdbcType="VARCHAR" />
-        <result column="vehicle_name" property="vehicleName" jdbcType="VARCHAR" />
-        <result column="description" property="description" jdbcType="VARCHAR" />
-        <result column="vehicle_type" property="vehicleTypeStr" jdbcType="VARCHAR" />
-        <result column="model_label" property="modelLabel" jdbcType="VARCHAR" />
-        <result column="max_speed" property="maxSpeed" jdbcType="DECIMAL" />
-        <result column="engine_power" property="enginePower" jdbcType="DECIMAL" />
-        <result column="max_deceleration" property="maxDeceleration" jdbcType="DECIMAL" />
-        <result column="max_steering_angle" property="maxSteeringAngle" jdbcType="DECIMAL" />
-        <result column="mass" property="mass" jdbcType="DECIMAL" />
-        <result column="front_surface_effective" property="frontSurfaceEffective" jdbcType="DECIMAL" />
-        <result column="air_drag_coefficient" property="airDragCoefficient" jdbcType="DECIMAL" />
-        <result column="rolling_resistance_coefficient" property="rollingResistanceCoefficient" jdbcType="DECIMAL" />
-        <result column="wheel_diameter" property="wheelDiameter" jdbcType="DECIMAL" />
-        <result column="wheel_drive" property="wheelDrive" jdbcType="VARCHAR" />
-        <result column="overall_efficiency" property="overallEfficiency" jdbcType="DECIMAL" />
-        <result column="front_distance" property="frontDistance" jdbcType="DECIMAL" />
-        <result column="rear_distance" property="rearDistance" jdbcType="DECIMAL" />
-        <result column="left_distance" property="leftDistance" jdbcType="DECIMAL" />
-        <result column="right_distance" property="rightDistance" jdbcType="DECIMAL" />
-        <result column="height_distance" property="heightDistance" jdbcType="DECIMAL" />
-        <result column="wheelbase" property="wheelbase" jdbcType="DECIMAL" />
-        <result column="share" property="share" jdbcType="VARCHAR" />
+        <id column="ID" property="id" jdbcType="VARCHAR"/>
+        <result column="vehicle_code" property="vehicleCode" jdbcType="VARCHAR"/>
+        <result column="vehicle_name" property="vehicleName" jdbcType="VARCHAR"/>
+        <result column="description" property="description" jdbcType="VARCHAR"/>
+        <result column="vehicle_type" property="vehicleTypeStr" jdbcType="VARCHAR"/>
+        <result column="model_label" property="modelLabel" jdbcType="VARCHAR"/>
+        <result column="max_speed" property="maxSpeed" jdbcType="DECIMAL"/>
+        <result column="engine_power" property="enginePower" jdbcType="DECIMAL"/>
+        <result column="max_deceleration" property="maxDeceleration" jdbcType="DECIMAL"/>
+        <result column="max_steering_angle" property="maxSteeringAngle" jdbcType="DECIMAL"/>
+        <result column="mass" property="mass" jdbcType="DECIMAL"/>
+        <result column="front_surface_effective" property="frontSurfaceEffective" jdbcType="DECIMAL"/>
+        <result column="air_drag_coefficient" property="airDragCoefficient" jdbcType="DECIMAL"/>
+        <result column="rolling_resistance_coefficient" property="rollingResistanceCoefficient" jdbcType="DECIMAL"/>
+        <result column="wheel_diameter" property="wheelDiameter" jdbcType="DECIMAL"/>
+        <result column="wheel_drive" property="wheelDrive" jdbcType="VARCHAR"/>
+        <result column="overall_efficiency" property="overallEfficiency" jdbcType="DECIMAL"/>
+        <result column="front_distance" property="frontDistance" jdbcType="DECIMAL"/>
+        <result column="rear_distance" property="rearDistance" jdbcType="DECIMAL"/>
+        <result column="left_distance" property="leftDistance" jdbcType="DECIMAL"/>
+        <result column="right_distance" property="rightDistance" jdbcType="DECIMAL"/>
+        <result column="height_distance" property="heightDistance" jdbcType="DECIMAL"/>
+        <result column="wheelbase" property="wheelbase" jdbcType="DECIMAL"/>
+        <result column="share" property="share" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="getVehicleList" parameterType="api.common.pojo.param.model.VehicleParam" resultMap="VehicleVOMap">
         select
-          id,
-          vehicle_name,
-          description,
-          vehicle_front_view,
-          vehicle_top_view,
-          share
+        id,
+        vehicle_name,
+        description,
+        vehicle_front_view,
+        vehicle_top_view,
+        share
         from model_vehicle v
         where v.is_deleted = '0'
         <if test="vehicleName != null and vehicleName != ''">
@@ -52,44 +52,58 @@
         order by v.create_time desc
     </select>
 
+    <select id="selectPrivateAndPublicByCreateUserId" parameterType="api.common.pojo.param.model.VehicleParam"
+            resultMap="VehicleVOMap">
+        select id,
+               if(share = '1', concat(vehicle_name, '（公有）'), vehicle_name) vehicle_name,
+               description,
+               vehicle_front_view,
+               vehicle_top_view,
+               share
+        from model_vehicle
+        where is_deleted = '0'
+          and ((share = '0' and create_user_id = #{createUserId}) or (share = '1'))
+        order by create_time desc
+    </select>
+
+
     <select id="getVehicleInfo" parameterType="api.common.pojo.param.model.VehicleParam" resultMap="VehicleVOMap">
-        select
-            id,
-            vehicle_code,
-            vehicle_name,
-            description,
-            vehicle_type,
-            model_label,
-            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,
-            share
+        select id,
+               vehicle_code,
+               vehicle_name,
+               description,
+               vehicle_type,
+               model_label,
+               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,
+               share
         from model_vehicle
         where id = #{id}
     </select>
 
     <select id="checkVehicleName" parameterType="api.common.pojo.po.model.VehiclePO" resultMap="VehicleVOMap">
         select
-            id
+        id
         from model_vehicle v
         where v.is_deleted = '0'
-          and v.vehicle_name = #{vehicleName,jdbcType=VARCHAR}
+        and v.vehicle_name = #{vehicleName,jdbcType=VARCHAR}
         <if test="share != null and share != ''">
             and v.share = #{share,jdbcType=VARCHAR}
         </if>
@@ -100,110 +114,106 @@
     </select>
 
     <insert id="insert" parameterType="api.common.pojo.po.model.VehiclePO">
-        insert into model_vehicle(
-            id,
-            vehicle_code,
-            vehicle_name,
-            description,
-            vehicle_type,
-            model_label,
-            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,
-            share,
-            create_time,
-            modify_time,
-            create_user_id,
-            modify_user_id,
-            is_deleted
-        )
-        values(
-            #{id,jdbcType=VARCHAR},
-            #{vehicleCode,jdbcType=VARCHAR},
-            #{vehicleName,jdbcType=VARCHAR},
-            #{description,jdbcType=VARCHAR},
-            #{vehicleType,jdbcType=VARCHAR},
-            #{modelLabel,jdbcType=VARCHAR},
-            #{vehicleFrontView,jdbcType=VARCHAR},
-            #{vehicleTopView,jdbcType=VARCHAR},
-            #{maxSpeed,jdbcType=DECIMAL},
-            #{enginePower,jdbcType=DECIMAL},
-            #{maxDeceleration,jdbcType=DECIMAL},
-            #{maxSteeringAngle,jdbcType=DECIMAL},
-            #{mass,jdbcType=DECIMAL},
-            #{frontSurfaceEffective,jdbcType=DECIMAL},
-            #{airDragCoefficient,jdbcType=DECIMAL},
-            #{rollingResistanceCoefficient,jdbcType=DECIMAL},
-            #{wheelDiameter,jdbcType=DECIMAL},
-            #{wheelDrive,jdbcType=VARCHAR},
-            #{overallEfficiency,jdbcType=DECIMAL},
-            #{frontDistance,jdbcType=DECIMAL},
-            #{rearDistance,jdbcType=DECIMAL},
-            #{leftDistance,jdbcType=DECIMAL},
-            #{rightDistance,jdbcType=DECIMAL},
-            #{heightDistance,jdbcType=DECIMAL},
-            #{wheelbase,jdbcType=DECIMAL},
-            #{share,jdbcType=VARCHAR},
-            #{createTime,jdbcType=TIMESTAMP},
-            #{modifyTime,jdbcType=TIMESTAMP},
-            #{createUserId,jdbcType=VARCHAR},
-            #{modifyUserId,jdbcType=VARCHAR},
-            #{isDeleted,jdbcType=VARCHAR}
-        )
+        insert into model_vehicle(id,
+                                  vehicle_code,
+                                  vehicle_name,
+                                  description,
+                                  vehicle_type,
+                                  model_label,
+                                  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,
+                                  share,
+                                  create_time,
+                                  modify_time,
+                                  create_user_id,
+                                  modify_user_id,
+                                  is_deleted)
+        values (#{id,jdbcType=VARCHAR},
+                #{vehicleCode,jdbcType=VARCHAR},
+                #{vehicleName,jdbcType=VARCHAR},
+                #{description,jdbcType=VARCHAR},
+                #{vehicleType,jdbcType=VARCHAR},
+                #{modelLabel,jdbcType=VARCHAR},
+                #{vehicleFrontView,jdbcType=VARCHAR},
+                #{vehicleTopView,jdbcType=VARCHAR},
+                #{maxSpeed,jdbcType=DECIMAL},
+                #{enginePower,jdbcType=DECIMAL},
+                #{maxDeceleration,jdbcType=DECIMAL},
+                #{maxSteeringAngle,jdbcType=DECIMAL},
+                #{mass,jdbcType=DECIMAL},
+                #{frontSurfaceEffective,jdbcType=DECIMAL},
+                #{airDragCoefficient,jdbcType=DECIMAL},
+                #{rollingResistanceCoefficient,jdbcType=DECIMAL},
+                #{wheelDiameter,jdbcType=DECIMAL},
+                #{wheelDrive,jdbcType=VARCHAR},
+                #{overallEfficiency,jdbcType=DECIMAL},
+                #{frontDistance,jdbcType=DECIMAL},
+                #{rearDistance,jdbcType=DECIMAL},
+                #{leftDistance,jdbcType=DECIMAL},
+                #{rightDistance,jdbcType=DECIMAL},
+                #{heightDistance,jdbcType=DECIMAL},
+                #{wheelbase,jdbcType=DECIMAL},
+                #{share,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP},
+                #{modifyTime,jdbcType=TIMESTAMP},
+                #{createUserId,jdbcType=VARCHAR},
+                #{modifyUserId,jdbcType=VARCHAR},
+                #{isDeleted,jdbcType=VARCHAR})
     </insert>
 
     <update id="update" parameterType="api.common.pojo.po.model.VehiclePO">
-        update model_vehicle set
-            vehicle_name = #{vehicleName,jdbcType=VARCHAR},
-            description = #{description,jdbcType=VARCHAR},
-            vehicle_type = #{vehicleType,jdbcType=VARCHAR},
-            model_label = #{modelLabel,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},
-            max_steering_angle = #{maxSteeringAngle,jdbcType=DECIMAL},
-            mass = #{mass,jdbcType=DECIMAL},
-            front_surface_effective = #{frontSurfaceEffective,jdbcType=DECIMAL},
-            air_drag_coefficient = #{airDragCoefficient,jdbcType=DECIMAL},
+        update model_vehicle
+        set vehicle_name                   = #{vehicleName,jdbcType=VARCHAR},
+            description                    = #{description,jdbcType=VARCHAR},
+            vehicle_type                   = #{vehicleType,jdbcType=VARCHAR},
+            model_label                    = #{modelLabel,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},
+            max_steering_angle             = #{maxSteeringAngle,jdbcType=DECIMAL},
+            mass                           = #{mass,jdbcType=DECIMAL},
+            front_surface_effective        = #{frontSurfaceEffective,jdbcType=DECIMAL},
+            air_drag_coefficient           = #{airDragCoefficient,jdbcType=DECIMAL},
             rolling_resistance_coefficient = #{rollingResistanceCoefficient,jdbcType=DECIMAL},
-            wheel_diameter = #{wheelDiameter,jdbcType=DECIMAL},
-            wheel_drive = #{wheelDrive,jdbcType=VARCHAR},
-            overall_efficiency = #{overallEfficiency,jdbcType=DECIMAL},
-            front_distance = #{frontDistance,jdbcType=DECIMAL},
-            rear_distance = #{rearDistance,jdbcType=DECIMAL},
-            left_distance = #{leftDistance,jdbcType=DECIMAL},
-            right_distance = #{rightDistance,jdbcType=DECIMAL},
-            height_distance = #{heightDistance,jdbcType=DECIMAL},
-            wheelbase = #{wheelbase,jdbcType=DECIMAL},
+            wheel_diameter                 = #{wheelDiameter,jdbcType=DECIMAL},
+            wheel_drive                    = #{wheelDrive,jdbcType=VARCHAR},
+            overall_efficiency             = #{overallEfficiency,jdbcType=DECIMAL},
+            front_distance                 = #{frontDistance,jdbcType=DECIMAL},
+            rear_distance                  = #{rearDistance,jdbcType=DECIMAL},
+            left_distance                  = #{leftDistance,jdbcType=DECIMAL},
+            right_distance                 = #{rightDistance,jdbcType=DECIMAL},
+            height_distance                = #{heightDistance,jdbcType=DECIMAL},
+            wheelbase                      = #{wheelbase,jdbcType=DECIMAL},
 
-            modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-            modify_user_id = #{modifyUserId,jdbcType=VARCHAR}
+            modify_time                    = #{modifyTime,jdbcType=TIMESTAMP},
+            modify_user_id                 = #{modifyUserId,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
     <update id="delVehicleById" parameterType="api.common.pojo.po.model.VehiclePO">
-        update model_vehicle set
-          modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-          modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
-          is_deleted = #{isDeleted,jdbcType=VARCHAR}
+        update model_vehicle
+        set modify_time    = #{modifyTime,jdbcType=TIMESTAMP},
+            modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+            is_deleted     = #{isDeleted,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>