diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java index 48604c5d5..49442289f 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java @@ -101,9 +101,9 @@ public class GroupConfigController { return groupConfigService.getTablePartitionList(); } - @PostMapping("/import") + @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @LoginRequired - public void importScene(@RequestParam("file") MultipartFile file) throws IOException { + public void importScene(@RequestPart("file") MultipartFile file) throws IOException { if (file.isEmpty()) { throw new SnailJobCommonException("Please select a file to upload"); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java index ba38dd6a6..35afcc415 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java @@ -417,13 +417,9 @@ public class GroupConfigServiceImpl implements GroupConfigService { List groupConfigs = accessTemplate.getGroupConfigAccess().list( new LambdaQueryWrapper() .eq(GroupConfig::getNamespaceId, namespaceId) - .in(GroupConfig::getId, groupIds) + .in(CollUtil.isNotEmpty(groupIds), GroupConfig::getId, groupIds) ); - SetView notExistedGroupIdSet = Sets.difference(groupIds, - StreamUtils.toSet(groupConfigs, GroupConfig::getId)); - - Assert.isTrue(groupIds.size() == groupConfigs.size(), () -> new SnailJobServerException("导出失败. 组ID{}不存在", notExistedGroupIdSet)); return JsonUtil.toJsonString(GroupConfigConverter.INSTANCE.toGroupConfigRequestVOs(groupConfigs)); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java index 8b4faf591..9a5645d29 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java @@ -194,10 +194,6 @@ public class SceneConfigServiceImpl implements SceneConfigService { .in(CollUtil.isNotEmpty(sceneIds), RetrySceneConfig::getId, sceneIds) ); - SetView notExistedSceneIdSet = Sets.difference(sceneIds, - StreamUtils.toSet(sceneConfigs, RetrySceneConfig::getId)); - - Assert.isTrue(sceneIds.size() == sceneConfigs.size(), () -> new SnailJobServerException("导出失败. 场景ID{}不存在", notExistedSceneIdSet)); return JsonUtil.toJsonString(SceneConfigConverter.INSTANCE.toSceneConfigRequestVOs(sceneConfigs)); }