✨ feat: 添加了UserAuthoritiesService, MenusService, GroupMembersService,…

… TenantMembersService, GroupAuthoritiesService, TenantsService, GroupsService文件。
vnobo · May 31, 2024 · 0cbb409 · 0cbb409
1 parent f0eab43
commit 0cbb409
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/boot/platform/src/main/java/com/platform/boot/relational/menus/MenusService.java b/boot/platform/src/main/java/com/platform/boot/relational/menus/MenusService.java
@@ -37,7 +37,7 @@ public Flux<Menu> search(MenuRequest request) {
         var cacheKey = BeanUtils.cacheKey(request);
         Query query = Query.query(request.toCriteria()).sort(Sort.by("sort"));
         return this.queryWithCache(cacheKey, query, Menu.class)
-                .flatMap(ContextUtils::serializeUserAuditor);
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     public Mono<Menu> add(MenuRequest request) {

diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsService.java b/boot/platform/src/main/java/com/platform/boot/security/core/group/GroupsService.java
@@ -27,7 +27,7 @@ public Flux<Group> search(GroupRequest request, Pageable pageable) {
         ParamSql paramSql = request.bindParamSql();
         String query = "select * from se_groups" + paramSql.whereSql() + CriteriaUtils.applyPage(pageable);
         return super.queryWithCache(cacheKey, query, paramSql.params(), Group.class)
-                .flatMap(ContextUtils::serializeUserAuditor);
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     public Mono<Page<Group>> page(GroupRequest request, Pageable pageable) {

diff --git a/...rc/main/java/com/platform/boot/security/core/group/authority/GroupAuthoritiesService.java b/...rc/main/java/com/platform/boot/security/core/group/authority/GroupAuthoritiesService.java
@@ -34,7 +34,7 @@ public Flux<GroupAuthority> search(GroupAuthorityRequest request, Pageable pagea
         Query query = Query.query(request.toCriteria()).with(pageable);
 
         return super.queryWithCache(cacheKey, query, GroupAuthority.class)
-                .flatMap(ContextUtils::serializeUserAuditor);
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     @Transactional(rollbackFor = Exception.class)

diff --git a/...tform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java b/...tform/src/main/java/com/platform/boot/security/core/group/member/GroupMembersService.java
@@ -4,6 +4,7 @@
 import com.platform.boot.commons.query.CriteriaUtils;
 import com.platform.boot.commons.query.ParamSql;
 import com.platform.boot.commons.utils.BeanUtils;
+import com.platform.boot.commons.utils.ContextUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -37,7 +38,8 @@ public Flux<GroupMemberResponse> search(GroupMemberRequest request, Pageable pag
         var cacheKey = BeanUtils.cacheKey(request, pageable);
         ParamSql paramSql = request.toParamSql();
         String query = QUERY_SQL + paramSql.whereSql() + CriteriaUtils.applyPage(pageable);
-        return super.queryWithCache(cacheKey, query, paramSql.params(), GroupMemberResponse.class);
+        return super.queryWithCache(cacheKey, query, paramSql.params(), GroupMemberResponse.class)
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     public Mono<Page<GroupMemberResponse>> page(GroupMemberRequest request, Pageable pageable) {

diff --git a/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java b/boot/platform/src/main/java/com/platform/boot/security/core/tenant/TenantsService.java
@@ -29,7 +29,7 @@ public Flux<Tenant> search(TenantRequest request, Pageable pageable) {
         ParamSql paramSql = request.bindParamSql();
         String query = "select * from se_tenants" + paramSql.whereSql() + CriteriaUtils.applyPage(pageable);
         return super.queryWithCache(cacheKey, query, paramSql.params(), Tenant.class)
-                .flatMap(ContextUtils::serializeUserAuditor);
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     public Mono<Page<Tenant>> page(TenantRequest request, Pageable pageable) {

diff --git a/...orm/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java b/...orm/src/main/java/com/platform/boot/security/core/tenant/member/TenantMembersService.java
@@ -4,6 +4,7 @@
 import com.platform.boot.commons.query.CriteriaUtils;
 import com.platform.boot.commons.query.ParamSql;
 import com.platform.boot.commons.utils.BeanUtils;
+import com.platform.boot.commons.utils.ContextUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -40,7 +41,8 @@ public Flux<TenantMemberResponse> search(TenantMemberRequest request, Pageable p
         var cacheKey = BeanUtils.cacheKey(request, pageable);
         ParamSql paramSql = request.toParamSql();
         String query = QUERY_SQL + paramSql.whereSql() + CriteriaUtils.applyPage(pageable, "a");
-        return super.queryWithCache(cacheKey, query, paramSql.params(), TenantMemberResponse.class);
+        return super.queryWithCache(cacheKey, query, paramSql.params(), TenantMemberResponse.class)
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     public Mono<Page<TenantMemberResponse>> page(TenantMemberRequest request, Pageable pageable) {

diff --git a/.../src/main/java/com/platform/boot/security/core/user/authority/UserAuthoritiesService.java b/.../src/main/java/com/platform/boot/security/core/user/authority/UserAuthoritiesService.java
@@ -23,7 +23,7 @@ public Flux<UserAuthority> search(UserAuthorityRequest request) {
         var cacheKey = BeanUtils.cacheKey(request);
         Query query = Query.query(request.toCriteria()).sort(Sort.by("id").descending());
         return super.queryWithCache(cacheKey, query, UserAuthority.class)
-                .flatMap(ContextUtils::serializeUserAuditor);
+                .flatMapSequential(ContextUtils::serializeUserAuditor);
     }
 
     public Mono<UserAuthority> operate(UserAuthorityRequest request) {