mlx

api-common/src/main/java/api/common/util/ObjectUtil.java

@@ -115,7 +115,8 @@ public class ObjectUtil {
         BeanUtils.copyProperties(source, target);
     }
 
-    public static void vehicleVoToVehiclePo(VehicleVO vehicleVO, VehiclePO vehiclePO) {
+    public static VehiclePO vehicleVoToVehiclePo(VehicleVO vehicleVO) {
+        VehiclePO vehiclePO = new VehiclePO();
         vehiclePO.setId(vehicleVO.getId());  //主键id
         vehiclePO.setVehicleName(vehicleVO.getVehicleName());  //车辆名称
         vehiclePO.setDescription(vehicleVO.getDescription()); //车辆描述
@@ -257,6 +258,7 @@ public class ObjectUtil {
         vehiclePO.setRelationCurveLeftWheelAngleAndSteeringGearOutput(vehicleVO.getRelationCurveLeftWheelAngleAndSteeringGearOutput());//左轮转角与转向器输出的关系
         vehiclePO.setRelationCurveLeftWheelAngleAndSteeringGearOutputJson(vehicleVO.getRelationCurveLeftWheelAngleAndSteeringGearOutputJson());//左轮转角与转向器输出的关系
         vehiclePO.setDriverType(vehicleVO.getDriverType());  // 驱动类型
+        return vehiclePO;
     }
 
     /**

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

@@ -56,6 +56,7 @@ public class VehicleCtrl {
      */
     @RequestMapping("/saveVehicle")
     public ResponseBodyVO<VehiclePO> saveVehicle(@RequestBody VehicleVO vehicleVO) {
+        vehicleVO.setSaveOrShare("0");
         VehiclePO po = vehicleService.saveVehicle(vehicleVO);
         if (ObjectUtil.isNull(po.getId())) {
             return new ResponseBodyVO<>(false, 500, "车辆名称重复！", null);

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

@@ -62,12 +62,9 @@ public class VehicleService {
     public VehiclePO saveVehicle(VehicleVO vehicleVO) {
         log.info("车辆 vo 为：" + vehicleVO);
 
-        VehiclePO vehiclePO = new VehiclePO();
-        ObjectUtil.vehicleVoToVehiclePo(vehicleVO, vehiclePO);
+        VehiclePO vehiclePO = ObjectUtil.vehicleVoToVehiclePo(vehicleVO);
         //车辆模型字段解析
-        String[] vehicleType = vehicleVO.getVehicleType();
-        String vehicleTypeStr = StringUtils.join(Arrays.asList(vehicleType), ',');
-        vehiclePO.setVehicleType(vehicleTypeStr);
+        vehiclePO.setVehicleType(StringUtils.join(Arrays.asList(vehicleVO.getVehicleType()), ','));
         //常规字段赋值
         String currentUserId = AuthUtil.getCurrentUserId();
         Timestamp currentTime = TimeUtil.getNowForMysql();
@@ -88,7 +85,9 @@ public class VehicleService {
 
         String parameterType = vehicleVO.getParameterType();    //1 判断参数是 1 vtd 还是 2 carsim
         if ("2".equals(parameterType)) {
-            VehicleUtil.listToJson(vehiclePO);
+            if ("0".equals(vehicleVO.getSaveOrShare())) {
+                VehicleUtil.listToJson(vehiclePO);
+            }
             String par = FileUtil.read(parTemplate);
             log.info("车辆 po 为：" + vehiclePO);
             final String gearRatioJson = vehiclePO.getGearRatioJson();
@@ -249,6 +248,7 @@ public class VehicleService {
 
     public VehiclePO shareVehicle(VehicleVO vehicleVO) {
         //调用保存
+        vehicleVO.setSaveOrShare("1");
         VehiclePO vehiclePO = saveVehicle(vehicleVO);
         vehiclePO.setShare(DictConstants.YES);//转公有
         vehiclePO.setCreateUserId(null);

simulation-resource-server/src/main/java/com/css/simulation/resource/util/VehicleUtil.java

@@ -3,53 +3,49 @@ package com.css.simulation.resource.util;
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.JsonUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.SneakyThrows;
 
 public class VehicleUtil {
 
+    @SneakyThrows
     public static void listToJson(VehiclePO vehiclePO) {
-        try {
-            vehiclePO.setFrontLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontLeftWheelRelationCurvePositiveMomentAndSideslipAngle()));
-            vehiclePO.setFrontLeftWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontLeftWheelRelationCurveLateralForceAndSideslipAngle()));
-            vehiclePO.setFrontLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontLeftWheelRelationCurveLongitudinalForceAndSideslipAngle()));
-
-            vehiclePO.setRearLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearLeftWheelRelationCurvePositiveMomentAndSideslipAngle()));
-            vehiclePO.setRearLeftWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearLeftWheelRelationCurveLateralForceAndSideslipAngle()));
-            vehiclePO.setRearLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearLeftWheelRelationCurveLongitudinalForceAndSideslipAngle()));
-
-            vehiclePO.setFrontRightWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontRightWheelRelationCurvePositiveMomentAndSideslipAngle()));
-            vehiclePO.setFrontRightWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontRightWheelRelationCurveLateralForceAndSideslipAngle()));
-            vehiclePO.setFrontRightWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontRightWheelRelationCurveLongitudinalForceAndSideslipAngle()));
-
-            vehiclePO.setRearRightWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearRightWheelRelationCurvePositiveMomentAndSideslipAngle()));
-            vehiclePO.setRearRightWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearRightWheelRelationCurveLateralForceAndSideslipAngle()));
-            vehiclePO.setRearRightWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearRightWheelRelationCurveLongitudinalForceAndSideslipAngle()));
-
-            vehiclePO.setRelationCurveEngineTorqueSpeedAndThrottleOpeningJson(JsonUtil.listToJson(vehiclePO.getRelationCurveEngineTorqueSpeedAndThrottleOpening()));
-
-            vehiclePO.setGearRatioJson(JsonUtil.listToJson(vehiclePO.getGearRatio()));
-            vehiclePO.setInertiaJson(JsonUtil.listToJson(vehiclePO.getInertia()));
-            vehiclePO.setDrivingJson(JsonUtil.listToJson(vehiclePO.getDriving()));
-            vehiclePO.setCoastingJson(JsonUtil.listToJson(vehiclePO.getCoasting()));
-
-            vehiclePO.setShiftTimeUp12Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp12()));
-            vehiclePO.setShiftTimeUp23Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp23()));
-            vehiclePO.setShiftTimeUp34Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp34()));
-            vehiclePO.setShiftTimeUp45Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp45()));
-            vehiclePO.setShiftTimeUp56Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp56()));
-
-            vehiclePO.setShiftTimeDown12Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown12()));
-            vehiclePO.setShiftTimeDown23Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown23()));
-            vehiclePO.setShiftTimeDown34Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown34()));
-            vehiclePO.setShiftTimeDown45Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown45()));
-            vehiclePO.setShiftTimeDown56Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown56()));
-
-            vehiclePO.setRelationCurveRightWheelAngleAndSteeringGearOutputJson(JsonUtil.listToJson(vehiclePO.getRelationCurveRightWheelAngleAndSteeringGearOutput()));
-            vehiclePO.setRelationCurveLeftWheelAngleAndSteeringGearOutputJson(JsonUtil.listToJson(vehiclePO.getRelationCurveLeftWheelAngleAndSteeringGearOutput()));
-
-        } catch (JsonProcessingException e) {
-            throw new RuntimeException(e);
-        }
+        vehiclePO.setFrontLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontLeftWheelRelationCurvePositiveMomentAndSideslipAngle()));
+        vehiclePO.setFrontLeftWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontLeftWheelRelationCurveLateralForceAndSideslipAngle()));
+        vehiclePO.setFrontLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontLeftWheelRelationCurveLongitudinalForceAndSideslipAngle()));
+
+        vehiclePO.setRearLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearLeftWheelRelationCurvePositiveMomentAndSideslipAngle()));
+        vehiclePO.setRearLeftWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearLeftWheelRelationCurveLateralForceAndSideslipAngle()));
+        vehiclePO.setRearLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearLeftWheelRelationCurveLongitudinalForceAndSideslipAngle()));
+
+        vehiclePO.setFrontRightWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontRightWheelRelationCurvePositiveMomentAndSideslipAngle()));
+        vehiclePO.setFrontRightWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontRightWheelRelationCurveLateralForceAndSideslipAngle()));
+        vehiclePO.setFrontRightWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getFrontRightWheelRelationCurveLongitudinalForceAndSideslipAngle()));
+
+        vehiclePO.setRearRightWheelRelationCurvePositiveMomentAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearRightWheelRelationCurvePositiveMomentAndSideslipAngle()));
+        vehiclePO.setRearRightWheelRelationCurveLateralForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearRightWheelRelationCurveLateralForceAndSideslipAngle()));
+        vehiclePO.setRearRightWheelRelationCurveLongitudinalForceAndSideslipAngleJson(JsonUtil.listToJson(vehiclePO.getRearRightWheelRelationCurveLongitudinalForceAndSideslipAngle()));
+
+        vehiclePO.setRelationCurveEngineTorqueSpeedAndThrottleOpeningJson(JsonUtil.listToJson(vehiclePO.getRelationCurveEngineTorqueSpeedAndThrottleOpening()));
+
+        vehiclePO.setGearRatioJson(JsonUtil.listToJson(vehiclePO.getGearRatio()));
+        vehiclePO.setInertiaJson(JsonUtil.listToJson(vehiclePO.getInertia()));
+        vehiclePO.setDrivingJson(JsonUtil.listToJson(vehiclePO.getDriving()));
+        vehiclePO.setCoastingJson(JsonUtil.listToJson(vehiclePO.getCoasting()));
+
+        vehiclePO.setShiftTimeUp12Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp12()));
+        vehiclePO.setShiftTimeUp23Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp23()));
+        vehiclePO.setShiftTimeUp34Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp34()));
+        vehiclePO.setShiftTimeUp45Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp45()));
+        vehiclePO.setShiftTimeUp56Json(JsonUtil.listToJson(vehiclePO.getShiftTimeUp56()));
+
+        vehiclePO.setShiftTimeDown12Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown12()));
+        vehiclePO.setShiftTimeDown23Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown23()));
+        vehiclePO.setShiftTimeDown34Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown34()));
+        vehiclePO.setShiftTimeDown45Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown45()));
+        vehiclePO.setShiftTimeDown56Json(JsonUtil.listToJson(vehiclePO.getShiftTimeDown56()));
+
+        vehiclePO.setRelationCurveRightWheelAngleAndSteeringGearOutputJson(JsonUtil.listToJson(vehiclePO.getRelationCurveRightWheelAngleAndSteeringGearOutput()));
+        vehiclePO.setRelationCurveLeftWheelAngleAndSteeringGearOutputJson(JsonUtil.listToJson(vehiclePO.getRelationCurveLeftWheelAngleAndSteeringGearOutput()));
     }