From fe5c87d90234e4d0d2533dde83cb60160bd47658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=BE=99?= Date: Thu, 28 Nov 2024 10:24:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20(feature/REQ-3167)=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=AB=AFcode=E6=9F=A5=E8=AF=A2=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/client/model/req/ListTerminalReq.java | 8 ++++++++ .../server/controller/terminal/TerminalController.java | 2 ++ 2 files changed, 10 insertions(+) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListTerminalReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListTerminalReq.java index 22c6dfcf..d380bd31 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListTerminalReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/ListTerminalReq.java @@ -13,5 +13,13 @@ import java.util.Set; @AllArgsConstructor public class ListTerminalReq { + /** + * 端的id + */ private Set ids; + + /** + * 端的code + */ + private String terminalCode; } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java index 88b95309..ae808f20 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/terminal/TerminalController.java @@ -51,6 +51,8 @@ public class TerminalController implements TerminalApi { .ids(Optional.ofNullable(req.getIds()) .map(Lists::newArrayList) .orElse(null)) + .terminal(req.getTerminalCode()) + .featureResourceType(FeatureResourceType.ROOT.getCode()) .build(); List saasFeatureResources = featureResourceService.list(pageSaasFeatureResourceReq);