场景上传任务删除bug

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

@@ -1,7 +1,10 @@
 package api.common.pojo.constants;
 
+@SuppressWarnings("all")
 public class DictConstants {
 
+    public static final String PROJECT_WAIT_TYPE_EXECUTE = "1";  // 等待执行
+    public static final String PROJECT_WAIT_TYPE_EXPAND = "2";  // 等待扩充
     public static final String LICENSE_TYPE_SIMULATION = "1";
     public static final String LICENSE_TYPE_DYNAMIC = "2";
     public static final String MODEL_TYPE_VTD = "1";
@@ -75,7 +78,6 @@ public class DictConstants {
     public static final String SCENE_GENERAL = "4";    // 泛化场景
 
 
-//    当前运行状态(10：未执行，20：执行中，30：执行完成，40：已终止 50 执行出错)
 
     public static final String PROJECT_WAITING = "10"; // 项目执行状态，待执行
     public static final String PROJECT_RUNNING = "20"; // 项目执行状态，执行中

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

@@ -13,7 +13,7 @@ public class CollectionUtil {
     }
 
     public static <T> List<T> arrayToList(T[] array) {
-        return Arrays.asList(array);
+        return new ArrayList<>(Arrays.asList(array));
     }
 
 
@@ -41,7 +41,15 @@ public class CollectionUtil {
     }
 
     public static List<String> sequenceStringToList(String sequenceString, String regex) {
-        return Arrays.asList(sequenceString.split(regex));
+        if (sequenceString == null || "".equals(sequenceString)) {
+            throw new RuntimeException("字符串" + sequenceString + "为空。");
+        } else {
+            if (sequenceString.contains(regex)) {
+                return arrayToList(sequenceString.split(regex));
+            } else {
+                return createArrayList(sequenceString);
+            }
+        }
     }
 
 

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

@@ -6,7 +6,6 @@ import api.common.pojo.po.scene.ScenePackageSublistPO;
 import api.common.pojo.vo.scene.ScenePackageSublistVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -23,9 +22,7 @@ public interface ScenePackageSublistMapper {
     List<String> selectPackageIdById(SceneDeleteParam param);
     List<ScenePackageSublistPO> selectPackageFhById(SceneDeleteParam param);
     void updateScenePackageSublistById(SceneDeleteParam param);
-    @Select("select sum(scene_num)\n" +
+
-            "from scene_package_sublist\n" +
-            "where root_id = #{scenePackageId}")
     int selectSceneNumByPackageId(@Param("scenePackageId")String scenePackageId);
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/scene/service/scene/SceneStandardsService.java

@@ -224,9 +224,7 @@ public class SceneStandardsService {
                     final String sceneId = iterator.next();
                     if (sceneIds.contains(sceneId)) {
                         iterator.remove();
-                        testPackages.forEach(testPackage -> {
+                        testPackages.forEach(testPackage -> testPackage.setSceneNum(testPackage.getSceneNum() - 1));
-                            testPackage.setSceneNum(testPackage.getSceneNum() - 1);
-                        });
                     }
                 }
                 index.setSceneNum(sceneNaturalIds.size() + sceneTrafficIds.size() + sceneStatueIds.size() + sceneGeneralizationIds.size());

simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/SceneImportMapper.java

@@ -27,34 +27,4 @@ public interface SceneImportMapper {
 
     void deleteImportTask(SceneImportPO po);
 
-    @Update("update scene_natural\n" +
-            "set is_deleted = '1',\n" +
-            "    modify_user_id = #{po.modifyUserId},\n" +
-            "    modify_time = #{po.modifyTime}\n" +
-            "where natural_name in (select scene_names\n" +
-            "                       from scene_import_task\n" +
-            "                       where id = #{po.id}\n" +
-            ")")
-    void deleteNaturalByTaskId(@Param("po") SceneImportPO sceneImportPO);
-
-    @Update("update scene_standards_regulations\n" +
-            "set is_deleted = '1',\n" +
-            "    modify_user_id = #{po.modifyUserId},\n" +
-            "    modify_time = #{po.modifyTime}\n" +
-            "where scene_name in (select scene_names\n" +
-            "                       from scene_import_task\n" +
-            "                       where id = #{po.id}\n" +
-            ")")
-    void deleteStandardsByTaskId(@Param("po") SceneImportPO sceneImportPO);
-
-    @Update("update scene_accident\n" +
-            "set is_deleted = '1',\n" +
-            "    modify_user_id = #{po.modifyUserId},\n" +
-            "    modify_time = #{po.modifyTime}\n" +
-            "where scene_name in (select scene_names\n" +
-            "                       from scene_import_task\n" +
-            "                       where id = #{po.id}\n" +
-            ")")
-    void deleteAccidentByTaskId(@Param("po") SceneImportPO sceneImportPO);
-
 }

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

@@ -123,7 +123,6 @@ public class SceneImportService {
                 sceneNaturalService.deleteSceneNatural(sceneNames);
             } else if (DictConstants.SCENE_STANDARD.equals(sceneType)) {
                 sceneStandardsService.deleteStandardsRegulations(sceneNames);
-                sceneImportMapper.deleteStandardsByTaskId(sceneImportPO);
             } else if (DictConstants.SCENE_ACCIDENT.equals(sceneType)) {
                 sceneAccidentService.deleteSceneAccidentList(sceneNames);
             } else if (DictConstants.SCENE_GENERAL.equals(sceneType)) {

simulation-resource-server/src/main/resources/mapper/scene/ScenePackageSublistMapper.xml

@@ -191,20 +191,25 @@
         select sublist_id, scene_natural_ids, scene_traffic_ids, scene_statue_ids, scene_generalization_ids
         from scene_package_sublist
         where is_deleted = '0' and
-        <if test="sceneType = '1'">
+        <if test='sceneType == "1"'>
             <foreach item="item" collection="sceneIds" separator=" or " open="(" close=")">
                 scene_natural_ids like concat('%',#{item},'%')
             </foreach>
         </if>
-        <if test="sceneType = '2'">
+        <if test='sceneType == "2"'>
             <foreach item="item" collection="sceneIds" separator=" or " open="(" close=")">
                 scene_statue_ids like concat('%',#{item},'%')
             </foreach>
         </if>
-        <if test="sceneType = '3'">
+        <if test='sceneType == "3"'>
             <foreach item="item" collection="sceneIds" separator=" or " open="(" close=")">
                 scene_traffic_ids like concat('%',#{item},'%')
             </foreach>
         </if>
     </select>
+    <select id="selectSceneNumByPackageId" resultType="java.lang.Integer">
+        select sum(scene_num)
+        from scene_package_sublist
+        where root_id = #{scenePackageId}
+    </select>
 </mapper>