模型禁用

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

@@ -3,8 +3,8 @@ package api.common.pojo.constants;
 public class DictConstants {
 
     // 场景测试包是否被禁用
-    public static final String SCENE_PACKAGE_UNAVAILABLE = "1";
-    public static final String SCENE_PACKAGE_AVAILABLE = "0";
+    public static final String IS_AVAILABLE = "0";
+    public static final String IS_UNAVAILABLE = "1";
 
     //字典缓存目录key
     public static final String BASE_KEY = "DICT:";

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

@@ -2,34 +2,24 @@ package api.common.pojo.po.model;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class CameraPO extends CommonPO {
 
-    //主键id
-    private String id;
-    //传感器编码
-    private String sensorCode;
-    //传感器名称
-    private String sensorName;
-    //传感器描述
-    private String description;
-    //盲区距离
-    private BigDecimal nearDistance;
-    //探测距离
-    private BigDecimal farDistance;
-    //水平现场角
-    private BigDecimal fovH;
-    //垂直现场角
-    private BigDecimal fovV;
-    //分辨率
-    private String resolution;
-    //帧率
-    private BigDecimal frameRate;
-    //是否显示本车（1显示0不显示）
-    private String selfDisplay;
-    //是否分享
-    private String share;
+    private String id;  //主键id
+    private String sensorCode;  //传感器编码
+    private String sensorName;  //传感器名称
+    private String description; //传感器描述
+    private BigDecimal nearDistance;    //盲区距离
+    private BigDecimal farDistance; //探测距离
+    private BigDecimal fovH;    //水平现场角
+    private BigDecimal fovV;    //垂直现场角
+    private String resolution;  //分辨率
+    private BigDecimal frameRate;   //帧率
+    private String selfDisplay; //是否显示本车（1显示0不显示）
+    private String share;   //是否分享
 }

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

@@ -2,22 +2,18 @@ package api.common.pojo.po.model;
 
 import api.common.pojo.common.CommonPO;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ConfigPO extends CommonPO {
-
-    //主键id
-    private String id;
-    //配置编码
-    private String configCode;
-    //配置名称
-    private String configName;
-    //车辆描述
-    private String description;
-    //车辆id
-    private String vehicleId;
-    //是否分享
-    private String share;
-    //车辆（公私有）
-    private String vehicleArray;
+    private String id;  //主键id
+    private String configCode;  //配置编码
+    private String configName;  //配置名称
+    private String description; //车辆描述
+    private String vehicleId;   //车辆id
+    private String share;   //是否分享
+    private String vehicleArray;    //车辆（公私有）
+    private String isUnavailable;    //车辆（公私有）
+    private String sensorId;    // 传感器id
 }

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

@@ -19,17 +19,18 @@ public class ObjectUtil {
     /**
      * 空值判断
      */
+    @SuppressWarnings("all")
     public static boolean isNull(Object obj) {
         boolean isNullFlag = true;
         if (obj != null) {
             if (obj instanceof List) {
-                isNullFlag = isNull((List<?>) obj);
+                isNullFlag = isNull((List) obj);
             } else if (obj instanceof Set) {
-                isNullFlag = isNull((Set<?>) obj);
+                isNullFlag = isNull((Set) obj);
             } else if (obj instanceof Object[]) {
                 isNullFlag = isNull(obj);
             } else if (obj instanceof Map) {
-                isNullFlag = isNull((Map<?, ?>) obj);
+                isNullFlag = isNull((Map) obj);
             } else if (obj instanceof String) {
                 isNullFlag = isNull((String) obj);
             } else if (obj instanceof Integer) {
@@ -269,7 +270,7 @@ public class ObjectUtil {
         }
         return listToTree(list, "0");
     }
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("all")
     public static <T> List<T> listToTree(List<T> list, String root) {
         try {
             List<T> treeList = new LinkedList<>();

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

@@ -31,6 +31,8 @@ public class SensorGpsController {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
+    //* -------------------------------- Comment --------------------------------
+
     /**
      * 获取列表
      */

simulation-resource-server/src/main/java/com/css/simulation/resource/model/mapper/ModelConfigMapper.java

@@ -1,8 +1,10 @@
 package com.css.simulation.resource.model.mapper;
 
+import api.common.pojo.po.model.ConfigPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface ModelConfigMapper {
@@ -10,4 +12,22 @@ public interface ModelConfigMapper {
             "from model_config\n" +
             "where id = #{configId}")
     String selectIsDeletedByConfigId(@Param("configId") String configId);
+
+    @Update("update model_config\n" +
+            "set is_unavailable = #{po.isUnavailable}\n" +
+            "where id in (select config_id\n" +
+            "             from relation_config_sensor\n" +
+            "             where is_deleted = '0'" +
+            "               and sensor_id = #{po.sensorId})")
+    void updateIsUnavailableBySensorId(@Param("po") ConfigPO configPO);
+
+    @Update("update model_config\n" +
+            "set is_unavailable = '1'\n" +
+            "where vehicle_id = #{po.vehicleId}")
+    void updateIsUnavailableByVehicleId(@Param("po") ConfigPO configPO);
+
+    @Select("select is_unavailable\n" +
+            "from model_config\n" +
+            "where id = #{modelConfigId}")
+    String selectIsUnavailableByModelConfigId(@Param("modelConfigId")String modelConfigId);
 }

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

@@ -3,6 +3,7 @@ package com.css.simulation.resource.model.service;
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.CameraParam;
 import api.common.pojo.po.model.CameraPO;
+import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.vo.model.CameraVO;
 import api.common.util.LogUtil;
 import api.common.util.ObjectUtil;
@@ -10,6 +11,7 @@ import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.model.mapper.CameraMapper;
+import com.css.simulation.resource.model.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -20,7 +22,9 @@ import java.util.List;
 public class CameraService {
 
     @Resource
-    CameraMapper cameraMapper;
+    private CameraMapper cameraMapper;
+    @Resource
+    private ModelConfigMapper modelConfigMapper;
 
     public List<CameraVO> getCameraList(CameraParam cameraParam) {
         cameraParam.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -108,6 +112,14 @@ public class CameraService {
     }
 
     public void delCameraById(CameraPO cameraPO) {
+        //1 将传感器相关的车辆配置修改为已禁用
+        ConfigPO configPO = new ConfigPO();
+        configPO.setIsUnavailable(DictConstants.IS_UNAVAILABLE);
+        configPO.setSensorId(cameraPO.getId());
+        configPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        configPO.setModifyTime(TimeUtil.getNowForMysql());
+        modelConfigMapper.updateIsUnavailableBySensorId(configPO);
+        //2 删除传感器
         cameraPO.setIsDeleted(DictConstants.YES);
         cameraPO.setModifyUserId(AuthUtil.getCurrentUserId());
         cameraPO.setModifyTime(TimeUtil.getNowForMysql());

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

@@ -2,6 +2,7 @@ package com.css.simulation.resource.model.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.GpsParam;
+import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.GpsPO;
 import api.common.pojo.vo.model.GpsVO;
 import api.common.util.LogUtil;
@@ -11,6 +12,7 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
 import com.css.simulation.resource.model.mapper.GpsMapper;
+import com.css.simulation.resource.model.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -22,10 +24,19 @@ public class GpsService {
 
     @Resource
     private GpsMapper gpsMapper;
-
+    @Resource
+    private ModelConfigMapper modelConfigMapper;
     //* -------------------------------- 删除 GPS --------------------------------
 
     public void delGpsById(GpsPO gpsPO) {
+        //1 将传感器相关的车辆配置修改为已禁用
+        ConfigPO configPO = new ConfigPO();
+        configPO.setIsUnavailable(DictConstants.IS_UNAVAILABLE);
+        configPO.setSensorId(gpsPO.getId());
+        configPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        configPO.setModifyTime(TimeUtil.getNowForMysql());
+        modelConfigMapper.updateIsUnavailableBySensorId(configPO);
+        //2 删除传感器
         PoUtil.initDelPo(gpsPO);
         gpsMapper.delGpsById(gpsPO);
         LogUtil.delete();

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

@@ -2,6 +2,7 @@ package com.css.simulation.resource.model.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.LidarParam;
+import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.LidarPO;
 import api.common.pojo.vo.model.LidarVO;
 import api.common.util.LogUtil;
@@ -10,17 +11,37 @@ import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.model.mapper.LidarMapper;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.css.simulation.resource.model.mapper.ModelConfigMapper;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.util.List;
 
 @Service
 public class LidarService {
 
-    @Autowired
-    LidarMapper lidarMapper;
+    @Resource
+    private LidarMapper lidarMapper;
+    @Resource
+    private ModelConfigMapper modelConfigMapper;
+
+    public int delLidarById(LidarPO lidarPO) {
+        //1 将传感器相关的车辆配置修改为已禁用
+        ConfigPO configPO = new ConfigPO();
+        configPO.setIsUnavailable(DictConstants.IS_UNAVAILABLE);
+        configPO.setSensorId(lidarPO.getId());
+        configPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        configPO.setModifyTime(TimeUtil.getNowForMysql());
+        modelConfigMapper.updateIsUnavailableBySensorId(configPO);
+        //2 删除传感器
+        lidarPO.setIsDeleted(DictConstants.YES);
+        lidarPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        lidarPO.setModifyTime(TimeUtil.getNowForMysql());
+        int i = lidarMapper.delLidarById(lidarPO);
+        LogUtil.delete();
+        return i;
+    }
 
     public List<LidarVO> getLidarList(LidarParam lidarParam) {
         lidarParam.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -59,17 +80,17 @@ public class LidarService {
         lidarPO.setShare(DictConstants.NO);//私有
         //名称校验
         List<LidarVO> list = lidarMapper.checkLidarName(lidarPO);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) {
             lidarPO.setId(null);
             return lidarPO;
         }
         String id = lidarPO.getId();
-        if(ObjectUtil.isNull(id)){//新增
+        if (ObjectUtil.isNull(id)) {//新增
             lidarPO.setId(StringUtil.getRandomUUID());
             lidarPO.setSensorCode(StringUtil.getRandomCode());
             lidarMapper.insert(lidarPO);
             LogUtil.insert();
-        }else{//修改
+        } else {//修改
             lidarMapper.update(lidarPO);
             LogUtil.update();
         }
@@ -83,7 +104,7 @@ public class LidarService {
         lidarPO.setCreateUserId(null);
         //名称校验
         List<LidarVO> list = lidarMapper.checkLidarName(lidarPO);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) {
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
             lidarPO.setId(list.get(0).getId());
@@ -91,7 +112,7 @@ public class LidarService {
             lidarPO.setModifyTime(currentTime);
             lidarMapper.update(lidarPO);
             LogUtil.update();
-        }else {
+        } else {
             //常规字段赋值
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
@@ -108,12 +129,5 @@ public class LidarService {
         return lidarPO;
     }
 
-    public int delLidarById(LidarPO lidarPO) {
-        lidarPO.setIsDeleted(DictConstants.YES);
-        lidarPO.setModifyUserId(AuthUtil.getCurrentUserId());
-        lidarPO.setModifyTime(TimeUtil.getNowForMysql());
-        int i = lidarMapper.delLidarById(lidarPO);
-        LogUtil.delete();
-        return i;
-    }
+
 }

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

@@ -3,6 +3,7 @@ package com.css.simulation.resource.model.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.OgtParam;
+import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.OgtPO;
 import api.common.pojo.vo.model.OgtVO;
 import api.common.util.LogUtil;
@@ -10,25 +11,45 @@ import api.common.util.ObjectUtil;
 import api.common.util.StringUtil;
 import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
+import com.css.simulation.resource.model.mapper.ModelConfigMapper;
 import com.css.simulation.resource.model.mapper.OgtMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.util.List;
 
 @Service
 public class OgtService {
 
-    @Autowired
-    OgtMapper ogtMapper;
+    @Resource
+    private OgtMapper ogtMapper;
+    @Resource
+    private ModelConfigMapper modelConfigMapper;
+
+
+    public int delOgtById(OgtPO ogtPO) {
+        //1 将传感器相关的车辆配置修改为已禁用
+        ConfigPO configPO = new ConfigPO();
+        configPO.setIsUnavailable(DictConstants.IS_UNAVAILABLE);
+        configPO.setSensorId(ogtPO.getId());
+        configPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        configPO.setModifyTime(TimeUtil.getNowForMysql());
+        modelConfigMapper.updateIsUnavailableBySensorId(configPO);
+        //2 删除传感器
+        ogtPO.setIsDeleted(DictConstants.YES);
+        ogtPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        ogtPO.setModifyTime(TimeUtil.getNowForMysql());
+        int i = ogtMapper.delOgtById(ogtPO);
+        LogUtil.delete();
+        return i;
+    }
 
 
     public List<OgtVO> getOgtList(OgtParam ogtParam) {
         ogtParam.setCreateUserId(AuthUtil.getCurrentUserId());
         ogtParam.setShare(null);
-        List<OgtVO> list = ogtMapper.getOgtList(ogtParam);
-        return list;
+        return ogtMapper.getOgtList(ogtParam);
     }
 
     public List<OgtVO> getMyOgtList(OgtParam ogtParam) {
@@ -109,12 +130,4 @@ public class OgtService {
         return ogtPO;
     }
 
-    public int delOgtById(OgtPO ogtPO) {
-        ogtPO.setIsDeleted(DictConstants.YES);
-        ogtPO.setModifyUserId(AuthUtil.getCurrentUserId());
-        ogtPO.setModifyTime(TimeUtil.getNowForMysql());
-        int i = ogtMapper.delOgtById(ogtPO);
-        LogUtil.delete();
-        return i;
-    }
 }

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

@@ -2,12 +2,14 @@ package com.css.simulation.resource.model.service;
 
 import api.common.pojo.constants.DictConstants;
 import api.common.pojo.param.model.VehicleParam;
+import api.common.pojo.po.model.ConfigPO;
 import api.common.pojo.po.model.VehiclePO;
 import api.common.pojo.vo.model.VehicleGSVO;
 import api.common.pojo.vo.model.VehicleVO;
 import api.common.util.*;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.feign.FileDownService;
+import com.css.simulation.resource.model.mapper.ModelConfigMapper;
 import com.css.simulation.resource.model.mapper.VehicleMapper;
 import com.css.simulation.resource.util.VehicleUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -25,15 +27,36 @@ import java.util.*;
 @Slf4j
 @Service
 public class VehicleService {
-
-    @Resource
-    VehicleMapper vehicleMapper;
-    @Resource
-    FileDownService fileDownService;
     @Value("${par.template}")
-    String parTemplate;
+    private String parTemplate;
     @Value("${par.temp}")
-    String parTemp;
+    private String parTemp;
+    @Resource
+    private VehicleMapper vehicleMapper;
+    @Resource
+    private FileDownService fileDownService;
+    @Resource
+    private ModelConfigMapper modelConfigMapper;
+
+    //* -------------------------------- Comment --------------------------------
+    public void delVehicleById(VehiclePO vehiclePO) {
+        //1 将车辆相关的车辆配置修改为已禁用
+        ConfigPO configPO = new ConfigPO();
+        configPO.setIsUnavailable(DictConstants.IS_UNAVAILABLE);
+        configPO.setVehicleId(vehiclePO.getId());
+        configPO.setModifyUserId(AuthUtil.getCurrentUserId());
+        configPO.setModifyTime(TimeUtil.getNowForMysql());
+        modelConfigMapper.updateIsUnavailableByVehicleId(configPO);
+        //2 删除车辆
+        String currentUserId = AuthUtil.getCurrentUserId();
+        Timestamp currentTime = TimeUtil.getNowForMysql();
+        vehiclePO.setModifyUserId(currentUserId);
+        vehiclePO.setModifyTime(currentTime);
+        vehiclePO.setIsDeleted(DictConstants.YES);
+        LogUtil.delete();
+        vehicleMapper.delVehicleById(vehiclePO);
+    }
+    //* -------------------------------- Comment --------------------------------
 
     public List<VehicleVO> getVehicleList(VehicleParam vehicleParam) {
         vehicleParam.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -62,8 +85,8 @@ public class VehicleService {
         log.info("车辆 vo 为：" + vehicleVO);
         VehiclePO vehiclePO = ObjectUtil.vehicleVoToVehiclePo(vehicleVO);
         //车辆模型字段解析
-        if(ObjectUtil.isNotNull(vehicleVO.getVehicleType())){
-        vehiclePO.setVehicleType(StringUtils.join(Arrays.asList(vehicleVO.getVehicleType()), ','));
+        if (ObjectUtil.isNotNull(vehicleVO.getVehicleType())) {
+            vehiclePO.setVehicleType(StringUtils.join(Arrays.asList(vehicleVO.getVehicleType()), ','));
         }
         //常规字段赋值
         String currentUserId = AuthUtil.getCurrentUserId();
@@ -88,7 +111,7 @@ public class VehicleService {
             if ("0".equals(vehicleVO.getSaveOrShare())) {
                 VehicleUtil.listToJson(vehiclePO);
             }
-            if ("1".equals(vehicleVO.getSaveOrShare())){
+            if ("1".equals(vehicleVO.getSaveOrShare())) {
                 VehicleUtil.jsonToList(vehicleVO);
             }
             String par = FileUtil.read(parTemplate);
@@ -296,16 +319,6 @@ public class VehicleService {
     }
 
 
-    public void delVehicleById(VehiclePO vehiclePO) {
-        String currentUserId = AuthUtil.getCurrentUserId();
-        Timestamp currentTime = TimeUtil.getNowForMysql();
-        vehiclePO.setModifyUserId(currentUserId);
-        vehiclePO.setModifyTime(currentTime);
-        vehiclePO.setIsDeleted(DictConstants.YES);
-        LogUtil.delete();
-        vehicleMapper.delVehicleById(vehiclePO);
-    }
-
     public VehicleVO parsePar(String par) {
 
         try {
@@ -676,14 +689,14 @@ public class VehicleService {
 
 
     //新增共有、私有
-    public List<VehicleGSVO>  getMyVehicleListNew() {
-        List<VehicleVO> listGy=vehicleMapper.selectPrivateAndPublicByCreateUserIdGy(AuthUtil.getCurrentUserId());
-        List<VehicleVO> listSy=vehicleMapper.selectPrivateAndPublicByCreateUserIdSy(AuthUtil.getCurrentUserId());
-        List<VehicleGSVO>  listAll=new ArrayList<>();
-        VehicleGSVO vo=new VehicleGSVO();
+    public List<VehicleGSVO> getMyVehicleListNew() {
+        List<VehicleVO> listGy = vehicleMapper.selectPrivateAndPublicByCreateUserIdGy(AuthUtil.getCurrentUserId());
+        List<VehicleVO> listSy = vehicleMapper.selectPrivateAndPublicByCreateUserIdSy(AuthUtil.getCurrentUserId());
+        List<VehicleGSVO> listAll = new ArrayList<>();
+        VehicleGSVO vo = new VehicleGSVO();
         vo.setLabel("公有");
         vo.setOptions(listGy);
-        VehicleGSVO vo1=new VehicleGSVO();
+        VehicleGSVO vo1 = new VehicleGSVO();
         vo1.setLabel("私有");
         vo1.setOptions(listSy);
         listAll.add(vo1);
@@ -692,17 +705,17 @@ public class VehicleService {
     }
 
     //新增共有、私有
-    public List  getMyVehicleListNew1() {
+    public List getMyVehicleListNew1() {
         List<Map> treeList = new ArrayList<>();
-        List<VehicleVO> listGy=vehicleMapper.selectPrivateAndPublicByCreateUserIdGy(AuthUtil.getCurrentUserId());
-        List<VehicleVO> listSy=vehicleMapper.selectPrivateAndPublicByCreateUserIdSy(AuthUtil.getCurrentUserId());
+        List<VehicleVO> listGy = vehicleMapper.selectPrivateAndPublicByCreateUserIdGy(AuthUtil.getCurrentUserId());
+        List<VehicleVO> listSy = vehicleMapper.selectPrivateAndPublicByCreateUserIdSy(AuthUtil.getCurrentUserId());
         Map typeMap = new HashMap();
         typeMap.put("code", "公有");
         typeMap.put("name", "公有");
         List<Map> colourList = new LinkedList();
         listGy.forEach(vo -> {
             Map colourMap = new HashMap();
-            colourMap.put("code",vo.getId());
+            colourMap.put("code", vo.getId());
             colourMap.put("name", vo.getVehicleName());
             colourMap.put("vo", vo);
             colourList.add(colourMap);
@@ -714,12 +727,12 @@ public class VehicleService {
         List<Map> colourList1 = new LinkedList();
         listSy.forEach(vo -> {
             Map colourMap = new HashMap();
-            colourMap.put("code",vo.getId());
+            colourMap.put("code", vo.getId());
             colourMap.put("name", vo.getVehicleName());
             colourMap.put("vo", vo);
             colourList1.add(colourMap);
         });
-        typeMap1.put("children",colourList1 );
+        typeMap1.put("children", colourList1);
         treeList.add(typeMap);
         treeList.add(typeMap1);
         return treeList;

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -967,12 +967,12 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
         if (isEmpty(param.getDropDownType())) {
             //获取全部（算法，车辆，场景）
             setAlgorithmDropDownNew(result, param.getAlgorithmType());
-            setVehicleDropDownNew(result, null);
+            setVehicleDropDownNew(result);
             setScenePackageDropDownNew(result);
         } else if ("1".equals(param.getDropDownType())) {
             setAlgorithmDropDownNew(result, param.getAlgorithmType());
         } else if ("2".equals(param.getDropDownType())) {
-            setVehicleDropDownNew(result, null);
+            setVehicleDropDownNew(result);
         } else if ("3".equals(param.getDropDownType())) {
             setScenePackageDropDownNew(result);
         }
@@ -5180,12 +5180,9 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
 
     }
 
-    private void setVehicleDropDownNew(List<DropDownTypeNewVo> result, String ConfigId) {
+    private void setVehicleDropDownNew(List<DropDownTypeNewVo> result) {
         List<Map> treeList = new ArrayList<>();
         ConfigPO configPO = new ConfigPO();
-        if (StringUtil.isNotEmpty(ConfigId)) {
-            configPO.setId(ConfigId);
-        }
         configPO.setCreateUserId(AuthUtil.getCurrentUserId());
         List<ConfigPO> vehicleBaseInfoSyVo = simulationProjectMapper.selectConfigVehicleSy(configPO);
         List<DropDownVo> vehicleSyList = new ArrayList<>();

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

@@ -83,32 +83,40 @@ public class ProjectUtil {
     }
 
     public void checkProject(String algorithmId, String vehicleConfigId, String scenePackageId) {
+        //* -------------------------------- Comment --------------------------------
         log.info("1 检查算法是否被删除：" + algorithmId);
         if (DictConstants.IS_DELETED.equals(algorithmMapper.selectIsDeletedById(algorithmId))) {
             throw new RuntimeException("项目所使用算法已被删除。");
         }
-        log.info("2 查询车辆配置是否被删除：" + vehicleConfigId);
+        //* -------------------------------- Comment --------------------------------
+        log.info("1 查询车辆配置是否被删除：" + vehicleConfigId);
         if (DictConstants.IS_DELETED.equals(modelConfigMapper.selectIsDeletedByConfigId(vehicleConfigId))) {
             throw new RuntimeException("项目所使用的车辆配置已被删除。");
         }
+        log.info("2 查询车辆配置是否被禁用：" + vehicleConfigId);
+        final String isUnavailable1 = modelConfigMapper.selectIsUnavailableByModelConfigId(vehicleConfigId);
+        if (DictConstants.IS_UNAVAILABLE.equals(isUnavailable1)) {
+            throw new RuntimeException("车辆配置已被禁用。");
+        }
         log.info("3 查询车辆配置中是否存在车辆模型：" + vehicleConfigId);
         final String vehicleIsDeleted = modelVehicleMapper.selectIsDeletedByConfigId(vehicleConfigId);
         if (DictConstants.IS_DELETED.equals(vehicleIsDeleted)) {
             throw new RuntimeException("车辆配置绑定的动力学配置已被删除。");
         }
-        log.info("4 查询场景测试包是否被删除：" + scenePackageId);
+        //* -------------------------------- Comment --------------------------------
+        log.info("1 查询场景测试包是否被删除：" + scenePackageId);
         String packageIsDeleted = scenePackageMapper.selectIsDeletedByPackageId(scenePackageId);
         if (DictConstants.IS_DELETED.equals(packageIsDeleted)) {
             throw new RuntimeException("场景测试包已被删除。");
         }
-        log.info("5 查询场景测试包是否被禁用：" + scenePackageId);
-        String isUnavailable = scenePackageMapper.selectIsUnavailableByPackageId(scenePackageId);
-        if (DictConstants.SCENE_PACKAGE_UNAVAILABLE.equals(isUnavailable)) {
+        log.info("2 查询场景测试包是否被禁用：" + scenePackageId);
+        String isUnavailable2 = scenePackageMapper.selectIsUnavailableByPackageId(scenePackageId);
+        if (DictConstants.IS_UNAVAILABLE.equals(isUnavailable2)) {
             throw new RuntimeException("场景测试包已被禁用，编辑场景测试包后可重新运行。");
         }
-        log.info("6 查询评分规则是否被删除。");
+        log.info("3 查询评分规则是否被删除。");
         sceneUtil.checkRules(scenePackageId);
-        log.info("7 查询场景测试包是否有场景。");
+        log.info("4 查询场景测试包是否有场景。");
         final int sceneNum = scenePackageSublistMapper.selectSceneNumByPackageId(scenePackageId);
         if (sceneNum == 0) {
             throw new RuntimeException("场景测试包内的场景已被全部删除，请添加场景。");

simulation-resource-server/src/main/resources/mapper/project/SimulationProjectMapper.xml

@@ -65,8 +65,7 @@
                 #{isDeleted,jdbcType=VARCHAR},
                 #{algorithmArray,jdbcType=VARCHAR},
                 #{vehicleArray,jdbcType=VARCHAR},
-                #{sceneArray,jdbcType=VARCHAR}
-                )
+                #{sceneArray,jdbcType=VARCHAR})
     </insert>
 
     <!--修改-->
@@ -81,9 +80,9 @@
             max_simulation_time = #{maxSimulationTime,jdbcType=BIGINT},
             parallelism         = #{parallelism,jdbcType=VARCHAR},
             is_choice_gpu       = #{isChoiceGpu,jdbcType=VARCHAR},
-            algorithm_array       = #{algorithmArray,jdbcType=VARCHAR},
+            algorithm_array     = #{algorithmArray,jdbcType=VARCHAR},
             vehicle_array       = #{vehicleArray,jdbcType=VARCHAR},
-            scene_array       = #{sceneArray,jdbcType=VARCHAR}
+            scene_array         = #{sceneArray,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
           and is_deleted = '0'
     </update>
@@ -286,9 +285,9 @@
     <!--获取算法基本信息 /*where a.share = '0' and a.is_deleted = '0'*/-->
     <select id="selectAlgorithmBaseInfoById" resultType="api.common.pojo.po.algorithm.AlgorithmPO">
         select id, algorithm_name, description,share from(
-         select a.id, a.algorithm_name, a.description,a.share,a.modify_time
+        select a.id, a.algorithm_name, a.description,a.share,a.modify_time
         from algorithm a
-        where  a.is_deleted = '0' and share='0'
+        where a.is_deleted = '0' and share='0'
         <if test="id != null and id != ''">
             and a.id = #{id,jdbcType=VARCHAR}
         </if>
@@ -298,9 +297,9 @@
         <if test="uploadMode != null and uploadMode != ''">
             and upload_mode = #{uploadMode,jdbcType=VARCHAR}
         </if>
-        union  select b.id, b.algorithm_name,b.description,b.share,b.modify_time
+        union select b.id, b.algorithm_name,b.description,b.share,b.modify_time
         from algorithm b
-        where  b.is_deleted = '0' and b.share='1'
+        where b.is_deleted = '0' and b.share='1'
         <if test="uploadMode != null and uploadMode != ''">
             and upload_mode = #{uploadMode,jdbcType=VARCHAR}
         </if>
@@ -321,7 +320,7 @@
     <select id="selectConfigVehicle" resultType="api.common.pojo.po.model.ConfigPO">
         select id, config_name, vehicle_id, description,share
         from model_config
-        where  is_deleted = '0'
+        where is_deleted = '0'
         <if test="id != null and id != ''">
             and id = #{id,jdbcType=VARCHAR}
         </if>
@@ -335,7 +334,7 @@
         select id, config_name, vehicle_id, description,share from(
         select id, config_name, vehicle_id, description,share,modify_time
         from model_config
-        where  is_deleted = '0' and share='0'
+        where is_deleted = '0' and share='0'
         <if test="id != null and id != ''">
             and id = #{id,jdbcType=VARCHAR}
         </if>
@@ -344,7 +343,7 @@
         </if>
         union select id, config_name, vehicle_id, description,share,modify_time
         from model_config
-        where  is_deleted = '0' and share='1')c order by c.share ,c.modify_time desc
+        where is_deleted = '0' and share='1')c order by c.share ,c.modify_time desc
     </select>
 
     <!--查询车辆配置传感器信息-->
@@ -460,7 +459,8 @@
     </select>
 
     <!--根据场景包id获取场景子集-->
-    <select id="selectSubSceneByPid" parameterType="string" resultType="api.common.pojo.vo.project.ScenePackageSubListVO">
+    <select id="selectSubSceneByPid" parameterType="string"
+            resultType="api.common.pojo.vo.project.ScenePackageSubListVO">
         select sublist_id,
                sublist_name,
                scene_num,
@@ -700,7 +700,7 @@
     <select id="selectAlgorithmBaseInfoByIdSy" resultType="api.common.pojo.po.algorithm.AlgorithmPO">
         select id, algorithm_name, description,share,modify_time
         from algorithm
-        where  is_deleted = '0' and share='0'
+        where is_deleted = '0' and share='0'
         <if test="id != null and id != ''">
             and id = #{id,jdbcType=VARCHAR}
         </if>
@@ -710,31 +710,36 @@
         <if test="uploadMode != null and uploadMode != ''">
             and upload_mode = #{uploadMode,jdbcType=VARCHAR}
         </if>
-         order by modify_time desc
+        order by modify_time desc
     </select>
     <!--获取算法基本信息 /*where a.share = '0' and a.is_deleted = '0'*/-->
     <select id="selectAlgorithmBaseInfoByIdGy" resultType="api.common.pojo.po.algorithm.AlgorithmPO">
 
-          select id, algorithm_name,description,share,modify_time
+        select id, algorithm_name,description,share,modify_time
         from algorithm
-        where  is_deleted = '0' and share='1'
+        where is_deleted = '0' and share='1'
         <if test="uploadMode != null and uploadMode != ''">
             and upload_mode = #{uploadMode,jdbcType=VARCHAR}
         </if>
-         order by modify_time desc
+        order by modify_time desc
     </select>
 
     <!--获取车辆配置信息-->
     <select id="selectConfigVehicleGy" resultType="api.common.pojo.po.model.ConfigPO">
-        select a.id, a.config_name, a.vehicle_id, a.description,a.share,a.modify_time
-        from model_config a left join model_vehicle b on a.vehicle_id=b.id
-        where a.is_deleted = '0' and a.share='1' and b.is_deleted='0'   order by a.modify_time desc
+        select a.id, a.config_name, a.vehicle_id, a.description, a.share, a.modify_time
+        from model_config a
+                 left join model_vehicle b on a.vehicle_id = b.id
+        where a.is_deleted = '0'
+          and a.is_unavailable = '0'
+          and a.share = '1'
+          and b.is_deleted = '0'
+        order by a.modify_time desc
     </select>
     <select id="selectConfigVehicleSy" resultType="api.common.pojo.po.model.ConfigPO">
 
         select a.id, a.config_name, a.vehicle_id, a.description,a.share,a.modify_time
         from model_config a left join model_vehicle b on a.vehicle_id=b.id
-        where a.is_deleted = '0' and a.share='0' and b.is_deleted='0'
+        where a.is_deleted = '0' and a.is_unavailable = '0' and a.share='0' and b.is_deleted='0'
         <if test="id != null and id != ''">
             and a.id = #{id,jdbcType=VARCHAR}
         </if>
@@ -746,9 +751,12 @@
     <!--获取场景包基本信息-->
     <select id="selectScenePackageBaseByIdGy" resultType="api.common.pojo.po.scene.ScenePackagePO">
 
-        select package_id,package_name, scene_num,share,modify_time
-        from scene_package where share = '1' and is_deleted = '0'  and is_unavailable = '0'
-         order by modify_time desc
+        select package_id, package_name, scene_num, share, modify_time
+        from scene_package
+        where share = '1'
+          and is_deleted = '0'
+          and is_unavailable = '0'
+        order by modify_time desc
     </select>
     <!--获取场景包基本信息-->
     <select id="selectScenePackageBaseByIdSy" resultType="api.common.pojo.po.scene.ScenePackagePO">