mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/mapper/ScenePackageMapper.java

@@ -63,6 +63,9 @@ public interface ScenePackageMapper {
     @Select("select is_unavailable from scene_package where package_id = #{packageId}")
     String selectIsUnavailableByPackageId(@Param("packageId") String packageId);
 
+    @Select("select is_deleted from scene_package where package_id = #{packageId}")
+    String selectIsDeletedByPackageId(@Param("packageId") String packageId);
+
     @Update("update scene_package\n" +
             "set scene_num = scene_num - 1\n" +
             "where package_id in\n" +

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

@@ -96,14 +96,19 @@ public class ProjectUtil {
         if (DictConstants.IS_DELETED.equals(vehicleIsDeleted)) {
             throw new RuntimeException("车辆配置绑定的动力学配置已被删除。");
         }
-        log.info("4 查询场景测试包是否被禁用：" + scenePackageId);
+        log.info("4 查询场景测试包是否被删除：" + 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)) {
             throw new RuntimeException("场景测试包已被禁用，编辑场景测试包后可重新运行。");
         }
-        log.info("5 查询评分规则是否被删除。");
+        log.info("6 查询评分规则是否被删除。");
         scenePackageUtil.checkRules(scenePackageId);
-        log.info("6 查询场景测试包是否有场景。");
+        log.info("7 查询场景测试包是否有场景。");
         final int sceneNum = scenePackageSublistMapper.selectSceneNumByPackageId(scenePackageId);
         if (sceneNum == 0) {
             throw new RuntimeException("场景测试包内的场景已被全部删除，请添加场景。");