mlx

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

@@ -4,6 +4,7 @@ import api.common.pojo.common.CommonPO;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class VehiclePO extends CommonPO {
@@ -36,5 +37,89 @@ public class VehiclePO extends CommonPO {
     private BigDecimal heightDistance;    //车高（米）
     private BigDecimal wheelbase;    //轴距（米）
     //* -------------------------------- carsim --------------------------------
+    private String wheelCenterToTop;//轮胎中心到车顶的高度
+    private String wheelCenterToGround;//轮胎中心到地面的高度
+    private String centroidToFrontWheelCenter;//质心到前轮中心
+    private String centroidToGround;//质心到地面
+    //    private String wheelbase;//轴距
+    private String sprungMass;//簧上质量
+    private String vehicleWidth;//车辆宽度
+    private String rotationalInertiaX;//整车绕x轴转动惯量
+    private String rotationalInertiaY;//整车绕y轴转动惯量
+    private String rotationalInertiaZ;//整车绕z轴转动惯量
+
+    private String frontLeftWheelEffectiveRollingRadius;//左前轮有效滚动半径
+    private String frontLeftWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
+    private String frontLeftWheelFreeRadius;//左前轮自由半径
+    private List<List<String>> frontLeftWheelRelationCurvePositiveMomentAndSideslipAngle;//左前轮不同载荷下正力矩和侧偏角关系曲线
+    private String frontLeftWheelRelationCurvePositiveMomentAndSideslipAngleJson;//左前轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> frontLeftWheelRelationCurveLateralForceAndSideslipAngle;//左前轮不同载荷下侧向力和侧偏角关系曲线
+    private String frontLeftWheelRelationCurveLateralForceAndSideslipAngleJson;//左前轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> frontLeftWheelRelationCurveLongitudinalForceAndSideslipAngle;//左前轮不同载荷下纵向力和侧偏角关系曲线
+    private String frontLeftWheelRelationCurveLongitudinalForceAndSideslipAngleJson;//左前轮不同载荷下纵向力和侧偏角关系曲线
+
+    private String rearLeftWheelEffectiveRollingRadius;//左前轮有效滚动半径
+    private String rearLeftWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
+    private String rearLeftWheelFreeRadius;//左前轮自由半径
+    private List<List<String>> rearLeftWheelRelationCurvePositiveMomentAndSideslipAngle;//左后轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> rearLeftWheelRelationCurveLateralForceAndSideslipAngle;//左后轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> rearLeftWheelRelationCurveLongitudinalForceAndSideslipAngle;//左后轮不同载荷下纵向力和侧偏角关系曲线
+
+    private String frontRightWheelEffectiveRollingRadius;//右前轮有效滚动半径
+    private String frontRightWheelRollingResistanceCoefficient;//右前轮滚动阻力系数
+    private String frontRightWheelFreeRadius;//右前轮自由半径
+    private List<List<String>> frontRightWheelRelationCurvePositiveMomentAndSideslipAngle;//右前轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> frontRightWheelRelationCurveLateralForceAndSideslipAngle;//右前轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> frontRightWheelRelationCurveLongitudinalForceAndSideslipAngle;//右前轮不同载荷下纵向力和侧偏角关系曲线
+
+    private String rearRightWheelEffectiveRollingRadius;//右后轮有效滚动半径
+    private String rearRightWheelRollingResistanceCoefficient;//右后轮滚动阻力系数
+    private String rearRightWheelFreeRadius;//右后轮自由半径
+    private List<List<String>> rearRightWheelRelationCurvePositiveMomentAndSideslipAngle;//右后轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> rearRightWheelRelationCurveLateralForceAndSideslipAngle;//右后轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> rearRightWheelRelationCurveLongitudinalForceAndSideslipAngle;//右后轮不同载荷下纵向力和侧偏角关系曲线
+
+    private String frontWheelSuspensionType;//前轮悬架类型 1 独立悬架 2 非独立悬架
+    private String frontWheelSuspensionKinematicsCoefficient;//前轮悬架运动学系数
+    private String frontWheelUnsprungMass;//前轮簧下质量
+    private String frontWheelTrackWidth;//前轮轮距
+    private String rearWheelSuspensionType;//后轮悬架类型 1 独立悬架 2 非独立悬架
+    private String rearWheelSuspensionKinematicsCoefficient;//后轮悬架运动学系数
+    private String rearWheelUnsprungMass;//后轮簧下质量
+    private String rearWheelTrackWidth;//后轮轮距
+    private String windwardArea;//迎风面积
+    private String airDensity;//空气密度
+    private String engineCrankshaftMomentInertia;//发动机曲轴转动惯量
+    private String idleSpeed;//怠速转速
+    private List<List<String>> relationCurveEngineTorqueSpeedAndThrottleOpening;//发动机扭矩、转速和节气门开度关系曲线
+    private String momentInertiaInputShaft;//输入轴的转动惯量
+    private String momentInertiaOutputShaft;//输出轴的转动惯量
+    private String finalDriveRatio;//主减速器传动比
+    private String transmissionEfficiency;//传动效率
+    private List<String> gearRatio;//R,N,1,2,3,4,5,6
+    private List<String> inertia;//R,N,1,2,3,4,5,6
+    private List<String> driving;//R,N,1,2,3,4,5,6
+    private List<String> coasting;//R,N,1,2,3,4,5,6
+    private String shiftTime;//换挡时间
+    private List<List<String>> shiftTimeUp12;//
+    private List<List<String>> shiftTimeDown12;//
+    private List<List<String>> shiftTimeUp23;//
+    private List<List<String>> shiftTimeDown23;//
+    private List<List<String>> shiftTimeUp34;//
+    private List<List<String>> shiftTimeDown34;//
+    private List<List<String>> shiftTimeUp45;//
+    private List<List<String>> shiftTimeDown45;//
+    private List<List<String>> shiftTimeUp56;//
+    private List<List<String>> shiftTimeDown56;//
+    private String brakeType;//制动类型 1 前轮制动 2 后轮制动 3 四轮制动
+    private String frontLeftWheelBrakingTorque;//左前轮制动力矩
+    private String rearLeftWheelBrakingTorque;//左后轮制动力矩
+    private String frontRightWheelBrakingTorque;//右前轮制动力矩
+    private String rearRightWheelBrakingTorque;//右后轮制动力矩
+    private String steeringType;//转向类型 1 前轮转向 2 后轮转向 3 四轮转向
+    private String steeringGearType;//转向器类型 1 齿轮齿条转向器 2 循环球式转向器
+    private String steeringGearRatio;//转向器传动比
+    private String relationCurveRightWheelAngleAndSteeringGearOutput;//右轮转角与转向器输出的关系
+    private String relationCurveLeftWheelAngleAndSteeringGearOutput;//左轮转角与转向器输出的关系
 
 }

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

@@ -13,7 +13,7 @@ public class VehicleVO {
     private String[] vehicleType;   //车辆模型
     private String modelLabel;  //车辆模型标签
     private String share;    // 公有私有
-    private String parameterType;    // 1 vtd 2 carsim
+    private String parameterType;    //动力学参数类型 1 vtd 2 carsim
     //* -------------------------------- vtd --------------------------------
     private String vehicleCode; //车辆编码
     private String vehicleTypeStr;   //车辆模型字符串
@@ -37,44 +37,44 @@ public class VehicleVO {
     private BigDecimal heightDistance;    //车高（米）
     private BigDecimal wheelbase;    //轴距（米）
     //* -------------------------------- carsim --------------------------------
-    private Double wheelCenterToTop;//轮胎中心到车顶的高度
-    private Double wheelCenterToGround;//轮胎中心到地面的高度
-    private Double centroidToFrontWheelCenter;//质心到前轮中心
-    private Double centroidToGround;//质心到地面
-//    private Double wheelbase;//轴距
-    private Double sprungMass;//簧上质量
-    private Double vehicleWidth;//车辆宽度
-    private Double rotationalInertiaX;//整车绕x轴转动惯量
-    private Double rotationalInertiaY;//整车绕y轴转动惯量
-    private Double rotationalInertiaZ;//整车绕z轴转动惯量
+    private String wheelCenterToTop;//轮胎中心到车顶的高度
+    private String wheelCenterToGround;//轮胎中心到地面的高度
+    private String centroidToFrontWheelCenter;//质心到前轮中心
+    private String centroidToGround;//质心到地面
+//    private String wheelbase;//轴距
+    private String sprungMass;//簧上质量
+    private String vehicleWidth;//车辆宽度
+    private String rotationalInertiaX;//整车绕x轴转动惯量
+    private String rotationalInertiaY;//整车绕y轴转动惯量
+    private String rotationalInertiaZ;//整车绕z轴转动惯量
 
-    private Double frontLeftWheelEffectiveRollingRadius;//左前轮有效滚动半径
-    private Double frontLeftWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
-    private Double frontLeftWheelFreeRadius;//左前轮自由半径
-    private List<List<String>> frontLeftWheelRelationCurveOfPositiveMomentAndSideslipAngle;//左前轮不同载荷下正力矩和侧偏角关系曲线
-    private List<List<String>> frontLeftWheelRelationCurveBetweenLateralForceAndSideslipAngle;//左前轮不同载荷下侧向力和侧偏角关系曲线
-    private List<List<String>> frontLeftWheelRelationCurveBetweenLongitudinalForceAndSideslipAngle;//左前轮不同载荷下纵向力和侧偏角关系曲线
+    private String frontLeftWheelEffectiveRollingRadius;//左前轮有效滚动半径
+    private String frontLeftWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
+    private String frontLeftWheelFreeRadius;//左前轮自由半径
+    private List<List<String>> frontLeftWheelRelationCurvePositiveMomentAndSideslipAngle;//左前轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> frontLeftWheelRelationCurveLateralForceAndSideslipAngle;//左前轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> frontLeftWheelRelationCurveLongitudinalForceAndSideslipAngle;//左前轮不同载荷下纵向力和侧偏角关系曲线
 
-    private Double rearLeftWheelEffectiveRollingRadius;//左前轮有效滚动半径
-    private Double rearLeftWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
-    private Double rearLeftWheelFreeRadius;//左前轮自由半径
-    private List<List<String>> rearLeftWheelRelationCurveOfPositiveMomentAndSideslipAngle;//左后轮不同载荷下正力矩和侧偏角关系曲线
-    private List<List<String>> rearLeftWheelRelationCurveBetweenLateralForceAndSideslipAngle;//左后轮不同载荷下侧向力和侧偏角关系曲线
-    private List<List<String>> rearLeftWheelRelationCurveBetweenLongitudinalForceAndSideslipAngle;//左后轮不同载荷下纵向力和侧偏角关系曲线
+    private String rearLeftWheelEffectiveRollingRadius;//左前轮有效滚动半径
+    private String rearLeftWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
+    private String rearLeftWheelFreeRadius;//左前轮自由半径
+    private List<List<String>> rearLeftWheelRelationCurvePositiveMomentAndSideslipAngle;//左后轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> rearLeftWheelRelationCurveLateralForceAndSideslipAngle;//左后轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> rearLeftWheelRelationCurveLongitudinalForceAndSideslipAngle;//左后轮不同载荷下纵向力和侧偏角关系曲线
 
-    private Double frontRightWheelEffectiveRollingRadius;//左前轮有效滚动半径
-    private Double frontRightWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
-    private Double frontRightWheelFreeRadius;//左前轮自由半径
-    private List<List<String>> frontRightWheelRelationCurveOfPositiveMomentAndSideslipAngle;//右前轮不同载荷下正力矩和侧偏角关系曲线
-    private List<List<String>> frontRightWheelRelationCurveBetweenLateralForceAndSideslipAngle;//右前轮不同载荷下侧向力和侧偏角关系曲线
-    private List<List<String>> frontRightWheelRelationCurveBetweenLongitudinalForceAndSideslipAngle;//右前轮不同载荷下纵向力和侧偏角关系曲线
+    private String frontRightWheelEffectiveRollingRadius;//右前轮有效滚动半径
+    private String frontRightWheelRollingResistanceCoefficient;//右前轮滚动阻力系数
+    private String frontRightWheelFreeRadius;//右前轮自由半径
+    private List<List<String>> frontRightWheelRelationCurvePositiveMomentAndSideslipAngle;//右前轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> frontRightWheelRelationCurveLateralForceAndSideslipAngle;//右前轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> frontRightWheelRelationCurveLongitudinalForceAndSideslipAngle;//右前轮不同载荷下纵向力和侧偏角关系曲线
 
-    private Double rearRightWheelEffectiveRollingRadius;//左前轮有效滚动半径
-    private Double rearRightWheelRollingResistanceCoefficient;//左前轮滚动阻力系数
-    private Double rearRightWheelFreeRadius;//左前轮自由半径
-    private List<List<String>> rearRightWheelRelationCurveOfPositiveMomentAndSideslipAngle;//右后轮不同载荷下正力矩和侧偏角关系曲线
-    private List<List<String>> rearRightWheelRelationCurveBetweenLateralForceAndSideslipAngle;//右后轮不同载荷下侧向力和侧偏角关系曲线
-    private List<List<String>> rearRightWheelRelationCurveBetweenLongitudinalForceAndSideslipAngle;//右后轮不同载荷下纵向力和侧偏角关系曲线
+    private String rearRightWheelEffectiveRollingRadius;//右后轮有效滚动半径
+    private String rearRightWheelRollingResistanceCoefficient;//右后轮滚动阻力系数
+    private String rearRightWheelFreeRadius;//右后轮自由半径
+    private List<List<String>> rearRightWheelRelationCurvePositiveMomentAndSideslipAngle;//右后轮不同载荷下正力矩和侧偏角关系曲线
+    private List<List<String>> rearRightWheelRelationCurveLateralForceAndSideslipAngle;//右后轮不同载荷下侧向力和侧偏角关系曲线
+    private List<List<String>> rearRightWheelRelationCurveLongitudinalForceAndSideslipAngle;//右后轮不同载荷下纵向力和侧偏角关系曲线
 
     private String frontWheelSuspensionType;//前轮悬架类型 1 独立悬架 2 非独立悬架
     private String frontWheelSuspensionKinematicsCoefficient;//前轮悬架运动学系数
@@ -86,13 +86,13 @@ public class VehicleVO {
     private String rearWheelTrackWidth;//后轮轮距
     private String windwardArea;//迎风面积
     private String airDensity;//空气密度
-    private String engineCrankshaftMomentOfInertia;//发动机曲轴转动惯量
+    private String engineCrankshaftMomentInertia;//发动机曲轴转动惯量
     private String idleSpeed;//怠速转速
-    private List<List<String>> relationCurveOfEngineTorqueSpeedAndThrottleOpening;//发动机扭矩、转速和节气门开度关系曲线
-    private String momentOfInertiaOfInputShaft;//输入轴的转动惯量
-    private String momentOfInertiaOfOutputShaft;//输出轴的转动惯量
+    private List<List<String>> relationCurveEngineTorqueSpeedAndThrottleOpening;//发动机扭矩、转速和节气门开度关系曲线
+    private String momentInertiaInputShaft;//输入轴的转动惯量
+    private String momentInertiaOutputShaft;//输出轴的转动惯量
     private String finalDriveRatio;//主减速器传动比
-    private List<String> transmissionEfficiency;//传动效率
+    private String transmissionEfficiency;//传动效率
     private List<String> gearRatio;//R,N,1,2,3,4,5,6
     private List<String> inertia;//R,N,1,2,3,4,5,6
     private List<String> driving;//R,N,1,2,3,4,5,6
@@ -114,8 +114,9 @@ public class VehicleVO {
     private String frontRightWheelBrakingTorque;//右前轮制动力矩
     private String rearRightWheelBrakingTorque;//右后轮制动力矩
     private String steeringType;//转向类型 1 前轮转向 2 后轮转向 3 四轮转向
-    private String steeringGearType;//转向类型 1 齿轮齿条转向器 2 循环球式转向器
-    private String relationCurveBetweenRightWheelAngleAndSteeringGearOutput;//右轮转角与转向器输出的关系
-    private String relationCurveBetweenLeftWheelAngleAndSteeringGearOutput;//左轮转角与转向器输出的关系
+    private String steeringGearType;//转向器类型 1 齿轮齿条转向器 2 循环球式转向器
+    private String steeringGearRatio;//转向器传动比
+    private String relationCurveRightWheelAngleAndSteeringGearOutput;//右轮转角与转向器输出的关系
+    private String relationCurveLeftWheelAngleAndSteeringGearOutput;//左轮转角与转向器输出的关系
 
 }

simulation-resource-common/src/main/java/com/css/simulation/resource/common/controller/ExcelController.java

@@ -22,7 +22,7 @@ public class ExcelController {
             InputStream inputStream = excel.getInputStream();
             Workbook workbook = ExcelUtil.getExcel(inputStream, suffix);
             Sheet sheet = ExcelUtil.getSheetByIndex(workbook, 0);
-            return ExcelUtil.getTable(sheet, 1, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
+            return ExcelUtil.getTable(sheet, 0, Integer.MAX_VALUE, 0, Integer.MAX_VALUE);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/manager/TaskManager.java

@@ -293,8 +293,8 @@ public class TaskManager {
                         taskMapper.updateFailStateWithStopTime(task2Id, DictConstants.TASK_ABORTED, TimeUtil.getNowForMysql(), DictConstants.TASK_ERROR_REASON_5);
                     }
                     // 删除打分使用的文件
-                    FileUtil.rm(result1OfLinux);
-                    FileUtil.rm(result2OfLinux);
+//                    FileUtil.rm(result1OfLinux);
+//                    FileUtil.rm(result2OfLinux);
                 }
             }
 

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

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

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

@@ -12,7 +12,6 @@ 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.apache.tomcat.util.buf.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -46,8 +45,9 @@ public class VehicleService {
     }
 
     public VehiclePO saveVehicle(VehicleVO vehicleVO) {
-        //1 判断参数是 vtd 还是 carsim
+        //1 判断参数是 1 vtd 还是 2 carsim
         String parameterType = vehicleVO.getParameterType();
+
         VehiclePO vehiclePO = new VehiclePO();
         ObjectUtil.voToPo(vehicleVO, vehiclePO);
         //车辆模型字段解析
@@ -64,16 +64,21 @@ public class VehicleService {
             return vehiclePO;
         }
         String id = vehiclePO.getId();
-        if (ObjectUtil.isNull(id)) {//新增
-            vehiclePO.setId(StringUtil.getRandomUUID());
-            vehiclePO.setVehicleCode(StringUtil.getRandomCode());
-            vehicleMapper.insert(vehiclePO);
-            LogUtil.insert();
-        } else {//修改
-            vehicleMapper.update(vehiclePO);
-            LogUtil.update();
+        if("1".equals(parameterType)){
+            if (ObjectUtil.isNull(id)) {//新增
+                vehiclePO.setId(StringUtil.getRandomUUID());
+                vehiclePO.setVehicleCode(StringUtil.getRandomCode());
+                vehicleMapper.insert(vehiclePO);
+                LogUtil.insert();
+            } else {//修改
+                vehicleMapper.update(vehiclePO);
+                LogUtil.update();
+            }
+        }else if("2".equals(parameterType)){
         }
+
         return vehiclePO;
+
     }
 
     public VehiclePO shareVehicle(VehicleVO vehicleVO) {

simulation-resource-server/src/main/java/com/css/simulation/resource/system/service/DictService.java

@@ -32,11 +32,11 @@ public class DictService {
         String dictTypes = param.getDictTypes();
         List<String> dictTypeList = Arrays.asList(dictTypes.split(","));
         if (dictTypeList.size() == 0) {//防止参数为","
-            dictTypeList = new ArrayList<String>();
+            dictTypeList = new ArrayList<>();
             dictTypeList.add("xxx");
         }
         if ("all".equals(dictTypes)) {//关键字all时刷新全部字典
-            dictTypeList = new ArrayList<String>();
+            dictTypeList = new ArrayList<>();
         }
         //数据库取值
         List<DictVO> DictVOlist = dictMapper.getDicts(dictTypeList);