From 83d255f0ebfb3644359888ca1ec620ff6663ed56 Mon Sep 17 00:00:00 2001 From: smallchill Date: Thu, 23 Apr 2020 18:15:49 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20INode=E6=94=AF=E6=8C=81=E6=B3=9B?= =?UTF-8?q?=E5=9E=8B=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=9A=E5=8A=A1=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/springblade/system/vo/DictBizVO.java | 6 +++--- .../src/main/java/org/springblade/system/vo/DictVO.java | 6 +++--- .../src/main/java/org/springblade/system/vo/DeptVO.java | 6 +++--- .../src/main/java/org/springblade/system/vo/MenuVO.java | 6 +++--- .../src/main/java/org/springblade/system/vo/RoleVO.java | 6 +++--- .../springblade/system/controller/DeptController.java | 5 ++--- .../springblade/system/controller/DictBizController.java | 3 +-- .../springblade/system/controller/DictController.java | 3 +-- .../springblade/system/controller/RoleController.java | 3 +-- .../java/org/springblade/system/wrapper/DeptWrapper.java | 9 ++++----- .../org/springblade/system/wrapper/DictBizWrapper.java | 5 ++--- .../java/org/springblade/system/wrapper/DictWrapper.java | 5 ++--- .../java/org/springblade/system/wrapper/RoleWrapper.java | 5 ++--- 13 files changed, 30 insertions(+), 38 deletions(-) diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictBizVO.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictBizVO.java index ffa7b3ff..177bb245 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictBizVO.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictBizVO.java @@ -36,7 +36,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @ApiModel(value = "DictBizVO对象", description = "DictBizVO对象") -public class DictBizVO extends DictBiz implements INode { +public class DictBizVO extends DictBiz implements INode { private static final long serialVersionUID = 1L; /** * 主键ID @@ -54,10 +54,10 @@ public class DictBizVO extends DictBiz implements INode { * 子孙节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; @Override - public List getChildren() { + public List getChildren() { if (this.children == null) { this.children = new ArrayList<>(); } diff --git a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java index 7c8e2259..cebf74c1 100644 --- a/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java +++ b/blade-service-api/blade-dict-api/src/main/java/org/springblade/system/vo/DictVO.java @@ -36,7 +36,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @ApiModel(value = "DictVO对象", description = "DictVO对象") -public class DictVO extends Dict implements INode { +public class DictVO extends Dict implements INode { private static final long serialVersionUID = 1L; /** * 主键ID @@ -54,10 +54,10 @@ public class DictVO extends Dict implements INode { * 子孙节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; @Override - public List getChildren() { + public List getChildren() { if (this.children == null) { this.children = new ArrayList<>(); } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java index 52661e53..04f5a5e7 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DeptVO.java @@ -36,7 +36,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @ApiModel(value = "DeptVO对象", description = "DeptVO对象") -public class DeptVO extends Dept implements INode { +public class DeptVO extends Dept implements INode { private static final long serialVersionUID = 1L; /** @@ -55,7 +55,7 @@ public class DeptVO extends Dept implements INode { * 子孙节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; /** * 是否有子孙节点 @@ -64,7 +64,7 @@ public class DeptVO extends Dept implements INode { private Boolean hasChildren; @Override - public List getChildren() { + public List getChildren() { if (this.children == null) { this.children = new ArrayList<>(); } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java index e6f52cc8..6a1f7178 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/MenuVO.java @@ -36,7 +36,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @ApiModel(value = "MenuVO对象", description = "MenuVO对象") -public class MenuVO extends Menu implements INode { +public class MenuVO extends Menu implements INode { private static final long serialVersionUID = 1L; /** @@ -55,7 +55,7 @@ public class MenuVO extends Menu implements INode { * 子孙节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; /** * 是否有子孙节点 @@ -64,7 +64,7 @@ public class MenuVO extends Menu implements INode { private Boolean hasChildren; @Override - public List getChildren() { + public List getChildren() { if (this.children == null) { this.children = new ArrayList<>(); } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java index 6453e42d..b8040dbd 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/RoleVO.java @@ -36,7 +36,7 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) @ApiModel(value = "RoleVO对象", description = "RoleVO对象") -public class RoleVO extends Role implements INode { +public class RoleVO extends Role implements INode { private static final long serialVersionUID = 1L; /** @@ -55,10 +55,10 @@ public class RoleVO extends Role implements INode { * 子孙节点 */ @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; @Override - public List getChildren() { + public List getChildren() { if (this.children == null) { this.children = new ArrayList<>(); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java index 2c269ba1..02aa997c 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java @@ -28,7 +28,6 @@ import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.constant.RoleConstant; -import org.springblade.core.tool.node.INode; import org.springblade.core.tool.support.Kv; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.DictCache; @@ -80,7 +79,7 @@ public class DeptController extends BladeController { }) @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入dept") - public R> list(@ApiIgnore @RequestParam Map dept, BladeUser bladeUser) { + public R> list(@ApiIgnore @RequestParam Map dept, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(dept, Dept.class); List list = deptService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Dept::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(DeptWrapper.build().listNodeVO(list)); @@ -96,7 +95,7 @@ public class DeptController extends BladeController { }) @ApiOperationSupport(order = 3) @ApiOperation(value = "懒加载列表", notes = "传入dept") - public R> lazyList(@ApiIgnore @RequestParam Map dept, Long parentId, BladeUser bladeUser) { + public R> lazyList(@ApiIgnore @RequestParam Map dept, Long parentId, BladeUser bladeUser) { List list = deptService.lazyList(bladeUser.getTenantId(), parentId, dept); return R.data(DeptWrapper.build().listNodeLazyVO(list)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java index 33b6892b..bd487fdd 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictBizController.java @@ -25,7 +25,6 @@ import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.node.INode; import org.springblade.system.entity.DictBiz; import org.springblade.system.service.IDictBizService; import org.springblade.system.vo.DictBizVO; @@ -73,7 +72,7 @@ public class DictBizController extends BladeController { }) @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入dict") - public R> list(@ApiIgnore @RequestParam Map dict) { + public R> list(@ApiIgnore @RequestParam Map dict) { List list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort)); return R.data(DictBizWrapper.build().listNodeVO(list)); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java index 3ec1dfcd..03a51872 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DictController.java @@ -25,7 +25,6 @@ import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; -import org.springblade.core.tool.node.INode; import org.springblade.system.entity.Dict; import org.springblade.system.service.IDictService; import org.springblade.system.vo.DictVO; @@ -74,7 +73,7 @@ public class DictController extends BladeController { }) @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入dict") - public R> list(@ApiIgnore @RequestParam Map dict) { + public R> list(@ApiIgnore @RequestParam Map dict) { List list = dictService.list(Condition.getQueryWrapper(dict, Dict.class).lambda().orderByAsc(Dict::getSort)); DictWrapper dictWrapper = new DictWrapper(); return R.data(dictWrapper.listNodeVO(list)); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java index 488f1db8..61205f6c 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java @@ -28,7 +28,6 @@ import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.constant.RoleConstant; -import org.springblade.core.tool.node.INode; import org.springblade.core.tool.utils.Func; import org.springblade.system.entity.Role; import org.springblade.system.service.IRoleService; @@ -79,7 +78,7 @@ public class RoleController extends BladeController { }) @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入role") - public R> list(@ApiIgnore @RequestParam Map role, BladeUser bladeUser) { + public R> list(@ApiIgnore @RequestParam Map role, BladeUser bladeUser) { QueryWrapper queryWrapper = Condition.getQueryWrapper(role, Role.class); List list = roleService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Role::getTenantId, bladeUser.getTenantId()) : queryWrapper); return R.data(RoleWrapper.build().listNodeVO(list)); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java index ccca6472..e24188ba 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DeptWrapper.java @@ -19,7 +19,6 @@ package org.springblade.system.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.ForestNodeMerger; -import org.springblade.core.tool.node.INode; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.DictCache; @@ -57,8 +56,8 @@ public class DeptWrapper extends BaseEntityWrapper { } - public List listNodeVO(List list) { - List collect = list.stream().map(dept -> { + public List listNodeVO(List list) { + List collect = list.stream().map(dept -> { DeptVO deptVO = BeanUtil.copy(dept, DeptVO.class); String category = DictCache.getValue("org_category", dept.getDeptCategory()); Objects.requireNonNull(deptVO).setDeptCategoryName(category); @@ -67,8 +66,8 @@ public class DeptWrapper extends BaseEntityWrapper { return ForestNodeMerger.merge(collect); } - public List listNodeLazyVO(List list) { - List collect = list.stream().peek(dept -> { + public List listNodeLazyVO(List list) { + List collect = list.stream().peek(dept -> { String category = DictCache.getValue("org_category", dept.getDeptCategory()); Objects.requireNonNull(dept).setDeptCategoryName(category); }).collect(Collectors.toList()); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictBizWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictBizWrapper.java index e2f044ca..f921da00 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictBizWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictBizWrapper.java @@ -19,7 +19,6 @@ package org.springblade.system.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.ForestNodeMerger; -import org.springblade.core.tool.node.INode; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.DictBizCache; @@ -54,8 +53,8 @@ public class DictBizWrapper extends BaseEntityWrapper { return dictVO; } - public List listNodeVO(List list) { - List collect = list.stream().map(dict -> BeanUtil.copy(dict, DictBizVO.class)).collect(Collectors.toList()); + public List listNodeVO(List list) { + List collect = list.stream().map(dict -> BeanUtil.copy(dict, DictBizVO.class)).collect(Collectors.toList()); return ForestNodeMerger.merge(collect); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java index 74aa7aab..c1c05144 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DictWrapper.java @@ -19,7 +19,6 @@ package org.springblade.system.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.ForestNodeMerger; -import org.springblade.core.tool.node.INode; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.DictCache; @@ -53,8 +52,8 @@ public class DictWrapper extends BaseEntityWrapper { return dictVO; } - public List listNodeVO(List list) { - List collect = list.stream().map(dict -> BeanUtil.copy(dict, DictVO.class)).collect(Collectors.toList()); + public List listNodeVO(List list) { + List collect = list.stream().map(dict -> BeanUtil.copy(dict, DictVO.class)).collect(Collectors.toList()); return ForestNodeMerger.merge(collect); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java index b717d947..33050f0f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/wrapper/RoleWrapper.java @@ -19,7 +19,6 @@ package org.springblade.system.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.node.ForestNodeMerger; -import org.springblade.core.tool.node.INode; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.cache.SysCache; @@ -54,8 +53,8 @@ public class RoleWrapper extends BaseEntityWrapper { } - public List listNodeVO(List list) { - List collect = list.stream().map(this::entityVO).collect(Collectors.toList()); + public List listNodeVO(List list) { + List collect = list.stream().map(this::entityVO).collect(Collectors.toList()); return ForestNodeMerger.merge(collect); }