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 9d7b6f13..651457f9 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 @@ -80,7 +80,7 @@ public class GroupConfigController { @LoginRequired @GetMapping("/all/group-name/list") - public List getAllGroupNameList() { + public List getAllGroupNameList() { return groupConfigService.getAllGroupNameList(); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java index 7d3186ef..47703407 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java @@ -30,7 +30,7 @@ public interface GroupConfigService { List getAllGroupConfigList(final List namespaceId); - List getAllGroupNameList(); + List getAllGroupNameList(); List getOnlinePods(String groupName); 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 2dbe86f4..ae72cde1 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 @@ -254,7 +254,7 @@ public class GroupConfigServiceImpl implements GroupConfigService { } @Override - public List getAllGroupNameList() { + public List getAllGroupNameList() { UserSessionVO userSessionVO = UserSessionUtils.currentUserSession(); if (userSessionVO.isUser()) { @@ -265,17 +265,21 @@ public class GroupConfigServiceImpl implements GroupConfigService { } List groupConfigs = groupConfigAccess.list( new LambdaQueryWrapper() + .select(GroupConfig::getGroupNameCn,GroupConfig::getGroupName) .in(CollUtil.isNotEmpty(groupNames), GroupConfig::getGroupName, groupNames) .eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId())); - return StreamUtils.toList(groupConfigs, GroupConfig::getGroupNameCn); + List groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList( + groupConfigs); + return groupConfigResponses; } ConfigAccess groupConfigAccess = accessTemplate.getGroupConfigAccess(); List groupConfigs = groupConfigAccess.list(new LambdaQueryWrapper() .eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId()) - .select(GroupConfig::getGroupNameCn)); - //TODO ? - return StreamUtils.toList(groupConfigs, GroupConfig::getGroupNameCn); + .select(GroupConfig::getGroupNameCn,GroupConfig::getGroupName)); + List groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList( + groupConfigs); + return groupConfigResponses; } @Override