优化包结构

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/context/system/SystemContext.java

@@ -86,4 +86,24 @@ public interface SystemContext {
     * @date 2020/6/1 15:13
     */
    List<Dict> listRole(String name);
    /**
     * 根据id判断是否是用户
     *
     * @param userOrRoleId 用户或角色id
     * @return true是 false否
     * @author xuyuxiang
     * @date 2020/8/4 20:56
     */
    boolean isUser(Long userOrRoleId);
    /**
     * 根据id判断是否是角色
     *
     * @param userOrRoleId 用户或角色id
     * @return true是 false否
     * @author xuyuxiang
     * @date 2020/8/4 20:56
     */
    boolean isRole(Long userOrRoleId);
}

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/factory/TreeBuildFactory.java

@@ -26,7 +26,7 @@ package cn.stylefeng.guns.core.factory;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.guns.core.pojo.node.TreeNode;
import cn.stylefeng.guns.core.pojo.node.abs.BaseTreeNode;
import lombok.Data;
import java.util.ArrayList;
@@ -39,7 +39,7 @@ import java.util.List;
 * @date 2020/4/5 14:17
 */
@Data
public class TreeBuildFactory<T extends TreeNode> {
public class TreeBuildFactory<T extends BaseTreeNode> {
    /**
     * 顶级节点的父节点id(默认0)

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/node/AntdTreeNode.java

@@ -24,6 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 */
package cn.stylefeng.guns.core.pojo.node;
import cn.stylefeng.guns.core.pojo.node.abs.BaseTreeNode;
import lombok.Data;
import java.util.List;
@@ -35,7 +36,7 @@ import java.util.List;
 * @date 2020/6/9 12:42
 */
@Data
public class AntdTreeNode implements TreeNode{
public class AntdBaseTreeNode implements BaseTreeNode {
    /**
     * 主键

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/node/CommonTreeNode.java

@@ -24,6 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 */
package cn.stylefeng.guns.core.pojo.node;
import cn.stylefeng.guns.core.pojo.node.abs.BaseTreeNode;
import lombok.Data;
import java.util.List;
@@ -35,7 +36,7 @@ import java.util.List;
 * @date 2020/3/26 14:29
 */
@Data
public class CommonTreeNode implements TreeNode {
public class CommonBaseTreeNode implements BaseTreeNode {
    /**
     * 节点id

guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/pojo/node/TreeNode.java

@@ -22,7 +22,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns-separation
6.若您的项目无法满足以上几点，可申请商业授权，获取Guns商业授权许可，请在官网购买授权，地址为 https://www.stylefeng.cn
 */
package cn.stylefeng.guns.core.pojo.node;
package cn.stylefeng.guns.core.pojo.node.abs;
import java.util.List;
@@ -32,7 +32,7 @@ import java.util.List;
 * @author xuyuxiang
 * @date 2020/4/5 14:07
 */
public interface TreeNode {
public interface BaseTreeNode {
    /**

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/context/SystemContextImpl.java

@@ -29,8 +29,10 @@ import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.guns.core.context.system.SystemContext;
import cn.stylefeng.guns.core.pojo.login.SysLoginUser;
import cn.stylefeng.guns.sys.modular.auth.service.AuthService;
import cn.stylefeng.guns.sys.modular.role.entity.SysRole;
import cn.stylefeng.guns.sys.modular.role.param.SysRoleParam;
import cn.stylefeng.guns.sys.modular.role.service.SysRoleService;
import cn.stylefeng.guns.sys.modular.user.entity.SysUser;
import cn.stylefeng.guns.sys.modular.user.param.SysUserParam;
import cn.stylefeng.guns.sys.modular.user.service.SysUserService;
import org.springframework.stereotype.Component;
@@ -56,45 +58,21 @@ public class SystemContextImpl implements SystemContext {
    @Resource
    private SysRoleService sysRoleService;
    /**
     * 根据用户id获取姓名
     *
     * @author xuyuxiang
     * @date 2020/5/6 15:03
     */
    @Override
    public String getNameByUserId(Long userId) {
        return sysUserService.getNameByUserId(userId);
    }
    /**
     * 根据角色id获取名称
     *
     * @author xuyuxiang
     * @date 2020/5/22 15:56
     */
    @Override
    public String getNameByRoleId(Long roleId) {
        return sysRoleService.getNameByRoleId(roleId);
    }
    /**
     * 根据token获取登录用户信息
     *
     * @author xuyuxiang
     * @date 2020/6/1 15:10
     */
    @Override
    public SysLoginUser getLoginUserByToken(String token) {
        return authService.getLoginUserByToken(token);
    }
    /**
     * 根据用户账号模糊搜索系统用户列表
     *
     * @author xuyuxiang
     * @date 2020/6/1 15:13
     */
    @Override
    public List<Dict> listUser(String account) {
        SysUserParam sysUserParam = new SysUserParam();
@@ -104,12 +82,6 @@ public class SystemContextImpl implements SystemContext {
        return sysUserService.list(sysUserParam);
    }
    /**
     * 根据角色名模糊搜索系统角色列表
     *
     * @author xuyuxiang
     * @date 2020/6/1 15:13
     */
    @Override
    public List<Dict> listRole(String name) {
        SysRoleParam sysRoleParam = new SysRoleParam();
@@ -118,4 +90,16 @@ public class SystemContextImpl implements SystemContext {
        }
        return sysRoleService.list(sysRoleParam);
    }
    @Override
    public boolean isUser(Long userOrRoleId) {
        SysUser sysUser = sysUserService.getById(userOrRoleId);
        return !ObjectUtil.isNull(sysUser);
    }
    @Override
    public boolean isRole(Long userOrRoleId) {
        SysRole sysRole = sysRoleService.getById(userOrRoleId);
        return !ObjectUtil.isNull(sysRole);
    }
}

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/entity/SysMenu.java

@@ -25,7 +25,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
package cn.stylefeng.guns.sys.modular.menu.entity;
import cn.stylefeng.guns.core.pojo.base.entity.BaseEntity;
import cn.stylefeng.guns.core.pojo.node.TreeNode;
import cn.stylefeng.guns.core.pojo.node.abs.BaseTreeNode;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -41,7 +41,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("sys_menu")
public class SysMenu extends BaseEntity implements TreeNode {
public class SysMenu extends BaseEntity implements BaseTreeNode {
    /**
     * 主键

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/node/MenuTreeNode.java

@@ -24,7 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 */
package cn.stylefeng.guns.sys.modular.menu.node;
import cn.stylefeng.guns.core.pojo.node.TreeNode;
import cn.stylefeng.guns.core.pojo.node.abs.BaseTreeNode;
import lombok.Data;
import java.util.List;
@@ -36,7 +36,7 @@ import java.util.List;
 * @date 2020/4/5 12:03
 */
@Data
public class MenuTreeNode implements TreeNode {
public class MenuBaseTreeNode implements BaseTreeNode {
    /**
     * 主键

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/service/SysMenuService.java

@@ -26,7 +26,7 @@ package cn.stylefeng.guns.sys.modular.menu.service;
import cn.stylefeng.guns.core.pojo.node.LoginMenuTreeNode;
import cn.stylefeng.guns.sys.modular.menu.entity.SysMenu;
import cn.stylefeng.guns.sys.modular.menu.node.MenuTreeNode;
import cn.stylefeng.guns.sys.modular.menu.node.MenuBaseTreeNode;
import cn.stylefeng.guns.sys.modular.menu.param.SysMenuParam;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -126,7 +126,7 @@ public interface SysMenuService extends IService<SysMenu> {
     * @author xuyuxiang
     * @date 2020/3/27 15:56
     */
    List<MenuTreeNode> tree(SysMenuParam sysMenuParam);
    List<MenuBaseTreeNode> tree(SysMenuParam sysMenuParam);
    /**
     * 获取系统菜单树，用于给角色授权时选择
@@ -135,7 +135,7 @@ public interface SysMenuService extends IService<SysMenu> {
     * @author xuyuxiang
     * @date 2020/4/5 15:01
     */
    List<MenuTreeNode> treeForGrant(SysMenuParam sysMenuParam);
    List<MenuBaseTreeNode> treeForGrant(SysMenuParam sysMenuParam);
    /**
     * 根据应用编码判断该机构下是否有状态为正常的菜单

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/menu/service/impl/SysMenuServiceImpl.java

@@ -42,7 +42,7 @@ import cn.stylefeng.guns.sys.core.enums.MenuWeightEnum;
import cn.stylefeng.guns.sys.modular.menu.entity.SysMenu;
import cn.stylefeng.guns.sys.modular.menu.enums.SysMenuExceptionEnum;
import cn.stylefeng.guns.sys.modular.menu.mapper.SysMenuMapper;
import cn.stylefeng.guns.sys.modular.menu.node.MenuTreeNode;
import cn.stylefeng.guns.sys.modular.menu.node.MenuBaseTreeNode;
import cn.stylefeng.guns.sys.modular.menu.param.SysMenuParam;
import cn.stylefeng.guns.sys.modular.menu.service.SysMenuService;
import cn.stylefeng.guns.sys.modular.role.service.SysRoleMenuService;
@@ -335,8 +335,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
    }
    @Override
    public List<MenuTreeNode> tree(SysMenuParam sysMenuParam) {
        List<MenuTreeNode> menuTreeNodeList = CollectionUtil.newArrayList();
    public List<MenuBaseTreeNode> tree(SysMenuParam sysMenuParam) {
        List<MenuBaseTreeNode> menuTreeNodeList = CollectionUtil.newArrayList();
        LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
@@ -349,7 +349,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
                .in(SysMenu::getType, CollectionUtil.newArrayList(MenuTypeEnum.DIR.getCode(), MenuTypeEnum.MENU.getCode()));
        this.list(queryWrapper).forEach(sysMenu -> {
            MenuTreeNode menuTreeNode = new MenuTreeNode();
            MenuBaseTreeNode menuTreeNode = new MenuBaseTreeNode();
            menuTreeNode.setId(sysMenu.getId());
            menuTreeNode.setParentId(sysMenu.getPid());
            menuTreeNode.setValue(String.valueOf(sysMenu.getId()));
@@ -357,12 +357,12 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
            menuTreeNode.setWeight(sysMenu.getSort());
            menuTreeNodeList.add(menuTreeNode);
        });
        return new TreeBuildFactory<MenuTreeNode>().doTreeBuild(menuTreeNodeList);
        return new TreeBuildFactory<MenuBaseTreeNode>().doTreeBuild(menuTreeNodeList);
    }
    @Override
    public List<MenuTreeNode> treeForGrant(SysMenuParam sysMenuParam) {
        List<MenuTreeNode> menuTreeNodeList = CollectionUtil.newArrayList();
    public List<MenuBaseTreeNode> treeForGrant(SysMenuParam sysMenuParam) {
        List<MenuBaseTreeNode> menuTreeNodeList = CollectionUtil.newArrayList();
        LambdaQueryWrapper<SysMenu> queryWrapper = new LambdaQueryWrapper<>();
        //根据应用查询
@@ -393,7 +393,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
            }
        }
        this.list(queryWrapper).forEach(sysMenu -> {
            MenuTreeNode menuTreeNode = new MenuTreeNode();
            MenuBaseTreeNode menuTreeNode = new MenuBaseTreeNode();
            menuTreeNode.setId(sysMenu.getId());
            menuTreeNode.setParentId(sysMenu.getPid());
            menuTreeNode.setValue(String.valueOf(sysMenu.getId()));
@@ -401,7 +401,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
            menuTreeNode.setWeight(sysMenu.getSort());
            menuTreeNodeList.add(menuTreeNode);
        });
        return new TreeBuildFactory<MenuTreeNode>().doTreeBuild(menuTreeNodeList);
        return new TreeBuildFactory<MenuBaseTreeNode>().doTreeBuild(menuTreeNodeList);
    }
    @Override

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/org/service/SysOrgService.java

@@ -24,7 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意
 */
package cn.stylefeng.guns.sys.modular.org.service;
import cn.stylefeng.guns.core.pojo.node.AntdTreeNode;
import cn.stylefeng.guns.core.pojo.node.AntdBaseTreeNode;
import cn.stylefeng.guns.core.pojo.page.PageResult;
import cn.stylefeng.guns.sys.modular.org.entity.SysOrg;
import cn.stylefeng.guns.sys.modular.org.param.SysOrgParam;
@@ -105,7 +105,7 @@ public interface SysOrgService extends IService<SysOrg> {
     * @author xuyuxiang yubaoshan
     * @date 2020/3/26 11:56
     */
    List<AntdTreeNode> tree(SysOrgParam sysOrgParam);
    List<AntdBaseTreeNode> tree(SysOrgParam sysOrgParam);
    /**
     * 根据数据范围类型获取当前登录用户的数据范围id集合

guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/org/service/impl/SysOrgServiceImpl.java

@@ -37,7 +37,7 @@ import cn.stylefeng.guns.core.exception.ServiceException;
import cn.stylefeng.guns.core.exception.enums.PermissionExceptionEnum;
import cn.stylefeng.guns.core.factory.PageFactory;
import cn.stylefeng.guns.core.factory.TreeBuildFactory;
import cn.stylefeng.guns.core.pojo.node.AntdTreeNode;
import cn.stylefeng.guns.core.pojo.node.AntdBaseTreeNode;
import cn.stylefeng.guns.core.pojo.page.PageResult;
import cn.stylefeng.guns.sys.core.enums.DataScopeTypeEnum;
import cn.stylefeng.guns.sys.modular.emp.service.SysEmpExtOrgPosService;
@@ -277,8 +277,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
    }
    @Override
    public List<AntdTreeNode> tree(SysOrgParam sysOrgParam) {
        List<AntdTreeNode> treeNodeList = CollectionUtil.newArrayList();
    public List<AntdBaseTreeNode> tree(SysOrgParam sysOrgParam) {
        List<AntdBaseTreeNode> treeNodeList = CollectionUtil.newArrayList();
        LambdaQueryWrapper<SysOrg> queryWrapper = new LambdaQueryWrapper<>();
        // 如果是超级管理员则获取所有组织机构，否则只获取其数据范围的机构数据
@@ -302,7 +302,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
        queryWrapper.eq(SysOrg::getStatus, CommonStatusEnum.ENABLE.getCode());
        this.list(queryWrapper).forEach(sysOrg -> {
            AntdTreeNode orgTreeNode = new AntdTreeNode();
            AntdBaseTreeNode orgTreeNode = new AntdBaseTreeNode();
            orgTreeNode.setId(sysOrg.getId());
            orgTreeNode.setParentId(sysOrg.getPid());
            orgTreeNode.setTitle(sysOrg.getName());
@@ -311,7 +311,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
            treeNodeList.add(orgTreeNode);
        });
        return new TreeBuildFactory<AntdTreeNode>().doTreeBuild(treeNodeList);
        return new TreeBuildFactory<AntdBaseTreeNode>().doTreeBuild(treeNodeList);
    }
    @Override