From d3afb330e5b7fb8640e63f87fd789ef59284348d Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Thu, 24 Oct 2019 19:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=96=B0=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webflux/DimensionTypeResponse.java | 22 +++++++++++++++++++ .../WebFluxDimensionTypeController.java | 5 +++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/DimensionTypeResponse.java diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/DimensionTypeResponse.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/DimensionTypeResponse.java new file mode 100644 index 000000000..465e034dc --- /dev/null +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/DimensionTypeResponse.java @@ -0,0 +1,22 @@ +package org.hswebframework.web.system.authorization.defaults.webflux; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hswebframework.web.authorization.DimensionType; + +@Getter +@Setter +@AllArgsConstructor(staticName = "of") +@NoArgsConstructor +public class DimensionTypeResponse { + + private String id; + + private String name; + + public static DimensionTypeResponse of(DimensionType type) { + return of(type.getId(), type.getName()); + } +} diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/WebFluxDimensionTypeController.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/WebFluxDimensionTypeController.java index 5e7d6842d..9b4801438 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/WebFluxDimensionTypeController.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/webflux/WebFluxDimensionTypeController.java @@ -35,9 +35,10 @@ public class WebFluxDimensionTypeController implements ReactiveCrudController findAllType() { + public Flux findAllType() { return Flux.fromIterable(dimensionProviders) - .flatMap(DimensionProvider::getAllType); + .flatMap(DimensionProvider::getAllType) + .map(DimensionTypeResponse::of); } @Override