From fe9da42442d7a42af778c3c1eda4d681afc18823 Mon Sep 17 00:00:00 2001 From: suxiang <2585546823@qq.com> Date: Thu, 8 Aug 2024 20:32:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=9F=E5=90=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=9F=9F=E5=90=8D=E7=8A=B6=E6=80=81=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=9F=9F=E5=90=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/controller/DomainController.java | 8 +++++++ .../server/service/DomainService.java | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+) 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(); } + }