From a88776119cae12161ae1ca1f124a259f583567c8 Mon Sep 17 00:00:00 2001 From: wangyu <727842003@qq.com> Date: Wed, 8 Dec 2021 23:47:10 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=A7=9F=E6=88=B7=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flyfish/framework/domain/tree/TreeQo.java | 2 +- .../framework/logging/advice/LogAdvice.java | 53 +++++++------------ .../framework/logging/service/LogContext.java | 2 +- .../controller/DepartmentController.java | 24 +++++++++ .../framework/service/DepartmentService.java | 2 +- .../service/UserDetailsConverter.java | 1 + .../reactive/ReactiveTreeController.java | 31 ++++++----- 7 files changed, 67 insertions(+), 48 deletions(-) diff --git a/flyfish-data/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java b/flyfish-data/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java index aef807d..35a87c8 100644 --- a/flyfish-data/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java +++ b/flyfish-data/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java @@ -30,7 +30,7 @@ public class TreeQo extends NameLikeQo { CriteriaBuilder builder = super.criteriaBuilder().with("depth"); if (BooleanUtils.isTrue(recursive)) { builder.with("parentId", "parentIds", Criteria::is) - .with("parentIds", "parentIds", Criteria::is); + .with("parentIds", "parentIds", CriteriaBuilder.Builders.IN); } else { builder.with("parentId").with("parentIds", "parentId", CriteriaBuilder.Builders.IN); } diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java index 36a519a..1d3326d 100644 --- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java +++ b/flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java @@ -2,14 +2,14 @@ package com.flyfish.framework.logging.advice; import com.flyfish.framework.logging.service.LogContext; import com.flyfish.framework.logging.service.LogManager; +import com.flyfish.framework.utils.UserUtils; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.reactivestreams.Publisher; -import org.reactivestreams.Subscriber; -import org.reactivestreams.Subscription; +import org.springframework.security.core.context.ReactiveSecurityContextHolder; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -58,7 +58,7 @@ public class LogAdvice { context.setError(throwable); throw throwable; } finally { - if (!reactive && context.isValid()) { + if (context.isValid() && !reactive) { context.setResult(result); logManager.tryLog(context.end()); } @@ -73,19 +73,33 @@ public class LogAdvice { * @param context 上下文 */ private Object handleResult(Object result, LogContext context) { + if (!context.isValid()) { + return result; + } Runnable runnable = () -> { if (context.isValid()) { logManager.tryLog(context.end()); } }; if (result instanceof Mono) { - return ((Mono) result) + Mono user = ReactiveSecurityContextHolder.getContext() + .map(UserUtils::extractUserName); + return Mono.zip(user, (Mono) result) + .map(value -> { + context.setUser(value.getT1()); + return value.getT2(); + }) .doOnSuccess(context::setResult) .doOnError(context::setError) .doOnTerminate(runnable); } else if (result instanceof Flux) { - return ((Flux) result) - .collectList() + Mono user = ReactiveSecurityContextHolder.getContext() + .map(UserUtils::extractUserName); + return Mono.zip(user, ((Flux) result).collectList()) + .map(value -> { + context.setUser(value.getT1()); + return value.getT2(); + }) .doOnSuccess(context::setResult) .doOnError(context::setError) .doOnTerminate(runnable) @@ -95,31 +109,4 @@ public class LogAdvice { return result; } } - - @RequiredArgsConstructor - @SuppressWarnings("all") - private static class LogSubscriber implements Subscriber { - - private final LogContext context; - - @Override - public void onSubscribe(Subscription s) { - - } - - @Override - public void onNext(Object o) { - context.setResult(o); - } - - @Override - public void onError(Throwable t) { - context.setError(t); - } - - @Override - public void onComplete() { - context.end(); - } - } } diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java index 2c01c07..6045849 100644 --- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java +++ b/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java @@ -124,7 +124,7 @@ public class LogContext { } public LogContext end() { - this.user = UserContext.sharedContext().map(UserContext::currentUser).map(Domain::getName).orElse("未知"); + this.user = UserContext.sharedContext().map(UserContext::currentUser).map(Domain::getName).orElse(this.user); this.endTime = System.currentTimeMillis(); return this; } diff --git a/flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java b/flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java index 8e4db20..5331e63 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/controller/DepartmentController.java @@ -1,10 +1,18 @@ package com.flyfish.framework.controller; +import com.flyfish.framework.bean.Result; import com.flyfish.framework.controller.reactive.ReactiveTreeController; +import com.flyfish.framework.domain.AdminUserDetails; import com.flyfish.framework.domain.DepartmentQo; import com.flyfish.framework.domain.po.Department; +import com.flyfish.framework.utils.UserUtils; +import org.springframework.security.core.context.ReactiveSecurityContextHolder; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Mono; + +import java.util.List; /** * 部分或者校区controller @@ -13,4 +21,20 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/departments") public class DepartmentController extends ReactiveTreeController { + /** + * 获取有权限的tree + * + * @return 结果 + */ + @GetMapping("authorized-tree") + public Mono>> getAuthorizedTree() { + return ReactiveSecurityContextHolder.getContext() + .map(UserUtils::extractUserDetails) + .flatMap(detail -> { + AdminUserDetails details = (AdminUserDetails) detail; + return reactiveService.getByIds(details.getAuthorityCodes()).collectList(); + }) + .map(this::makeTree) + .map(Result::accept); + } } diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java index 07076c6..93705b8 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/service/DepartmentService.java @@ -28,7 +28,7 @@ public class DepartmentService extends BaseReactiveServiceImpl { * @return 结果 */ public Mono> getSubCodes(List parents) { - Query query = Query.query(Criteria.where("parentId").in(parents)); + Query query = Query.query(Criteria.where("parentIds").in(parents)); query.fields().include("_id"); return reactiveMongoOperations.find(query, Department.class).map(Department::getId).collectList(); } diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java b/flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java index 8ed84dc..738f360 100644 --- a/flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java +++ b/flyfish-user/src/main/java/com/flyfish/framework/service/UserDetailsConverter.java @@ -38,6 +38,7 @@ public class UserDetailsConverter { if (CollectionUtils.isNotEmpty(user.getDepartments())) { val departs = user.getDepartments().stream().map(Department::getId) .collect(Collectors.toList()); + userDetail.setAuthorityCodes(ListUtils.union(departs, userDetail.getAuthorityCodes())); return departmentService.getSubCodes(departs) .map(codes -> { if (CollectionUtils.isNotEmpty(codes)) { diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java b/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java index 3002837..76b6cb9 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java @@ -8,7 +8,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import java.util.Collections; @@ -51,20 +50,28 @@ public abstract class ReactiveTreeController, Q extends // 第一步，查询全部，并根据条件筛选 return reactiveService.getList(qo) .collectList() - .flatMap(filtered -> { - // 第二步，根据父id组成map - Map> group = filtered.stream() - .collect(Collectors.groupingBy(p -> StringUtils.defaultIfBlank(p.getParentId(), ""))); - // 第三步，筛选一级树深度 - return Flux.fromIterable(filtered) - .filter(item -> null != item && TreeDomain.ROOT.equals(item.getParentId())) - .collectList() - // 第四步，根据父id的map填充根tree - .map(topList -> applyChildren(topList, group)); - }) + .map(this::makeTree) .map(Result::accept); } + /** + * 构建一个tree + * + * @param filtered 过滤后的节点 + * @return 结果 + */ + protected List makeTree(List filtered) { + // 第二步，根据父id组成map + Map> group = filtered.stream() + .collect(Collectors.groupingBy(p -> StringUtils.defaultIfBlank(p.getParentId(), ""))); + // 第三步，筛选一级树深度 + List roots = filtered.stream() + .filter(item -> null != item && TreeDomain.ROOT.equals(item.getParentId())) + .collect(Collectors.toList()); + // 第四步，根据父id的map填充根tree + return applyChildren(roots, group); + } + /** * 递归赋值儿子们 *