车辆名称公有私有分组

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

@@ -18,4 +18,6 @@ public class ConfigPO extends CommonPO {
     private String vehicleId;
     //是否分享
     private String share;
+    //车辆（公私有）
+    private String vehicleArray;
 }

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

@@ -33,5 +33,10 @@ public class ConfigVO {
     private Map<String,String> sensorCount;
     //传感器配置列表
     private Map<String,List<ConfigSensorVO>> configSensors;
+    //车辆（公私有）
+    private String[] vehicleArrayS;
+    //车辆（公私有）
+    private String vehicleArray;
+
 
 }

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

@@ -78,6 +78,7 @@ public class ConfigService {
         List<ConfigSensorVO> sensorList = configMapper.getConfigSensors(configVO);
         Map<String, List<ConfigSensorVO>> configSensors = sensorList.stream().collect(Collectors.groupingBy(ConfigSensorVO::getSensorType));
         configVO.setConfigSensors(configSensors);
+        configVO.setVehicleArrayS(configVO.getVehicleArray().split(","));
         return configVO;
     }
 
@@ -93,6 +94,7 @@ public class ConfigService {
         configPO.setModifyTime(currentTime);
         configPO.setIsDeleted(DictConstants.NO);
         configPO.setShare(DictConstants.NO);//私有
+        configPO.setVehicleArray(configVO.getVehicleArrayS().toString());
         //单独处理配置描述
         configPO.setDescription(configVO.getConfigDescription());
         //名称校验

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

@@ -700,8 +700,8 @@ public class VehicleService {
         List<Map> colourList = new LinkedList();
         listGy.forEach(vo -> {
             Map colourMap = new HashMap();
-            colourMap.put("code","公有");
-            colourMap.put("name", "公有");
+            colourMap.put("code",vo.getId());
+            colourMap.put("name", vo.getVehicleName());
             colourMap.put("vo", vo);
             colourList.add(colourMap);
         });
@@ -712,8 +712,8 @@ public class VehicleService {
         List<Map> colourList1 = new LinkedList();
         listSy.forEach(vo -> {
             Map colourMap = new HashMap();
-            colourMap.put("code","私有");
-            colourMap.put("name", "私有");
+            colourMap.put("code",vo.getId());
+            colourMap.put("name", vo.getVehicleName());
             colourMap.put("vo", vo);
             colourList1.add(colourMap);
         });

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

@@ -55,6 +55,7 @@
             c.description as configDescription,
             c.vehicle_id,
             c.share,
+            c.vehicle_array,
             v.vehicle_name,
             v.description as vehicleDescription,
             v.vehicle_front_view,
@@ -130,7 +131,8 @@
             modify_time,
             create_user_id,
             modify_user_id,
-            is_deleted
+            is_deleted,
+            vehicle_array
         )
         values(
             #{id,jdbcType=VARCHAR},
@@ -143,7 +145,8 @@
             #{modifyTime,jdbcType=TIMESTAMP},
             #{createUserId,jdbcType=VARCHAR},
             #{modifyUserId,jdbcType=VARCHAR},
-            #{isDeleted,jdbcType=VARCHAR}
+            #{isDeleted,jdbcType=VARCHAR},
+            #{vehicleArray,jdbcType=VARCHAR}
         )
     </insert>