From 4d26aa22b3736905ec570aa1344b51a81d910af1 Mon Sep 17 00:00:00 2001 From: lilong Date: Tue, 10 Sep 2024 15:55:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:(feature/REQ-2750)=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=BB=9F=E4=B8=80=E7=9A=84=E8=8F=9C=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/tyr/client/feign/FeatureResourceApi.java | 9 +++++++++ .../java/cn/axzo/tyr/client/feign/ProductApi.java | 1 + .../model/req/PageSaasFeatureResourceReq.java | 3 +++ .../permission/FeatureResourceController.java | 13 +++++++++++++ 4 files changed, 26 insertions(+) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java index e7867591..edc2ced4 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java @@ -1,11 +1,14 @@ package cn.axzo.tyr.client.feign; +import cn.axzo.foundation.page.PageResp; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.tyr.client.model.req.DeleteFeatureResourceReq; import cn.axzo.tyr.client.model.req.FeatureResourceTreeSaveReq; import cn.axzo.tyr.client.model.req.GetFeatureResourceTreeReq; +import cn.axzo.tyr.client.model.req.PageSaasFeatureResourceReq; import cn.axzo.tyr.client.model.req.ResourceSyncReq; import cn.axzo.tyr.client.model.res.FeatureResourceTreeNode; +import cn.axzo.tyr.client.model.res.SaasFeatureResourceResp; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -64,4 +67,10 @@ public interface FeatureResourceApi { /** 通过featureResourceIds查询对应的featureCode **/ @PostMapping("/api/featureResource/listFeatureCodeByFeatureResourceIds") ApiResult> listFeatureCodeByFeatureResourceIds(@RequestParam List featureResourceIds); + + @PostMapping("/api/featureResource/list") + ApiResult> list(@Validated @RequestParam PageSaasFeatureResourceReq param); + + @PostMapping("/api/featureResource/page") + ApiResult> page(@Validated @RequestParam PageSaasFeatureResourceReq param); } diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java index e32682ea..855e11d3 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/ProductApi.java @@ -156,6 +156,7 @@ public interface ProductApi { * @param terminal 政务端 * @return {@link GovernmentTerminalResp} */ + @Deprecated @GetMapping("api/auth/product/getGovernmentTerminal") ApiResult> getGovernmentTerminal(@RequestParam @NotNull(message = "terminal不能为空") String terminal); diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageSaasFeatureResourceReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageSaasFeatureResourceReq.java index 02de287b..c2f809bd 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageSaasFeatureResourceReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageSaasFeatureResourceReq.java @@ -70,6 +70,9 @@ public class PageSaasFeatureResourceReq implements IPageReq { @CriteriaField(ignore = true) private Set paths; + @CriteriaField(field = "terminal", operator = Operator.IN) + private Set terminals; + public PageResp toEmpty() { return PageResp.builder() .current(this.getPage()) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java index fff49fd2..e1389aa1 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/permission/FeatureResourceController.java @@ -1,12 +1,15 @@ package cn.axzo.tyr.server.controller.permission; +import cn.axzo.foundation.page.PageResp; import cn.axzo.framework.domain.web.result.ApiResult; import cn.axzo.tyr.client.feign.FeatureResourceApi; import cn.axzo.tyr.client.model.req.DeleteFeatureResourceReq; import cn.axzo.tyr.client.model.req.FeatureResourceTreeSaveReq; import cn.axzo.tyr.client.model.req.GetFeatureResourceTreeReq; +import cn.axzo.tyr.client.model.req.PageSaasFeatureResourceReq; import cn.axzo.tyr.client.model.req.ResourceSyncReq; import cn.axzo.tyr.client.model.res.FeatureResourceTreeNode; +import cn.axzo.tyr.client.model.res.SaasFeatureResourceResp; import cn.axzo.tyr.server.service.FeatureResourceSyncService; import cn.axzo.tyr.server.service.SaasFeatureResourceService; import cn.hutool.core.collection.CollectionUtil; @@ -92,4 +95,14 @@ public class FeatureResourceController implements FeatureResourceApi { public ApiResult> listFeatureCodeByFeatureResourceIds(List featureResourceIds) { return ApiResult.ok(featureResourceSyncService.listFeatureCodeByFeatureResourceIds(featureResourceIds)); } + + @Override + public ApiResult> list(PageSaasFeatureResourceReq param) { + return ApiResult.ok(featureResourceService.list(param)); + } + + @Override + public ApiResult> page(PageSaasFeatureResourceReq param) { + return ApiResult.ok(featureResourceService.page(param)); + } } From f5954c2d3b933b9a709907a864cfe4101e6d3f8a Mon Sep 17 00:00:00 2001 From: lilong Date: Tue, 10 Sep 2024 17:40:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:(feature/REQ-2935)=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=A5=E5=8F=82=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/tyr/client/feign/FeatureResourceApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java index edc2ced4..5944faea 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/FeatureResourceApi.java @@ -69,8 +69,8 @@ public interface FeatureResourceApi { ApiResult> listFeatureCodeByFeatureResourceIds(@RequestParam List featureResourceIds); @PostMapping("/api/featureResource/list") - ApiResult> list(@Validated @RequestParam PageSaasFeatureResourceReq param); + ApiResult> list(@Validated @RequestBody PageSaasFeatureResourceReq param); @PostMapping("/api/featureResource/page") - ApiResult> page(@Validated @RequestParam PageSaasFeatureResourceReq param); + ApiResult> page(@Validated @RequestBody PageSaasFeatureResourceReq param); }