删除场景上传任务

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

@@ -30,10 +30,13 @@ public class CollectionUtil {
     public static <T> Set<T> listToSet(List<T> list) {
         return new HashSet<>(list);
     }
+
     public static <E> String listToSequence(List<E> list) {
         StringBuilder stringBuilder = new StringBuilder();
         list.forEach(element -> stringBuilder.append(element).append(","));
-        stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+        if (list.size() != 0) {
+            stringBuilder.deleteCharAt(stringBuilder.length() - 1);
+        }
         return stringBuilder.toString();
     }
 

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

@@ -394,20 +394,32 @@ public class SceneAccidentService {
                     .build());
             //2 根据指标ID查询场景测试包
             List<ScenePackagePO> testPackages = scenePackageMapper.selectByIndexIds(ScenePackageParam.builder()
-                    .indexIds(indexes.stream().map(ScenePackageSublistPO::getId).collect(Collectors.toList()))
+                    .indexIds(indexes.stream().map(ScenePackageSublistPO::getSublistId).collect(Collectors.toList()))
                     .build());
             //3 设置包为已禁用
             testPackages.forEach(testPackage -> testPackage.setIsUnavailable(DictConstants.IS_UNAVAILABLE));
             //4 遍历删除场景
             indexes.forEach(index -> {
                 final String sceneNaturalIdsString = index.getSceneNaturalIds();
+                List<String> sceneNaturalIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneNaturalIdsString)) {
+                    sceneNaturalIds = CollectionUtil.sequenceStringToList(sceneNaturalIdsString, ",");
+                }
                 final String sceneTrafficIdsString = index.getSceneTrafficIds();
+                List<String> sceneTrafficIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneTrafficIdsString)) {
+                    sceneTrafficIds = CollectionUtil.sequenceStringToList(sceneTrafficIdsString, ",");
+                }
                 final String sceneStatueIdsString = index.getSceneStatueIds();
+                List<String> sceneStatueIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneStatueIdsString)) {
+                    sceneStatueIds = CollectionUtil.sequenceStringToList(sceneStatueIdsString, ",");
+                }
                 final String sceneGeneralizationIdsString = index.getSceneGeneralizationIds();
-                final List<String> sceneNaturalIds = CollectionUtil.sequenceStringToList(sceneNaturalIdsString, ",");
-                final List<String> sceneTrafficIds = CollectionUtil.sequenceStringToList(sceneTrafficIdsString, ",");
-                final List<String> sceneStatueIds = CollectionUtil.sequenceStringToList(sceneStatueIdsString, ",");
-                final List<String> sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
+                List<String> sceneGeneralizationIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneGeneralizationIdsString)) {
+                    sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
+                }
                 final Iterator<String> iterator = sceneTrafficIds.iterator();
                 while (iterator.hasNext()) {
                     final String sceneId = iterator.next();

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

@@ -382,20 +382,32 @@ public class SceneNaturalService {
                     .build());
             //2 根据指标ID查询场景测试包
             List<ScenePackagePO> testPackages = scenePackageMapper.selectByIndexIds(ScenePackageParam.builder()
-                    .indexIds(indexes.stream().map(ScenePackageSublistPO::getId).collect(Collectors.toList()))
+                    .indexIds(indexes.stream().map(ScenePackageSublistPO::getSublistId).collect(Collectors.toList()))
                     .build());
             //3 设置包为已禁用
             testPackages.forEach(testPackage -> testPackage.setIsUnavailable(DictConstants.IS_UNAVAILABLE));
             //4 遍历删除场景
             indexes.forEach(index -> {
                 final String sceneNaturalIdsString = index.getSceneNaturalIds();
+                List<String> sceneNaturalIds = new ArrayList<>();
+                if (api.common.util.StringUtil.isNotEmpty(sceneNaturalIdsString)) {
+                    sceneNaturalIds = CollectionUtil.sequenceStringToList(sceneNaturalIdsString, ",");
+                }
                 final String sceneTrafficIdsString = index.getSceneTrafficIds();
+                List<String> sceneTrafficIds = new ArrayList<>();
+                if (api.common.util.StringUtil.isNotEmpty(sceneTrafficIdsString)) {
+                    sceneTrafficIds = CollectionUtil.sequenceStringToList(sceneTrafficIdsString, ",");
+                }
                 final String sceneStatueIdsString = index.getSceneStatueIds();
+                List<String> sceneStatueIds = new ArrayList<>();
+                if (api.common.util.StringUtil.isNotEmpty(sceneStatueIdsString)) {
+                    sceneStatueIds = CollectionUtil.sequenceStringToList(sceneStatueIdsString, ",");
+                }
                 final String sceneGeneralizationIdsString = index.getSceneGeneralizationIds();
-                final List<String> sceneNaturalIds = CollectionUtil.sequenceStringToList(sceneNaturalIdsString, ",");
-                final List<String> sceneTrafficIds = CollectionUtil.sequenceStringToList(sceneTrafficIdsString, ",");
-                final List<String> sceneStatueIds = CollectionUtil.sequenceStringToList(sceneStatueIdsString, ",");
-                final List<String> sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
+                List<String> sceneGeneralizationIds = new ArrayList<>();
+                if (api.common.util.StringUtil.isNotEmpty(sceneGeneralizationIdsString)) {
+                    sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
+                }
                 final Iterator<String> iterator = sceneNaturalIds.iterator();
                 while (iterator.hasNext()) {
                     final String sceneId = iterator.next();

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

@@ -193,20 +193,32 @@ public class SceneStandardsService {
                     .build());
             //2 根据指标ID查询场景测试包
             List<ScenePackagePO> testPackages = scenePackageMapper.selectByIndexIds(ScenePackageParam.builder()
-                    .indexIds(indexes.stream().map(ScenePackageSublistPO::getId).collect(Collectors.toList()))
+                    .indexIds(indexes.stream().map(ScenePackageSublistPO::getSublistId).collect(Collectors.toList()))
                     .build());
             //3 设置包为已禁用
             testPackages.forEach(testPackage -> testPackage.setIsUnavailable(DictConstants.IS_UNAVAILABLE));
             //4 遍历删除场景
             indexes.forEach(index -> {
                 final String sceneNaturalIdsString = index.getSceneNaturalIds();
+                List<String> sceneNaturalIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneNaturalIdsString)) {
+                    sceneNaturalIds = CollectionUtil.sequenceStringToList(sceneNaturalIdsString, ",");
+                }
                 final String sceneTrafficIdsString = index.getSceneTrafficIds();
+                List<String> sceneTrafficIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneTrafficIdsString)) {
+                    sceneTrafficIds = CollectionUtil.sequenceStringToList(sceneTrafficIdsString, ",");
+                }
                 final String sceneStatueIdsString = index.getSceneStatueIds();
+                List<String> sceneStatueIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneStatueIdsString)) {
+                    sceneStatueIds = CollectionUtil.sequenceStringToList(sceneStatueIdsString, ",");
+                }
                 final String sceneGeneralizationIdsString = index.getSceneGeneralizationIds();
-                final List<String> sceneNaturalIds = CollectionUtil.sequenceStringToList(sceneNaturalIdsString, ",");
-                final List<String> sceneTrafficIds = CollectionUtil.sequenceStringToList(sceneTrafficIdsString, ",");
-                final List<String> sceneStatueIds = CollectionUtil.sequenceStringToList(sceneStatueIdsString, ",");
-                final List<String> sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
+                List<String> sceneGeneralizationIds = new ArrayList<>();
+                if (StringUtil.isNotEmpty(sceneGeneralizationIdsString)) {
+                    sceneGeneralizationIds = CollectionUtil.sequenceStringToList(sceneGeneralizationIdsString, ",");
+                }
                 final Iterator<String> iterator = sceneStatueIds.iterator();
                 while (iterator.hasNext()) {
                     final String sceneId = iterator.next();
@@ -363,7 +375,7 @@ public class SceneStandardsService {
 
                             } else if (isupdate.equals("1")) {
                                 // -------------------------------- 修改数据到 mysql --------------------------------
-                                if(api.common.util.StringUtil.isEmpty(standardsRegulationsPO.getShare())){
+                                if (api.common.util.StringUtil.isEmpty(standardsRegulationsPO.getShare())) {
                                     standardsRegulationsPO.setShare(DictConstants.IS_NOT_SHARED);
                                 }
                                 scenes.forEach(scene -> {