车辆模型图片

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

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

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

@@ -22,6 +22,8 @@ public class ConfigVO {
     private String vehicleName;
     //车辆描述
     private String vehicleDescription;
+    //车辆图片
+    private String vehicleImage;
     //是否分享
     private String share;
 

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

@@ -3,6 +3,7 @@ package api.common.pojo.vo.model;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class VehicleVO {
@@ -15,12 +16,16 @@ public class VehicleVO {
     private String vehicleName;
     //车辆描述
     private String description;
+    //车辆模型
+    private List<String> modelLabel;
     //车辆类型（字典代码）
     private String vehicleType;
     //车辆型号
     private String vehicleModel;
     //车辆颜色
     private String vehicleColour;
+    //车辆图片
+    private String vehicleImage;
     //最大速度（千米/小时）
     private BigDecimal maxSpeed;
     //发动机功率（千瓦）

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/PoUtil.java

@@ -0,0 +1,48 @@
+package com.css.simulation.resource.common.utils;
+
+import api.common.pojo.common.CommonPO;
+import api.common.pojo.constants.DictConstants;
+import api.common.util.ObjectUtil;
+import api.common.util.TimeUtil;
+
+import java.sql.Timestamp;
+
+public class PoUtil {
+
+    /**
+     * 初始化po的常规字段
+     */
+    public static void initAddPo(CommonPO po){
+        if(ObjectUtil.isNull(po)){
+            return ;
+        }
+        String currentUserId = AuthUtil.getCurrentUserId();
+        Timestamp currentTime = TimeUtil.getNowForMysql();
+        po.setCreateUserId(currentUserId);
+        po.setCreateTime(currentTime);
+        po.setModifyUserId(currentUserId);
+        po.setModifyTime(currentTime);
+        po.setIsDeleted(DictConstants.NO);
+    };
+
+    public static void initDelPo(CommonPO po){
+        if(ObjectUtil.isNull(po)){
+            return ;
+        }
+        String currentUserId = AuthUtil.getCurrentUserId();
+        Timestamp currentTime = TimeUtil.getNowForMysql();
+        po.setModifyUserId(currentUserId);
+        po.setModifyTime(currentTime);
+        po.setIsDeleted(DictConstants.YES);
+    };
+
+    public static void initUpdatePo(CommonPO po){
+        if(ObjectUtil.isNull(po)){
+            return ;
+        }
+        String currentUserId = AuthUtil.getCurrentUserId();
+        Timestamp currentTime = TimeUtil.getNowForMysql();
+        po.setModifyUserId(currentUserId);
+        po.setModifyTime(currentTime);
+    };
+}

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

@@ -60,12 +60,12 @@ public class VehicleCtrl {
      */
     @RequestMapping("/saveVehicle")
     @ResponseBody
-    public ResponseBodyVO<VehiclePO> saveVehicle(@RequestBody VehiclePO vehiclePO){
-        if(ObjectUtil.isNull(vehiclePO)){
+    public ResponseBodyVO<VehiclePO> saveVehicle(@RequestBody VehicleVO vehicleVO){
+        if(ObjectUtil.isNull(vehicleVO)){
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
         ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<VehiclePO>(ResponseBodyVO.Response.SUCCESS);
-        VehiclePO po = vehicleService.saveVehicle(vehiclePO);
+        VehiclePO po = vehicleService.saveVehicle(vehicleVO);
         if(ObjectUtil.isNull(po.getId())){
             return new ResponseBodyVO(false, 500, "车辆名称重复！",null);
         }
@@ -78,12 +78,12 @@ public class VehicleCtrl {
      */
     @RequestMapping("/shareVehicle")
     @ResponseBody
-    public ResponseBodyVO<VehiclePO> shareVehicle(@RequestBody VehiclePO vehiclePO){
-        if(ObjectUtil.isNull(vehiclePO)){
+    public ResponseBodyVO<VehiclePO> shareVehicle(@RequestBody VehicleVO vehicleVO){
+        if(ObjectUtil.isNull(vehicleVO)){
             return new ResponseBodyVO(false, 500, "参数必传！",null);
         }
         ResponseBodyVO<VehiclePO> response = new ResponseBodyVO<VehiclePO>(ResponseBodyVO.Response.SUCCESS);
-        VehiclePO po = vehicleService.shareVehicle(vehiclePO);
+        VehiclePO po = vehicleService.shareVehicle(vehicleVO);
         if(ObjectUtil.isNull(po.getId())){
             return new ResponseBodyVO(false, 500, "车辆名称重复！",null);
         }

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

@@ -50,6 +50,8 @@ 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

@@ -6,14 +6,15 @@ import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
-import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
+import com.css.simulation.resource.common.utils.PoUtil;
 import com.css.simulation.resource.model.mapper.VehicleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -33,22 +34,41 @@ 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;
     }
 
     public VehicleVO getVehicleInfo(VehicleParam vehicleParam) {
-        return vehicleMapper.getVehicleInfo(vehicleParam);
+        VehicleVO vehicleInfo = vehicleMapper.getVehicleInfo(vehicleParam);
+        //车辆模型字段解析
+        String vehicleType = vehicleInfo.getVehicleType();
+        String vehicleModel = vehicleInfo.getVehicleModel();
+        String vehicleColour = vehicleInfo.getVehicleColour();
+        List<String> modelLabel = new ArrayList<>();
+        modelLabel.add(vehicleType);
+        modelLabel.add(vehicleModel);
+        modelLabel.add(vehicleColour);
+        vehicleInfo.setModelLabel(modelLabel);
+        return vehicleInfo;
     }
 
-    public VehiclePO saveVehicle(VehiclePO vehiclePO) {
+    public VehiclePO saveVehicle(VehicleVO vehicleVO) {
+        VehiclePO vehiclePO = new VehiclePO();
+        ObjectUtil.voToPo(vehicleVO,vehiclePO);
+        //车辆模型字段解析
+        List<String> modelLabel = vehicleVO.getModelLabel();
+        if(ObjectUtil.isNotNull(modelLabel) && modelLabel.size() == 3){
+            vehiclePO.setVehicleType(modelLabel.get(0));
+            vehiclePO.setVehicleModel(modelLabel.get(1));
+            vehiclePO.setVehicleColour(modelLabel.get(2));
+        }
         //常规字段赋值
-        String currentUserId = AuthUtil.getCurrentUserId();
-        Timestamp currentTime = TimeUtil.getNowForMysql();
-        vehiclePO.setCreateUserId(currentUserId);
-        vehiclePO.setCreateTime(currentTime);
-        vehiclePO.setModifyUserId(currentUserId);
-        vehiclePO.setModifyTime(currentTime);
-        vehiclePO.setIsDeleted(DictConstants.NO);
+        PoUtil.initAddPo(vehiclePO);
         vehiclePO.setShare(DictConstants.NO);//私有
         //名称校验
         List<VehicleVO> list = vehicleMapper.checkVehicleName(vehiclePO);
@@ -67,9 +87,9 @@ public class VehicleService {
         return vehiclePO;
     }
 
-    public VehiclePO shareVehicle(VehiclePO vehiclePO) {
+    public VehiclePO shareVehicle(VehicleVO vehicleVO) {
         //调用保存
-        saveVehicle(vehiclePO);
+        VehiclePO vehiclePO = saveVehicle(vehicleVO);
         vehiclePO.setShare(DictConstants.YES);//转公有
         vehiclePO.setCreateUserId(null);
         //名称校验
@@ -79,14 +99,7 @@ public class VehicleService {
             return vehiclePO;
         }
         //常规字段赋值
-        String currentUserId = AuthUtil.getCurrentUserId();
-        Timestamp currentTime = TimeUtil.getNowForMysql();
-        vehiclePO.setCreateUserId(currentUserId);
-        vehiclePO.setCreateTime(currentTime);
-        vehiclePO.setModifyUserId(currentUserId);
-        vehiclePO.setModifyTime(currentTime);
-        vehiclePO.setIsDeleted(DictConstants.NO);
-
+        PoUtil.initAddPo(vehiclePO);
         vehiclePO.setId(StringUtil.getRandomUUID());
         vehiclePO.setVehicleCode(StringUtil.getRandomCode());
         vehicleMapper.insert(vehiclePO);
@@ -94,10 +107,7 @@ public class VehicleService {
     }
 
     public int delVehicleById(VehiclePO vehiclePO) {
-        vehiclePO.setIsDeleted(DictConstants.YES);
-        vehiclePO.setModifyUserId(AuthUtil.getCurrentUserId());
-        vehiclePO.setModifyTime(TimeUtil.getNowForMysql());
-        int i = vehicleMapper.delVehicleById(vehiclePO);
-        return i;
+        PoUtil.initDelPo(vehiclePO);
+        return vehicleMapper.delVehicleById(vehiclePO);
     }
 }

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

@@ -56,7 +56,8 @@
             c.vehicle_id,
             c.share,
             v.vehicle_name,
-            v.description as vehicleDescription
+            v.description as vehicleDescription,
+            v.vehicle_image
         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,6 +35,7 @@
           id,
           vehicle_name,
           description,
+          vehicle_image,
           share
         from model_vehicle v
         where v.is_deleted = '0'
@@ -60,6 +61,7 @@
             vehicle_type,
             vehicle_model,
             vehicle_colour,
+            vehicle_image,
             max_speed,
             engine_power,
             max_deceleration,
@@ -106,6 +108,7 @@
             vehicle_type,
             vehicle_model,
             vehicle_colour,
+            vehicle_image,
             max_speed,
             engine_power,
             max_deceleration,
@@ -138,6 +141,7 @@
             #{vehicleType,jdbcType=VARCHAR},
             #{vehicleModel,jdbcType=VARCHAR},
             #{vehicleColour,jdbcType=VARCHAR},
+            #{vehicleImage,jdbcType=VARCHAR},
             #{maxSpeed,jdbcType=DECIMAL},
             #{enginePower,jdbcType=DECIMAL},
             #{maxDeceleration,jdbcType=DECIMAL},
@@ -171,6 +175,7 @@
             vehicle_type = #{vehicleType,jdbcType=VARCHAR},
             vehicle_model = #{vehicleModel,jdbcType=VARCHAR},
             vehicle_colour = #{vehicleColour,jdbcType=VARCHAR},
+            vehicle_image = #{vehicleImage,jdbcType=VARCHAR},
             max_speed = #{maxSpeed,jdbcType=DECIMAL},
             engine_power = #{enginePower,jdbcType=DECIMAL},
             max_deceleration = #{maxDeceleration,jdbcType=DECIMAL},