车辆模型默认值

api-common/src/main/java/api/common/pojo/param/model/VehiclePageParam.java

@@ -8,11 +8,13 @@ public class VehiclePageParam extends PageVO {
 
     //主键id
     private String id;
-    //车辆编码
-    private String vehicleCode;
-    //车辆名称
-    private String vehicleName;
     //模型标识
     private String modelLabel;
+    //车辆类型
+    private String vehicleType;
+    //车辆型号
+    private String vehicleModel;
+    //车辆颜色
+    private String vehicleColour;
 
 }

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

@@ -18,10 +18,12 @@ public class VehiclePO extends CommonPO {
     private String description;
     //车辆类型（字典代码）
     private String vehicleType;
+    //车辆模型标签
+    private String modelLabel;
     //车辆型号
-    private String vehicleModel;
+    /*private String vehicleModel;
     //车辆颜色
-    private String vehicleColour;
+    private String vehicleColour;*/
     //车辆前视图
     private String vehicleFrontView;
     //车辆俯视图

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

@@ -8,6 +8,8 @@ import java.math.BigDecimal;
 @Data
 public class VehicleDefaultValueVO {
 
+    //模型标识
+    private String modelLabel;
     //车辆前视图
     private String vehicleFrontView;
     //车辆俯视图

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

@@ -1,8 +1,10 @@
 package api.common.pojo.vo.model;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.sql.Timestamp;
 
 @Data
 public class VehicleTempVO {
@@ -65,4 +67,7 @@ public class VehicleTempVO {
     private String valid;
     //序号
     private int sort;
+    //创建时间
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Timestamp createTime;
 }

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

@@ -3,7 +3,6 @@ package api.common.pojo.vo.model;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 public class VehicleVO {
@@ -17,13 +16,17 @@ public class VehicleVO {
     //车辆描述
     private String description;
     //车辆模型
-    private List<String> modelLabel;
-    //车辆类型（字典代码）
+    private String[] vehicleType;
+    //车辆模型标签
+    private String modelLabel;
+    //车辆模型字符串
+    private String vehicleTypeStr;
+    /*//车辆类型（字典代码）
     private String vehicleType;
     //车辆型号
     private String vehicleModel;
     //车辆颜色
-    private String vehicleColour;
+    private String vehicleColour;*/
     //车辆前视图
     private String vehicleFrontView;
     //车辆俯视图

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

@@ -65,7 +65,7 @@ public class VehicleTempCtrl {
         ResponseBodyVO<VehicleTempPO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         po = vehicleTempService.saveVehicleTemp(po);
         if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "车辆名称重复！",null);
+            return new ResponseBodyVO(false, 500, "车辆类型、型号、颜色重复！",null);
         }
         response.setInfo(po);
         return response;

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

@@ -10,12 +10,12 @@ import api.common.util.StringUtil;
 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 com.sun.deploy.util.StringUtils;
 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.Arrays;
 import java.util.List;
 
 @Service
@@ -41,14 +41,8 @@ public class VehicleService {
     public VehicleVO getVehicleInfo(VehicleParam 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);
+        String vehicleType = vehicleInfo.getVehicleTypeStr();
+        vehicleInfo.setVehicleType(vehicleType.split(","));
         return vehicleInfo;
     }
 
@@ -56,12 +50,9 @@ public class VehicleService {
         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[] vehicleType = vehicleVO.getVehicleType();
+        String vehicleTypeStr = StringUtils.join(Arrays.asList(vehicleType),",");
+        vehiclePO.setVehicleType(vehicleTypeStr);
         //常规字段赋值
         PoUtil.initAddPo(vehiclePO);
         vehiclePO.setShare(DictConstants.NO);//私有

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

@@ -35,7 +35,8 @@ public class VehicleTempService {
         typeCollect.forEach((typeKey,typeValue)->{
             Map typeMap = new HashMap();
             typeMap.put("code",typeKey);
-            typeMap.put("name",typeValue.get(0).getVehicleName());
+            typeMap.put("name",typeKey);
+            //typeMap.put("name",typeValue.get(0).getVehicleName());
             List<Map> modelList = new LinkedList();
             Map<String, List<VehicleTempVO>> modelCollect = typeValue.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleModel,LinkedHashMap::new, Collectors.toList()));
             modelCollect.forEach((modelKey,modelValue)->{
@@ -84,6 +85,7 @@ public class VehicleTempService {
         if(ObjectUtil.isNull(id)){//新增
             po.setId(StringUtil.getRandomUUID());
             po.setVehicleCode(StringUtil.getRandomCode());
+            po.setValid("1");
             vehicleTempMapper.insert(po);
             logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_INSERT,po);
         }else{//修改

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/FileController.java

@@ -43,7 +43,7 @@ public class FileController {
             Integer nowTime = TimeUtil.getRq(new Date(), 0);
             String randomCode = StringUtil.getRandomCode();
             if (type.equals(DictConstants.VEHICLE_IMG_FILE)) {
-                fileName = DictConstants.VEHICLE_IMG_FILE + "/" + objectPath + "/" + nowTime + "/" + randomCode + "/" + multipartFile.getOriginalFilename();
+                fileName = "/" + DictConstants.VEHICLE_IMG_FILE + "/" + nowTime + "/" + randomCode + "/" + multipartFile.getOriginalFilename();
             } else {
                 new ResponseBodyVO(ResponseBodyVO.Response.CLIENT_FAILURE, "文件类型错误！");
             }

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

@@ -7,9 +7,8 @@
         <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="vehicleType" jdbcType="VARCHAR" />
-        <result column="vehicle_model" property="vehicleModel" jdbcType="VARCHAR" />
-        <result column="vehicle_colour" property="vehicleColour" 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" />
@@ -59,8 +58,7 @@
             vehicle_name,
             description,
             vehicle_type,
-            vehicle_model,
-            vehicle_colour,
+            model_label,
             vehicle_front_view,
             vehicle_top_view,
             max_speed,
@@ -107,8 +105,7 @@
             vehicle_name,
             description,
             vehicle_type,
-            vehicle_model,
-            vehicle_colour,
+            model_label,
             vehicle_front_view,
             vehicle_top_view,
             max_speed,
@@ -141,8 +138,7 @@
             #{vehicleName,jdbcType=VARCHAR},
             #{description,jdbcType=VARCHAR},
             #{vehicleType,jdbcType=VARCHAR},
-            #{vehicleModel,jdbcType=VARCHAR},
-            #{vehicleColour,jdbcType=VARCHAR},
+            #{modelLabel,jdbcType=VARCHAR},
             #{vehicleFrontView,jdbcType=VARCHAR},
             #{vehicleTopView,jdbcType=VARCHAR},
             #{maxSpeed,jdbcType=DECIMAL},
@@ -176,8 +172,7 @@
             vehicle_name = #{vehicleName,jdbcType=VARCHAR},
             description = #{description,jdbcType=VARCHAR},
             vehicle_type = #{vehicleType,jdbcType=VARCHAR},
-            vehicle_model = #{vehicleModel,jdbcType=VARCHAR},
-            vehicle_colour = #{vehicleColour,jdbcType=VARCHAR},
+            model_label = #{modelLabel,jdbcType=VARCHAR},
             vehicle_front_view = #{vehicleFrontView,jdbcType=VARCHAR},
             vehicle_top_view = #{vehicleTopView,jdbcType=VARCHAR},
             max_speed = #{maxSpeed,jdbcType=DECIMAL},

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

@@ -8,6 +8,7 @@
             vehicle_code,
             vehicle_name,
             description,
+            model_label,
             vehicle_type,
             vehicle_model,
             vehicle_colour,
@@ -48,14 +49,18 @@
           vehicle_model,
           vehicle_colour,
           sort,
-          valid
+          valid,
+          create_time
         FROM model_vehicle_template
         WHERE is_deleted = '0'
-        <if test="vehicleCode != null and vehicleCode != ''">
-            and vehicle_code like CONCAT('%',#{vehicleCode,jdbcType=VARCHAR},'%')
+        <if test="vehicleType != null and vehicleType != ''">
+            and vehicle_type like CONCAT('%',#{vehicleType,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="vehicleModel != null and vehicleModel != ''">
+            and vehicle_model like CONCAT('%',#{vehicleModel,jdbcType=VARCHAR},'%')
         </if>
-        <if test="vehicleName != null and vehicleName != ''">
-            and vehicle_name like CONCAT('%',#{vehicleName,jdbcType=VARCHAR},'%')
+        <if test="vehicleColour != null and vehicleColour != ''">
+            and vehicle_colour like CONCAT('%',#{vehicleColour,jdbcType=VARCHAR},'%')
         </if>
         <if test="modelLabel != null and modelLabel != ''">
             and model_label like CONCAT('%',#{modelLabel,jdbcType=VARCHAR},'%')
@@ -104,7 +109,9 @@
         from model_vehicle_template
         where is_deleted = '0'
           and id &lt;&gt; #{id,jdbcType=VARCHAR}
-          and vehicle_name = #{vehicleName,jdbcType=VARCHAR}
+          and vehicle_type = #{vehicleType,jdbcType=VARCHAR}
+          and vehicle_model = #{vehicleModel,jdbcType=VARCHAR}
+          and vehicle_colour = #{vehicleColour,jdbcType=VARCHAR}
     </select>
 
     <insert id="insert" parameterType="api.common.pojo.po.model.VehicleTempPO">