mlx

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

@@ -1,11 +1,17 @@
 package api.common.pojo.vo.model;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 @Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class VehicleVO {
     private String id;  //主键id
     private String vehicleName;  //车辆名称
@@ -37,9 +43,9 @@ public class VehicleVO {
     private BigDecimal heightDistance;    //车高（米）
     private BigDecimal wheelbase;    //轴距（米）
     //* -------------------------------- carsim --------------------------------
-    private String wheelCenterToTop;//轮胎中心到车顶的高度
+    private String wheelCenterToTop;//轮胎中心到车顶的高度 HT_SM/mm
     private String wheelCenterToGround;//轮胎中心到地面的高度
-    private String centroidToFrontWheelCenter;//质心到前轮中心
+    private String centroidToFrontWheelCenter;//质心到前轮中心的距离
     private String centroidToGround;//质心到地面
     //    private String wheelbase;//轴距
     private String sprungMass;//簧上质量

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

@@ -6,6 +6,17 @@ import java.util.UUID;
 public class StringUtil {
 
     //* -------------------------------- D --------------------------------
+
+    /**
+     * 根据换行符分割
+     *
+     * @param string 字符串
+     * @return
+     */
+    public static String[] splitByLineSeparator(String string) {
+        return string.split(System.lineSeparator());
+    }
+
     public static String doubleToString(double doubleNumber, int bit) {
         return String.format("%." + bit + "f", doubleNumber);
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/algorithm/serviceImpl/AlgorithmServiceImpl.java

@@ -223,9 +223,9 @@ public class AlgorithmServiceImpl implements AlgorithmService {
     public ResponseBodyVO<String> testConnection(AlgorithmParameter param) {
         try {
             JgitUtil.testConnection(param.getGitUrl().replace(gitConfiguration.getName(), gitConfiguration.getUrl()), param.getGitUserName(), param.getGitPassword());
-            return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS, "连接成功");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, "连接成功");
         } catch (Exception e) {
-            return new ResponseBodyVO(ResponseBodyVO.Response.SERVER_FAILURE, "连接失败！");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE, "连接失败！");
         }
     }
 

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

@@ -6,14 +6,16 @@ import api.common.pojo.constants.LogConstants;
 import api.common.pojo.param.model.VehicleParam;
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleVO;
+import api.common.util.FileUtil;
 import api.common.util.ObjectUtil;
 import com.css.simulation.resource.model.service.VehicleService;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 @RestController
@@ -60,7 +62,7 @@ public class VehicleCtrl {
         if (ObjectUtil.isNull(po.getId())) {
             return new ResponseBodyVO<>(false, 500, "车辆名称重复！", null);
         }
-        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS,po);
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, po);
     }
 
     /**
@@ -93,4 +95,14 @@ public class VehicleCtrl {
             return new ResponseBodyVO<>(false, 500, "删除失败！", null);
         }
     }
+
+    @PostMapping(value = "/parsePar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseBodyVO<VehicleVO> parsePar(@RequestPart("par") MultipartFile par) {
+        try {
+            String read = FileUtil.read(par.getInputStream());
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.parsePar(read));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -4,20 +4,20 @@ import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.VehicleParam;
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleVO;
-import api.common.util.LogUtil;
-import api.common.util.ObjectUtil;
-import api.common.util.StringUtil;
-import api.common.util.TimeUtil;
+import api.common.util.*;
 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.css.simulation.resource.util.VehicleUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.tomcat.util.buf.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -126,4 +126,273 @@ public class VehicleService {
         LogUtil.delete();
         return vehicleMapper.delVehicleById(vehiclePO);
     }
+
+    public VehicleVO parsePar(String par) {
+
+        try {
+            String wheelCenterToTop = par.substring(par.indexOf("HT_SM")).split("\\s")[1];
+            String wheelCenterToGround = par.substring(par.indexOf("HWC_LF")).split("\\s")[1];
+            String centroidToFrontWheelCenter = par.substring(par.indexOf("LX_CG_SU")).split("\\s")[1];
+            String centroidToGround = par.substring(par.indexOf("H_CG_SU")).split("\\s")[1];
+            String wheelbase = par.substring(par.indexOf("LX_AXLE")).split("\\s")[1];
+            String sprungMass = par.substring(par.indexOf("M_SU")).split("\\s")[1];
+            String vehicleWidth = par.substring(par.indexOf("WID_SM")).split("\\s")[1];
+            String rotationalInertiaX = par.substring(par.indexOf("IXX_SU")).split("\\s")[1];
+            String rotationalInertiaY = par.substring(par.indexOf("IYY_SU")).split("\\s")[1];
+            String rotationalInertiaZ = par.substring(par.indexOf("IZZ_SU")).split("\\s")[1];
+            String effectiveRollingRadius = par.substring(par.indexOf("RRE")).split("\\s")[1];
+            String rollingResistanceCoefficient = par.substring(par.indexOf("RR_C")).split("\\s")[1];
+            String freeRadius = par.substring(par.indexOf("R0")).split("\\s")[1];
+            List<List<String>> relationCurvePositiveMomentAndSideslipAngle = convertTableToArray(par.substring(par.indexOf("MZ_TIRE_CARPET 2D_FROM_ZERO")).split("ENDTABLE")[0].replace("MZ_TIRE_CARPET 2D_FROM_ZERO" + System.lineSeparator(), ""));
+            String relationCurvePositiveMomentAndSideslipAngleJson = JsonUtil.listToJson(relationCurvePositiveMomentAndSideslipAngle);
+            List<List<String>> relationCurveLateralForceAndSideslipAngle = convertTableToArray(par.substring(par.indexOf("FY_TIRE_CARPET 2D_FROM_ZERO")).split("ENDTABLE")[0].replace("FY_TIRE_CARPET 2D_FROM_ZERO" + System.lineSeparator(), ""));
+            String relationCurveLateralForceAndSideslipAngleJson = JsonUtil.listToJson(relationCurveLateralForceAndSideslipAngle);
+            List<List<String>> relationCurveLongitudinalForceAndSideslipAngle = convertTableToArray(par.substring(par.indexOf("FX_TIRE_CARPET 2D_FROM_ZERO")).split("ENDTABLE")[0].replace("FX_TIRE_CARPET 2D_FROM_ZERO" + System.lineSeparator(), ""));
+            String relationCurveLongitudinalForceAndSideslipAngleJson = JsonUtil.listToJson(relationCurveLongitudinalForceAndSideslipAngle);
+            String frontWheelSuspensionKinematicsCoefficient = par.substring(par.indexOf("R_US_STR")).split("\\s")[1];
+            String rearWheelSuspensionKinematicsCoefficient = par.substring(par.lastIndexOf("R_US_STR")).split("\\s")[1];
+            String frontWheelUnsprungMass = par.substring(par.indexOf("M_US")).split("\\s")[1];
+            String rearWheelUnsprungMass = par.substring(par.lastIndexOf("M_US")).split("\\s")[1];
+            String frontWheelTrackWidth = par.substring(par.indexOf("L_TRACK")).split("\\s")[1];
+            String rearWheelTrackWidth = par.substring(par.lastIndexOf("L_TRACK")).split("\\s")[1];
+            String windwardArea = par.substring(par.indexOf("AREA_AERO")).split("\\s")[1];
+            String airDensity = par.substring(par.indexOf("D_AIR")).split("\\s")[1];
+            String engineCrankshaftMomentInertia = par.substring(par.indexOf("IENG")).split("\\s")[1];
+            String idleSpeed = par.substring(par.indexOf("AV_ENG_IDLE")).split("\\s")[1];
+            List<List<String>> relationCurveEngineTorqueSpeedAndThrottleOpening = convertTableToArray(par.substring(par.indexOf("MENGINE_CARPET 2D_LINEAR")).split("ENDTABLE")[0].replace("MENGINE_CARPET 2D_LINEAR" + System.lineSeparator(), ""));
+            String relationCurveEngineTorqueSpeedAndThrottleOpeningJson = JsonUtil.listToJson(relationCurveEngineTorqueSpeedAndThrottleOpening);
+            String momentInertiaInputShaft = par.substring(par.indexOf("ITC_INPUT_SHAFT")).split("\\s")[1];
+            String momentInertiaOutputShaft = par.substring(par.indexOf("ITC_OUTPUT_SHAFT")).split("\\s")[1];
+            String finalDriveRatio = par.substring(par.indexOf("R_GEAR_DIFF")).split("\\s")[1];
+            String transmissionEfficiency = par.substring(par.indexOf("R_EFF_F_DIFF")).split("\\s")[1];
+            List<String> gearRatio = CollectionUtil.createArrayList(
+                    par.substring(par.indexOf("R_GEAR_TR_REVERSE")).split("\\s")[1],
+                    "",
+                    par.substring(par.indexOf("*R_GEAR_TR(1)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_GEAR_TR(2)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_GEAR_TR(3)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_GEAR_TR(4)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_GEAR_TR(5)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_GEAR_TR(6)")).split("\\s")[1]
+            );
+            String gearRatioJson = JsonUtil.listToJson(gearRatio);//R,N,1,2,3,4,5,6
+            List<String> inertia = CollectionUtil.createArrayList(
+                    par.substring(par.indexOf("ITR_REVERSE")).split("\\s")[1],
+                    par.substring(par.indexOf("ITR_NEUTRAL")).split("\\s")[1],
+                    par.substring(par.indexOf("*ITR(1)")).split("\\s")[1],
+                    par.substring(par.indexOf("*ITR(2)")).split("\\s")[1],
+                    par.substring(par.indexOf("*ITR(3)")).split("\\s")[1],
+                    par.substring(par.indexOf("*ITR(4)")).split("\\s")[1],
+                    par.substring(par.indexOf("*ITR(5)")).split("\\s")[1],
+                    par.substring(par.indexOf("*ITR(6)")).split("\\s")[1]
+            );//R,N,1,2,3,4,5,6
+            String inertiaJson = JsonUtil.listToJson(inertia);//R,N,1,2,3,4,5,6
+            List<String> driving = CollectionUtil.createArrayList(
+                    par.substring(par.indexOf("R_EFF_TR_F_REVERSE")).split("\\s")[1],
+                    "",
+                    par.substring(par.indexOf("*R_EFF_TR_F(1)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_F(2)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_F(3)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_F(4)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_F(5)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_F(6)")).split("\\s")[1]
+            );//R,N,1,2,3,4,5,6
+            String drivingJson = JsonUtil.listToJson(driving);//R,N,1,2,3,4,5,6
+            List<String> coasting = CollectionUtil.createArrayList(
+                    par.substring(par.indexOf("R_EFF_TR_R_REVERSE")).split("\\s")[1],
+                    "",
+                    par.substring(par.indexOf("*R_EFF_TR_R(1)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_R(2)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_R(3)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_R(4)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_R(5)")).split("\\s")[1],
+                    par.substring(par.indexOf("*R_EFF_TR_R(6)")).split("\\s")[1]
+            );//R,N,1,2,3,4,5,6
+            String coastingJson = JsonUtil.listToJson(coasting);//R,N,1,2,3,4,5,6
+            String shiftTime = par.substring(par.indexOf("T_SHIFT")).split("\\s")[1];//换挡时间
+            String shiftTime12All = par.substring(
+                    par.indexOf("#FullDataName Powertrain: Shift Schedule`6-speed, 1-2 Shift`6-speed"),
+                    par.indexOf("LOG_ENTRY Used Dataset: Powertrain: Shift Schedule; { 6-speed } 6-speed, 1-2 Shift")
+            );
+            String shiftTime23All = par.substring(
+                    par.indexOf("#FullDataName Powertrain: Shift Schedule`6-speed, 2-3 Shift`6-speed"),
+                    par.indexOf("LOG_ENTRY Used Dataset: Powertrain: Shift Schedule; { 6-speed } 6-speed, 2-3 Shift")
+            );
+            String shiftTime34All = par.substring(
+                    par.indexOf("#FullDataName Powertrain: Shift Schedule`6-speed, 3-4 Shift`6-speed"),
+                    par.indexOf("LOG_ENTRY Used Dataset: Powertrain: Shift Schedule; { 6-speed } 6-speed, 3-4 Shift")
+            );
+            String shiftTime45All = par.substring(
+                    par.indexOf("#FullDataName Powertrain: Shift Schedule`6-speed, 4-5 Shift`6-speed"),
+                    par.indexOf("LOG_ENTRY Used Dataset: Powertrain: Shift Schedule; { 6-speed } 6-speed, 4-5 Shift")
+            );
+            String shiftTime56All = par.substring(
+                    par.indexOf("#FullDataName Powertrain: Shift Schedule`6-speed, 5-6 Shift`6-speed"),
+                    par.indexOf("LOG_ENTRY Used Dataset: Powertrain: Shift Schedule; { 6-speed } 6-speed, 5-6 Shift")
+            );
+            List<List<String>> shiftTimeUp12 = convertTableToArray(shiftTime12All.substring(shiftTime12All.indexOf("UPSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("UPSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeUp12Json = JsonUtil.listToJson(shiftTimeUp12);//
+            List<List<String>> shiftTimeDown12 = convertTableToArray(shiftTime12All.substring(shiftTime12All.indexOf("DOWNSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("DOWNSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeDown12Json = JsonUtil.listToJson(shiftTimeDown12);//
+
+            List<List<String>> shiftTimeUp23 = convertTableToArray(shiftTime23All.substring(shiftTime23All.indexOf("UPSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("UPSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeUp23Json = JsonUtil.listToJson(shiftTimeUp23);//
+            List<List<String>> shiftTimeDown23 = convertTableToArray(shiftTime23All.substring(shiftTime23All.indexOf("DOWNSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("DOWNSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeDown23Json = JsonUtil.listToJson(shiftTimeDown23);//
+
+            List<List<String>> shiftTimeUp34 = convertTableToArray(shiftTime34All.substring(shiftTime34All.indexOf("UPSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("UPSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeUp34Json = JsonUtil.listToJson(shiftTimeUp34);//
+            List<List<String>> shiftTimeDown34 = convertTableToArray(shiftTime34All.substring(shiftTime34All.indexOf("DOWNSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("DOWNSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeDown34Json = JsonUtil.listToJson(shiftTimeDown34);//
+
+            List<List<String>> shiftTimeUp45 = convertTableToArray(shiftTime45All.substring(shiftTime45All.indexOf("UPSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("UPSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeUp45Json = JsonUtil.listToJson(shiftTimeUp45);//
+            List<List<String>> shiftTimeDown45 = convertTableToArray(shiftTime45All.substring(shiftTime45All.indexOf("DOWNSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("DOWNSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeDown45Json = JsonUtil.listToJson(shiftTimeDown45);//
+
+            List<List<String>> shiftTimeUp56 = convertTableToArray(shiftTime56All.substring(shiftTime56All.indexOf("UPSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("UPSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeUp56Json = JsonUtil.listToJson(shiftTimeUp56);//
+            List<List<String>> shiftTimeDown56 = convertTableToArray(shiftTime56All.substring(shiftTime56All.indexOf("DOWNSHIFT_TRANS_TABLE")).split("ENDTABLE")[0].replace("DOWNSHIFT_TRANS_TABLE" + System.lineSeparator(), ""));//
+            String shiftTimeDown56Json = JsonUtil.listToJson(shiftTimeDown56);//
+
+            String frontBrakingTorque = par.substring(par.indexOf("MY_BRAKE_COEFFICIENT")).split("\\s")[1];
+            String rearBrakingTorque = par.substring(par.lastIndexOf("MY_BRAKE_COEFFICIENT")).split("\\s")[1];
+            String steeringGearRatio = par.substring(par.lastIndexOf("*CF_F")).split("\\s")[1];
+
+            List<List<String>> relationCurveRightWheelAngleAndSteeringGearOutput = convertTableToArray(par.substring(par.indexOf("RACK_KIN_TABLE SPLINE")).split("ENDTABLE")[0].replace("RACK_KIN_TABLE SPLINE" + System.lineSeparator(), ""));//
+            String relationCurveRightWheelAngleAndSteeringGearOutputJson = JsonUtil.listToJson(relationCurveRightWheelAngleAndSteeringGearOutput);//
+            List<List<String>> relationCurveLeftWheelAngleAndSteeringGearOutput = convertTableToArray(par.substring(par.lastIndexOf("RACK_KIN_TABLE SPLINE")).split("ENDTABLE")[0].replace("RACK_KIN_TABLE SPLINE" + System.lineSeparator(), ""));//
+            String relationCurveLeftWheelAngleAndSteeringGearOutputJson = JsonUtil.listToJson(relationCurveLeftWheelAngleAndSteeringGearOutput);//
+
+
+            VehicleVO vehicleVO = VehicleVO.builder()
+                    .wheelCenterToTop(wheelCenterToTop)
+                    .wheelCenterToGround(wheelCenterToGround)
+                    .centroidToFrontWheelCenter(centroidToFrontWheelCenter)
+                    .centroidToGround(centroidToGround)
+                    .wheelbase(new BigDecimal(wheelbase))
+                    .sprungMass(sprungMass)
+                    .vehicleWidth(vehicleWidth)
+                    .rotationalInertiaX(rotationalInertiaX)
+                    .rotationalInertiaY(rotationalInertiaY)
+                    .rotationalInertiaZ(rotationalInertiaZ)
+                    .frontLeftWheelEffectiveRollingRadius(effectiveRollingRadius)
+                    .frontRightWheelEffectiveRollingRadius(effectiveRollingRadius)
+                    .rearLeftWheelEffectiveRollingRadius(effectiveRollingRadius)
+                    .rearRightWheelEffectiveRollingRadius(effectiveRollingRadius)
+                    .frontLeftWheelRollingResistanceCoefficient(rollingResistanceCoefficient)
+                    .frontRightWheelRollingResistanceCoefficient(rollingResistanceCoefficient)
+                    .rearLeftWheelRollingResistanceCoefficient(rollingResistanceCoefficient)
+                    .rearRightWheelRollingResistanceCoefficient(rollingResistanceCoefficient)
+                    .frontLeftWheelFreeRadius(freeRadius)
+                    .frontRightWheelFreeRadius(freeRadius)
+                    .rearLeftWheelFreeRadius(freeRadius)
+                    .rearRightWheelFreeRadius(freeRadius)
+                    .frontLeftWheelRelationCurvePositiveMomentAndSideslipAngle(relationCurvePositiveMomentAndSideslipAngle)
+                    .frontLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson(relationCurvePositiveMomentAndSideslipAngleJson)
+                    .frontRightWheelRelationCurvePositiveMomentAndSideslipAngle(relationCurvePositiveMomentAndSideslipAngle)
+                    .frontRightWheelRelationCurvePositiveMomentAndSideslipAngleJson(relationCurvePositiveMomentAndSideslipAngleJson)
+                    .rearLeftWheelRelationCurvePositiveMomentAndSideslipAngle(relationCurvePositiveMomentAndSideslipAngle)
+                    .rearLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson(relationCurvePositiveMomentAndSideslipAngleJson)
+                    .rearRightWheelRelationCurvePositiveMomentAndSideslipAngle(relationCurvePositiveMomentAndSideslipAngle)
+                    .rearRightWheelRelationCurvePositiveMomentAndSideslipAngleJson(relationCurvePositiveMomentAndSideslipAngleJson)
+                    .frontLeftWheelRelationCurveLateralForceAndSideslipAngle(relationCurveLateralForceAndSideslipAngle)
+                    .frontLeftWheelRelationCurveLateralForceAndSideslipAngleJson(relationCurveLateralForceAndSideslipAngleJson)
+                    .frontRightWheelRelationCurveLateralForceAndSideslipAngle(relationCurveLateralForceAndSideslipAngle)
+                    .frontRightWheelRelationCurveLateralForceAndSideslipAngleJson(relationCurveLateralForceAndSideslipAngleJson)
+                    .rearLeftWheelRelationCurveLateralForceAndSideslipAngle(relationCurveLateralForceAndSideslipAngle)
+                    .rearLeftWheelRelationCurveLateralForceAndSideslipAngleJson(relationCurveLateralForceAndSideslipAngleJson)
+                    .rearRightWheelRelationCurveLateralForceAndSideslipAngle(relationCurveLateralForceAndSideslipAngle)
+                    .rearRightWheelRelationCurveLateralForceAndSideslipAngleJson(relationCurveLateralForceAndSideslipAngleJson)
+                    .frontLeftWheelRelationCurveLongitudinalForceAndSideslipAngle(relationCurveLongitudinalForceAndSideslipAngle)
+                    .frontLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson(relationCurveLongitudinalForceAndSideslipAngleJson)
+                    .frontRightWheelRelationCurveLongitudinalForceAndSideslipAngle(relationCurveLongitudinalForceAndSideslipAngle)
+                    .frontRightWheelRelationCurveLongitudinalForceAndSideslipAngleJson(relationCurveLongitudinalForceAndSideslipAngleJson)
+                    .rearLeftWheelRelationCurveLongitudinalForceAndSideslipAngle(relationCurveLongitudinalForceAndSideslipAngle)
+                    .rearLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson(relationCurveLongitudinalForceAndSideslipAngleJson)
+                    .rearRightWheelRelationCurveLongitudinalForceAndSideslipAngle(relationCurveLongitudinalForceAndSideslipAngle)
+                    .rearRightWheelRelationCurveLongitudinalForceAndSideslipAngleJson(relationCurveLongitudinalForceAndSideslipAngleJson)
+                    .frontWheelSuspensionType("1")
+                    .rearWheelSuspensionType("1")
+                    .frontWheelSuspensionKinematicsCoefficient(frontWheelSuspensionKinematicsCoefficient)
+                    .rearWheelSuspensionKinematicsCoefficient(rearWheelSuspensionKinematicsCoefficient)
+                    .frontWheelUnsprungMass(frontWheelUnsprungMass)
+                    .rearWheelUnsprungMass(rearWheelUnsprungMass)
+                    .frontWheelTrackWidth(frontWheelTrackWidth)
+                    .rearWheelTrackWidth(rearWheelTrackWidth)
+                    .windwardArea(windwardArea)
+                    .airDensity(airDensity)
+                    .engineCrankshaftMomentInertia(engineCrankshaftMomentInertia)
+                    .idleSpeed(idleSpeed)
+                    .relationCurveEngineTorqueSpeedAndThrottleOpening(relationCurveEngineTorqueSpeedAndThrottleOpening)
+                    .relationCurveEngineTorqueSpeedAndThrottleOpeningJson(relationCurveEngineTorqueSpeedAndThrottleOpeningJson)
+                    .momentInertiaInputShaft(momentInertiaInputShaft)
+                    .momentInertiaOutputShaft(momentInertiaOutputShaft)
+                    .finalDriveRatio(finalDriveRatio)
+                    .transmissionEfficiency(transmissionEfficiency)
+                    .gearRatio(gearRatio)
+                    .gearRatioJson(gearRatioJson)
+                    .inertia(inertia)
+                    .inertiaJson(inertiaJson)
+                    .driving(driving)
+                    .drivingJson(drivingJson)
+                    .coasting(coasting)
+                    .coastingJson(coastingJson)
+                    .shiftTime(shiftTime)
+                    .shiftTimeUp12(shiftTimeUp12)
+                    .shiftTimeUp12Json(shiftTimeUp12Json)
+                    .shiftTimeDown12(shiftTimeDown12)
+                    .shiftTimeDown12Json(shiftTimeDown12Json)
+
+                    .shiftTimeUp23(shiftTimeUp23)
+                    .shiftTimeUp23Json(shiftTimeUp23Json)
+                    .shiftTimeDown23(shiftTimeDown23)
+                    .shiftTimeDown23Json(shiftTimeDown23Json)
+
+                    .shiftTimeUp34(shiftTimeUp34)
+                    .shiftTimeUp34Json(shiftTimeUp34Json)
+                    .shiftTimeDown34(shiftTimeDown34)
+                    .shiftTimeDown34Json(shiftTimeDown34Json)
+
+                    .shiftTimeUp45(shiftTimeUp45)
+                    .shiftTimeUp45Json(shiftTimeUp45Json)
+                    .shiftTimeDown45(shiftTimeDown45)
+                    .shiftTimeDown45Json(shiftTimeDown45Json)
+
+                    .shiftTimeUp56(shiftTimeUp56)
+                    .shiftTimeUp56Json(shiftTimeUp56Json)
+                    .shiftTimeDown56(shiftTimeDown56)
+                    .shiftTimeDown56Json(shiftTimeDown56Json)
+                    .brakeType("1")
+                    .frontLeftWheelBrakingTorque(frontBrakingTorque)
+                    .frontRightWheelBrakingTorque(frontBrakingTorque)
+                    .rearLeftWheelBrakingTorque(rearBrakingTorque)
+                    .rearRightWheelBrakingTorque(rearBrakingTorque)
+                    .steeringType("1")
+                    .steeringGearType("1")
+                    .steeringGearRatio(steeringGearRatio)
+                    .relationCurveRightWheelAngleAndSteeringGearOutput(relationCurveRightWheelAngleAndSteeringGearOutput)
+                    .relationCurveRightWheelAngleAndSteeringGearOutputJson(relationCurveRightWheelAngleAndSteeringGearOutputJson)
+                    .relationCurveLeftWheelAngleAndSteeringGearOutput(relationCurveLeftWheelAngleAndSteeringGearOutput)
+                    .relationCurveLeftWheelAngleAndSteeringGearOutputJson(relationCurveLeftWheelAngleAndSteeringGearOutputJson)
+                    .build();
+
+            return vehicleVO;
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    public List<List<String>> convertTableToArray(String table) {
+        List<List<String>> result = new ArrayList<>();
+        String[] lines = StringUtil.splitByLineSeparator(table);
+        for (String line : lines) {
+            String lineWithoutBlank = line.replaceAll(" ", "");
+            String[] split = lineWithoutBlank.split(",");
+            result.add(Arrays.asList(split));
+        }
+        return result;
+    }
+
 }

simulation-resource-video/src/main/java/com/css/simulation/resource/video/service/VideoService.java

@@ -129,10 +129,10 @@ public class VideoService {
         //删除生成的临时文件
         String removeAll = "rm -rf " + pictureDirectoryPath;
         log.info("删除全部图片==" + removeAll);
-        FileUtil.rm(xodrPathOfLinux);
-        FileUtil.rm(osgbPathOfLinux);
-        FileUtil.rm(csv1PathOfLinux);
-        FileUtil.rm(csv2PathOfLinux);
+//        FileUtil.rm(xodrPathOfLinux);
+//        FileUtil.rm(osgbPathOfLinux);
+//        FileUtil.rm(csv1PathOfLinux);
+//        FileUtil.rm(csv2PathOfLinux);
 
         //* -------------------------------- 删除临时文件 --------------------------------
         LinuxUtil.execute(removeAll);