gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(sj_1.0.0): 优化导出

Browse Source
This commit is contained in:
opensnail 2024-05-27 18:23:00 +08:00
parent 6dfe183128
commit 50483b5c2a
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/GroupConfigController.java
View File

@ -101,9 +101,9 @@ public class GroupConfigController {
return groupConfigService.getTablePartitionList(); return groupConfigService.getTablePartitionList();
} }
@PostMapping("/import") @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
@LoginRequired @LoginRequired
public void importScene(@RequestParam("file") MultipartFile file) throws IOException { public void importScene(@RequestPart("file") MultipartFile file) throws IOException {
if (file.isEmpty()) { if (file.isEmpty()) {
throw new SnailJobCommonException("Please select a file to upload"); throw new SnailJobCommonException("Please select a file to upload");
} }

6
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/GroupConfigServiceImpl.java
View File

@ -417,13 +417,9 @@ public class GroupConfigServiceImpl implements GroupConfigService {
List<GroupConfig> groupConfigs = accessTemplate.getGroupConfigAccess().list( List<GroupConfig> groupConfigs = accessTemplate.getGroupConfigAccess().list(
new LambdaQueryWrapper<GroupConfig>() new LambdaQueryWrapper<GroupConfig>()
.eq(GroupConfig::getNamespaceId, namespaceId) .eq(GroupConfig::getNamespaceId, namespaceId)
.in(GroupConfig::getId, groupIds) .in(CollUtil.isNotEmpty(groupIds), GroupConfig::getId, groupIds)
); );
SetView<Long> 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)); return JsonUtil.toJsonString(GroupConfigConverter.INSTANCE.toGroupConfigRequestVOs(groupConfigs));
} }

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/SceneConfigServiceImpl.java
View File

@ -194,10 +194,6 @@ public class SceneConfigServiceImpl implements SceneConfigService {
.in(CollUtil.isNotEmpty(sceneIds), RetrySceneConfig::getId, sceneIds) .in(CollUtil.isNotEmpty(sceneIds), RetrySceneConfig::getId, sceneIds)
); );
SetView<Long> 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)); return JsonUtil.toJsonString(SceneConfigConverter.INSTANCE.toSceneConfigRequestVOs(sceneConfigs));
} }