车辆模型默认参数排序

api-common/src/main/java/api/common/pojo/constants/DictConstants.java

@@ -14,6 +14,7 @@ public class DictConstants {
     public static final String MODEL_LABEL = "modelLabel";//车辆模型
     public static final String VEHICLE_TYPE = "vehicleType";//车辆类型
     public static final String DRIVE_TYPE = "driveType";//驱动方式
+    public static final String FRAME_RATE = "frameRate";//帧率
     public static final String COORDINATE = "coordinate";//坐标系
     public static final String TARGET_FILTER = "targetFilter";//目标物筛选
     public static final String REGULATION_TYPE = "regulationType"; // 法规类型

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

@@ -61,4 +61,6 @@ public class VehicleTempVO {
     private BigDecimal wheelbase;
     //是否启用
     private String valid;
+    //序号
+    private int sort;
 }

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

@@ -7,10 +7,7 @@ import com.css.simulation.resource.model.mapper.VehicleTempMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -22,14 +19,14 @@ public class VehicleTempService {
 
     public Object getVehicleTempTree() {
         List<VehicleTempVO> list = vehicleTempMapper.getVehicleTempTree();
-        List<Object> treeList = new LinkedList<>();
-        Map<String, List<VehicleTempVO>> typeCollect = list.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleType));
+        List<Map> treeList = new ArrayList<>();
+        Map<String, List<VehicleTempVO>> typeCollect = list.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleType,LinkedHashMap::new, Collectors.toList()));
         typeCollect.forEach((typeKey,typeValue)->{
             Map typeMap = new HashMap();
             typeMap.put("code",typeKey);
             typeMap.put("name",typeValue.get(0).getVehicleName());
             List<Object> modelList = new LinkedList();
-            Map<String, List<VehicleTempVO>> modelCollect = typeValue.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleModel));
+            Map<String, List<VehicleTempVO>> modelCollect = typeValue.stream().collect(Collectors.groupingBy(VehicleTempVO::getVehicleModel,LinkedHashMap::new, Collectors.toList()));
             modelCollect.forEach((modelKey,modelValue)->{
                 Map modelMap = new HashMap();
                 modelMap.put("code",modelKey);