From e27898adc06919d416e72b0347047521b70e40d1 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 13 Jan 2021 11:38:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90dict=E3=80=91=E6=95=B4=E7=90=86dict?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E3=80=90tree=E3=80=91=E6=95=B4=E7=90=86tr?= =?UTF-8?q?ee=E8=8A=82=E7=82=B9=E6=94=BE=E5=88=B0rule=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/rule/constants/TreeConstants.java | 8 ++--- .../kernel/rule/factory/TreeNodeFactory.java | 32 ------------------- .../kernel/rule}/pojo/ztree/ZTreeNode.java | 10 +++--- kernel-s-dict/dict-business/pom.xml | 8 ----- .../modular/controller/DictController.java | 10 ++---- .../controller/DictTypeController.java | 11 +++++-- .../dict/modular/mapper/DictTypeMapper.java | 2 -- .../dict/modular/service/DictService.java | 5 ++- .../dict/modular/service/DictTypeService.java | 3 +- .../modular/service/impl/DictServiceImpl.java | 6 ++-- .../system/constants/SystemConstants.java | 10 ------ .../modular/controller/SysMenuController.java | 2 +- .../modular/factory/AntdMenusFactory.java | 12 +++---- .../menu/modular/service/SysMenuService.java | 2 +- .../service/impl/SysMenuServiceImpl.java | 14 ++++---- .../controller/HrOrganizationController.java | 2 +- .../factory/OrganizationFactory.java | 2 +- .../service/HrOrganizationService.java | 2 +- .../impl/HrOrganizationServiceImpl.java | 7 ++-- .../service/impl/SysResourceServiceImpl.java | 8 ++--- 20 files changed, 51 insertions(+), 105 deletions(-) delete mode 100644 kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/TreeNodeFactory.java rename {kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system => kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule}/pojo/ztree/ZTreeNode.java (85%) diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/TreeConstants.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/TreeConstants.java index 00ad83b6b..52a65cee4 100644 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/TreeConstants.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/constants/TreeConstants.java @@ -9,13 +9,13 @@ package cn.stylefeng.roses.kernel.rule.constants; public interface TreeConstants { /** - * 根节点Id + * 一级节点的父节点id */ - String ROOT_TREE_NODE_ID = "-1"; + Long DEFAULT_PARENT_ID = -1L; /** - * 根节点名称 + * 虚拟的根节点的父级id */ - String ROOT_TREE_NODE_NAME = "根结点"; + Long VIRTUAL_ROOT_PARENT_ID = -2L; } diff --git a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/TreeNodeFactory.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/TreeNodeFactory.java deleted file mode 100644 index fc0d3decc..000000000 --- a/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/factory/TreeNodeFactory.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.stylefeng.roses.kernel.rule.factory; - -import cn.stylefeng.roses.kernel.rule.pojo.tree.DefaultTreeNode; - -import static cn.stylefeng.roses.kernel.rule.constants.TreeConstants.ROOT_TREE_NODE_ID; -import static cn.stylefeng.roses.kernel.rule.constants.TreeConstants.ROOT_TREE_NODE_NAME; - -/** - * 创建树节点的工厂类 - * - * @author fengshuonan - * @date 2020/10/15 15:51 - */ -public class TreeNodeFactory { - - /** - * 创建一个根节点 - * - * @author fengshuonan - * @date 2020/10/15 15:52 - */ - public static DefaultTreeNode createRootNode() { - DefaultTreeNode root = new DefaultTreeNode(); - root.setChecked(false); - root.setId(ROOT_TREE_NODE_ID); - root.setName(ROOT_TREE_NODE_NAME); - root.setOpen(true); - root.setPId(null); - return root; - } - -} diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/ztree/ZTreeNode.java similarity index 85% rename from kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java rename to kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/ztree/ZTreeNode.java index 28a0bbe87..7d4f33e0a 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/ztree/ZTreeNode.java +++ b/kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/pojo/ztree/ZTreeNode.java @@ -1,7 +1,7 @@ -package cn.stylefeng.roses.kernel.system.pojo.ztree; +package cn.stylefeng.roses.kernel.rule.pojo.ztree; import cn.stylefeng.roses.kernel.rule.abstracts.AbstractTreeNode; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; +import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; @@ -10,7 +10,7 @@ import lombok.ToString; import java.util.List; /** - * jquery ztree 插件的节点封装 + * jquery zTree 插件的节点封装 * * @author fengshuonan * @date 2021/1/6 21:47 @@ -75,10 +75,10 @@ public class ZTreeNode implements AbstractTreeNode { public static ZTreeNode createParent() { ZTreeNode zTreeNode = new ZTreeNode(); zTreeNode.setChecked(true); - zTreeNode.setId(SystemConstants.DEFAULT_PARENT_ID); + zTreeNode.setId(TreeConstants.DEFAULT_PARENT_ID); zTreeNode.setName("顶级"); zTreeNode.setOpen(true); - zTreeNode.setpId(SystemConstants.VIRTUAL_ROOT_PARENT_ID); + zTreeNode.setpId(TreeConstants.VIRTUAL_ROOT_PARENT_ID); return zTreeNode; } diff --git a/kernel-s-dict/dict-business/pom.xml b/kernel-s-dict/dict-business/pom.xml index 7ceb1bf23..0de04c9c3 100644 --- a/kernel-s-dict/dict-business/pom.xml +++ b/kernel-s-dict/dict-business/pom.xml @@ -40,14 +40,6 @@ 1.0.0 - - - - cn.stylefeng.roses - system-api - 1.0.0 - - diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java index 552cb3a23..49aa86aa5 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictController.java @@ -11,14 +11,13 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; -import org.springframework.beans.factory.annotation.Autowired; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; /** @@ -31,7 +30,7 @@ import java.util.List; @ApiResource(name = "字典详情管理") public class DictController { - @Autowired + @Resource private DictService dictService; /** @@ -159,13 +158,10 @@ public class DictController { /** * 字典树列表 * - * @param - * @return * @author huangyao * @date 2021/1/10 17:31 */ @GetResource(name = "获取zTree形式的字典树（layui版本）", path = "/dict/zTree") - @ResponseBody public List layuiSelectParentMenuTreeList(@Validated(DictRequest.dictZTree.class) DictRequest dictRequest) { return this.dictService.dictZTree(dictRequest); } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java index be7959449..62fb5563b 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/controller/DictTypeController.java @@ -1,7 +1,6 @@ package cn.stylefeng.roses.kernel.dict.modular.controller; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest; import cn.stylefeng.roses.kernel.dict.modular.service.DictTypeService; @@ -11,12 +10,12 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; @@ -30,7 +29,7 @@ import java.util.List; @ApiResource(name = "字典类型管理") public class DictTypeController { - @Autowired + @Resource private DictTypeService dictTypeService; /** @@ -81,6 +80,12 @@ public class DictTypeController { return new SuccessResponseData(); } + /** + * 获取字典类型详情 + * + * @author fengshuonan + * @date 2021/1/13 11:25 + */ @GetResource(name = "获取字典类型详情", path = "/dictType/getDictDetail", requiredPermission = false) public ResponseData getDictDetail(@RequestParam("dictTypeId") Long dictTypeId) { SysDictType detail = this.dictTypeService.findDetail(dictTypeId); diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java index ae8d4a85d..30583c142 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/mapper/DictTypeMapper.java @@ -1,6 +1,5 @@ package cn.stylefeng.roses.kernel.dict.modular.mapper; -import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -21,7 +20,6 @@ public interface DictTypeMapper extends BaseMapper { * 获取字典类型详情 * * @param dictTypeId 类型id - * @return * @author huangyao * @date 2021/1/10 17:25 */ diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java index 0c79f7182..9a00eaf59 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java @@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.pojo.TreeDictInfo; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictRequest; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -117,10 +117,9 @@ public interface DictService extends IService, DictApi { /** * 获取字典的ztree列表 * - * @param - * @return * @author huangyao * @date 2021/1/12 14:27 */ List dictZTree(DictRequest dictRequest); + } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java index 8e4fbfdf7..472e255c8 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictTypeService.java @@ -2,7 +2,6 @@ package cn.stylefeng.roses.kernel.dict.modular.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.dict.modular.entity.SysDict; import cn.stylefeng.roses.kernel.dict.modular.entity.SysDictType; import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictTypeRequest; import com.baomidou.mybatisplus.extension.service.IService; @@ -87,9 +86,9 @@ public interface DictTypeService extends IService { * 获取字典详情 * * @param dictTypeId 类型id - * @return * @author huangyao * @date 2021/1/10 17:27 */ SysDictType findDetail(Long dictTypeId); + } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java index e58a35bc4..51520a929 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java @@ -18,11 +18,11 @@ import cn.stylefeng.roses.kernel.dict.modular.pojo.request.DictRequest; import cn.stylefeng.roses.kernel.dict.modular.service.DictService; import cn.stylefeng.roses.kernel.pinyin.api.PinYinApi; import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; +import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -157,7 +157,7 @@ public class DictServiceImpl extends ServiceImpl implements public SysDict findDetail(Long dictId) { SysDict dict = this.baseMapper.findDetail(dictId); // 获取父节点字典名称 - if (dict.getDictParentId().equals(SystemConstants.DEFAULT_PARENT_ID)) { + if (dict.getDictParentId().equals(TreeConstants.DEFAULT_PARENT_ID)) { dict.setParentName("顶级"); } else { SysDict parentDict = this.getById(dict.getDictParentId()); diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java index ae6ac2760..36ba71f48 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/constants/SystemConstants.java @@ -18,16 +18,6 @@ public interface SystemConstants { */ String SYSTEM_EXCEPTION_STEP_CODE = "18"; - /** - * 一级节点的父节点id - */ - Long DEFAULT_PARENT_ID = -1L; - - /** - * 虚拟的根节点的父级id - */ - Long VIRTUAL_ROOT_PARENT_ID = -2L; - /** * pids系列字段，每个id的左分隔符 */ diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java index 73416396e..efcba0adf 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java @@ -8,11 +8,11 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse; import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java index 2d97e03be..cadca77e7 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/AntdMenusFactory.java @@ -4,9 +4,9 @@ import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo; import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu; import cn.stylefeng.roses.kernel.menu.modular.pojo.AntdvMenuItem; import cn.stylefeng.roses.kernel.menu.modular.pojo.AuthorityItem; +import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdIndexMenuTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse; @@ -64,7 +64,7 @@ public class AntdMenusFactory { antdvMenuItems.add(createAntdVMenuRoot()); // 构造菜单树 - return new DefaultTreeBuildFactory(SystemConstants.VIRTUAL_ROOT_PARENT_ID.toString()).doTreeBuild(antdvMenuItems); + return new DefaultTreeBuildFactory(TreeConstants.VIRTUAL_ROOT_PARENT_ID.toString()).doTreeBuild(antdvMenuItems); } /** @@ -77,8 +77,8 @@ public class AntdMenusFactory { AntdvMenuItem antdvMenuItem = new AntdvMenuItem(); antdvMenuItem.setRouter("root"); antdvMenuItem.setName("根节点"); - antdvMenuItem.setMenuId(SystemConstants.DEFAULT_PARENT_ID); - antdvMenuItem.setMenuParentId(SystemConstants.VIRTUAL_ROOT_PARENT_ID); + antdvMenuItem.setMenuId(TreeConstants.DEFAULT_PARENT_ID); + antdvMenuItem.setMenuParentId(TreeConstants.VIRTUAL_ROOT_PARENT_ID); antdvMenuItem.setAuthority(null); @@ -137,8 +137,8 @@ public class AntdMenusFactory { */ private static AntdIndexMenuTreeNode createRootMenuNode() { AntdIndexMenuTreeNode antdIndexMenuTreeNode = new AntdIndexMenuTreeNode(); - antdIndexMenuTreeNode.setId(SystemConstants.DEFAULT_PARENT_ID); - antdIndexMenuTreeNode.setPid(SystemConstants.VIRTUAL_ROOT_PARENT_ID); + antdIndexMenuTreeNode.setId(TreeConstants.DEFAULT_PARENT_ID); + antdIndexMenuTreeNode.setPid(TreeConstants.VIRTUAL_ROOT_PARENT_ID); antdIndexMenuTreeNode.setName("根虚拟节点"); antdIndexMenuTreeNode.setPath("/"); return antdIndexMenuTreeNode; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java index 2de5ec085..e08aa41d1 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java @@ -25,6 +25,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package cn.stylefeng.roses.kernel.menu.modular.service; import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdIndexMenuTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse; @@ -32,7 +33,6 @@ import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenus; import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse; import cn.stylefeng.roses.kernel.system.pojo.menu.other.MenuSelectTreeNode; import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java index 6393e87e6..19dff0f19 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java +++ b/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java @@ -40,15 +40,16 @@ import cn.stylefeng.roses.kernel.menu.modular.factory.common.CommonMenusFactory; import cn.stylefeng.roses.kernel.menu.modular.mapper.SysMenuMapper; import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuButtonService; import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuService; +import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.AppServiceApi; import cn.stylefeng.roses.kernel.system.MenuServiceApi; import cn.stylefeng.roses.kernel.system.RoleServiceApi; import cn.stylefeng.roses.kernel.system.constants.SymbolConstant; -import cn.stylefeng.roses.kernel.system.constants.SystemConstants; import cn.stylefeng.roses.kernel.system.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.exception.enums.SysMenuExceptionEnum; import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum; @@ -61,7 +62,6 @@ import cn.stylefeng.roses.kernel.system.pojo.menu.other.MenuSelectTreeNode; import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest; import cn.stylefeng.roses.kernel.system.pojo.role.response.SysRoleMenuButtonResponse; import cn.stylefeng.roses.kernel.system.pojo.role.response.SysRoleMenuResponse; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -156,7 +156,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 设置父级菜单名称 if (sysMenu != null) { Long menuParentId = sysMenu.getMenuParentId(); - if (SystemConstants.DEFAULT_PARENT_ID.equals(menuParentId)) { + if (TreeConstants.DEFAULT_PARENT_ID.equals(menuParentId)) { sysMenu.setMenuParentName("顶级"); } else { Long parentId = sysMenu.getMenuParentId(); @@ -285,7 +285,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl List antdIndexMenuTreeNodes = AntdMenusFactory.convertSysMenuToLoginMenu(currentUserMenus); // 转化成树结构 - return new DefaultTreeBuildFactory(SystemConstants.VIRTUAL_ROOT_PARENT_ID.toString()).doTreeBuild(antdIndexMenuTreeNodes); + return new DefaultTreeBuildFactory(TreeConstants.VIRTUAL_ROOT_PARENT_ID.toString()).doTreeBuild(antdIndexMenuTreeNodes); } @Override @@ -469,8 +469,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @date 2020/3/26 11:28 */ private String createPids(Long pid) { - if (pid.equals(SystemConstants.DEFAULT_PARENT_ID)) { - return SymbolConstant.LEFT_SQUARE_BRACKETS + SystemConstants.DEFAULT_PARENT_ID + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA; + if (pid.equals(TreeConstants.DEFAULT_PARENT_ID)) { + return SymbolConstant.LEFT_SQUARE_BRACKETS + TreeConstants.DEFAULT_PARENT_ID + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA; } else { //获取父菜单 SysMenu parentMenu = this.getById(pid); @@ -564,7 +564,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 如果应用有变化，不能把非一级菜单转移应用 if (!sysMenuRequest.getAppCode().equals(oldMenu.getAppCode())) { - if (!oldPid.equals(SystemConstants.DEFAULT_PARENT_ID)) { + if (!oldPid.equals(TreeConstants.DEFAULT_PARENT_ID)) { throw new ServiceException(SysMenuExceptionEnum.CANT_MOVE_APP); } updateSubAppsFlag = true; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java index d7aee2b23..b4df1c44d 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java @@ -5,9 +5,9 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService; import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java index 4f62d4564..62748f7d0 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java @@ -1,8 +1,8 @@ package cn.stylefeng.roses.kernel.system.modular.organization.factory; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import java.util.ArrayList; import java.util.List; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java index 525f45dcd..7f52e1cbd 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java @@ -2,10 +2,10 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.tree.DefaultTreeNode; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java index d2ae0d5bd..cf16e75b7 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java @@ -12,10 +12,12 @@ import cn.stylefeng.roses.kernel.db.api.context.DbOperatorContext; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.rule.constants.TreeConstants; import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.pojo.tree.DefaultTreeNode; +import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.RoleServiceApi; import cn.stylefeng.roses.kernel.system.UserOrgServiceApi; import cn.stylefeng.roses.kernel.system.UserServiceApi; @@ -28,7 +30,6 @@ import cn.stylefeng.roses.kernel.system.modular.organization.mapper.HrOrganizati import cn.stylefeng.roses.kernel.system.modular.organization.service.HrOrganizationService; import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationRequest; import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode; -import cn.stylefeng.roses.kernel.system.pojo.ztree.ZTreeNode; import cn.stylefeng.roses.kernel.system.util.DataScopeUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -398,9 +399,9 @@ public class HrOrganizationServiceImpl extends ServiceImpl> modularResources = appModularResources.get(appName); @@ -447,7 +445,7 @@ public class SysResourceServiceImpl extends ServiceImpl> modularResources = appModularResources.get(appName);