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

组名称列表问题

Browse Source
This commit is contained in:
SGK\17962 2025-11-26 09:07:18 +08:00
parent 06a35caa92
commit 91b9572974
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ public class GroupConfigController {
@LoginRequired @LoginRequired
@GetMapping("/all/group-name/list") @GetMapping("/all/group-name/list")
public List<String> getAllGroupNameList() { public List<GroupConfigResponseVO> getAllGroupNameList() {
return groupConfigService.getAllGroupNameList(); return groupConfigService.getAllGroupNameList();
} }

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/GroupConfigService.java
View File

@ -30,7 +30,7 @@ public interface GroupConfigService {
List<GroupConfigResponseVO> getAllGroupConfigList(final List<String> namespaceId); List<GroupConfigResponseVO> getAllGroupConfigList(final List<String> namespaceId);
List<String> getAllGroupNameList(); List<GroupConfigResponseVO> getAllGroupNameList();
List<String> getOnlinePods(String groupName); List<String> getOnlinePods(String groupName);

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

@ -254,7 +254,7 @@ public class GroupConfigServiceImpl implements GroupConfigService {
} }
@Override @Override
public List<String> getAllGroupNameList() { public List<GroupConfigResponseVO> getAllGroupNameList() {
UserSessionVO userSessionVO = UserSessionUtils.currentUserSession(); UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
if (userSessionVO.isUser()) { if (userSessionVO.isUser()) {
@ -265,17 +265,21 @@ public class GroupConfigServiceImpl implements GroupConfigService {
} }
List<GroupConfig> groupConfigs = groupConfigAccess.list( List<GroupConfig> groupConfigs = groupConfigAccess.list(
new LambdaQueryWrapper<GroupConfig>() new LambdaQueryWrapper<GroupConfig>()
.select(GroupConfig::getGroupNameCn,GroupConfig::getGroupName)
.in(CollUtil.isNotEmpty(groupNames), GroupConfig::getGroupName, groupNames) .in(CollUtil.isNotEmpty(groupNames), GroupConfig::getGroupName, groupNames)
.eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId())); .eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId()));
return StreamUtils.toList(groupConfigs, GroupConfig::getGroupNameCn); List<GroupConfigResponseVO> groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList(
groupConfigs);
return groupConfigResponses;
} }
ConfigAccess<GroupConfig> groupConfigAccess = accessTemplate.getGroupConfigAccess(); ConfigAccess<GroupConfig> groupConfigAccess = accessTemplate.getGroupConfigAccess();
List<GroupConfig> groupConfigs = groupConfigAccess.list(new LambdaQueryWrapper<GroupConfig>() List<GroupConfig> groupConfigs = groupConfigAccess.list(new LambdaQueryWrapper<GroupConfig>()
.eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId()) .eq(GroupConfig::getNamespaceId, userSessionVO.getNamespaceId())
.select(GroupConfig::getGroupNameCn)); .select(GroupConfig::getGroupNameCn,GroupConfig::getGroupName));
//TODO ? List<GroupConfigResponseVO> groupConfigResponses = GroupConfigResponseVOConverter.INSTANCE.convertList(
return StreamUtils.toList(groupConfigs, GroupConfig::getGroupNameCn); groupConfigs);
return groupConfigResponses;
} }
@Override @Override