diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainController.java index dee5847b..cef5f3f3 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainController.java @@ -17,6 +17,7 @@ import org.noear.solon.lang.Nullable; import javax.sound.midi.Soundbank; import java.io.IOException; +import java.util.List; /** * @author Mirac @@ -28,10 +29,17 @@ public class DomainController { @Inject private DomainService domainService; + @Get @Mapping("/page") public PageInfo page(PageQuery pageQuery, DomainListReq req) { return domainService.page(pageQuery, req); } + @Get + @Mapping("/all") + public List all(DomainListReq req) { + ParamCheckUtil.checkNotNull(req, "req"); + return domainService.all(req); + } @Post @Mapping(path = "/create") diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java index 9e03448c..aafd9a72 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/DomainService.java @@ -76,6 +76,26 @@ public class DomainService { return PageInfo.of(resList, page); } + public List all(DomainListReq req) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(req.getEnable() != null, DomainNameDO::getEnable, req.getEnable()); + List domainNameDOS = domainMapper.selectList(wrapper); + if (domainNameDOS == null) { + return null; + } + List resList = domainNameDOS.stream().map(DomainNameDO::toRes).toList(); + Set userIds = resList.stream().map(DomainListRes::getUserId).collect(Collectors.toSet()); + List userDOList = userMapper.findByIds(userIds); + Map userMap = userDOList.stream().collect(Collectors.toMap(UserDO::getId, c -> c)); + for (DomainListRes item : resList) { + UserDO userDO = userMap.get(item.getUserId()); + if (null != userDO) { + item.setUserName(userDO.getName()); + } + } + return resList; + } + /** * εˆ›ε»ΊεŸŸε * @param req @@ -171,4 +191,5 @@ public class DomainService { return new DomainUpdateDefaultStatusRes(); } + }