fix:重新调整目录结构

service-base/src/main/java/com/simuwang/base/components/ShiroLoginAuthAdapter.java

@@ -1,9 +1,8 @@
 package com.simuwang.base.components;
 
-import com.simuwang.base.pojo.dos.SysMenuDO;
-import com.simuwang.base.pojo.dos.SysRoleDO;
-import com.simuwang.base.pojo.dos.SysUserDO;
-import com.simuwang.base.service.UserAuthService;
+import com.simuwang.base.pojo.dos.sys.SysMenuDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleDO;
+import com.simuwang.base.pojo.dos.sys.SysUserDO;
 import com.simuwang.shiro.core.ShiroUser;
 import com.simuwang.shiro.core.adapter.LoginAuthAdapter;
 

service-base/src/main/java/com/simuwang/base/service/UserAuthService.java

@@ -1,16 +1,21 @@
-package com.simuwang.base.service;
+package com.simuwang.base.components;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.simuwang.base.mapper.SysUserMapper;
-import com.simuwang.base.pojo.dos.SysMenuDO;
-import com.simuwang.base.pojo.dos.SysRoleDO;
-import com.simuwang.base.pojo.dos.SysUserDO;
+import com.simuwang.base.pojo.dos.sys.SysMenuDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleDO;
+import com.simuwang.base.pojo.dos.sys.SysUserDO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * @author wangzaijun
+ * @date 2024/9/13 17:08
+ * @description 用户权限服务
+ */
 @Service
 public class UserAuthService {
     private final SysUserMapper userMapper;

service-base/src/main/java/com/simuwang/base/config/ShiroConfig.java

@@ -3,7 +3,7 @@ package com.simuwang.base.config;
 import cn.hutool.core.map.MapUtil;
 import com.simuwang.base.components.ShiroLoginAuthAdapter;
 import com.simuwang.base.components.ShiroRsaCredentialsMatcher;
-import com.simuwang.base.service.UserAuthService;
+import com.simuwang.base.components.UserAuthService;
 import com.simuwang.shiro.core.ShiroDbRealm;
 import com.simuwang.shiro.core.adapter.LoginAuthAdapter;
 import com.simuwang.shiro.core.bridge.AuthBridgeService;

service-base/src/main/java/com/simuwang/base/mapper/SysMenuMapper.java

@@ -1,7 +1,7 @@
 package com.simuwang.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.simuwang.base.pojo.dos.SysMenuDO;
+import com.simuwang.base.pojo.dos.sys.SysMenuDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

service-base/src/main/java/com/simuwang/base/mapper/SysRoleMapper.java

@@ -1,7 +1,7 @@
 package com.simuwang.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.simuwang.base.pojo.dos.SysRoleDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

service-base/src/main/java/com/simuwang/base/mapper/SysUserMapper.java

@@ -1,10 +1,10 @@
 package com.simuwang.base.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.simuwang.base.pojo.dos.SysMenuDO;
-import com.simuwang.base.pojo.dos.SysRoleDO;
-import com.simuwang.base.pojo.dos.SysRoleUserDO;
-import com.simuwang.base.pojo.dos.SysUserDO;
+import com.simuwang.base.pojo.dos.sys.SysMenuDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleUserDO;
+import com.simuwang.base.pojo.dos.sys.SysUserDO;
 import com.simuwang.base.pojo.dto.query.RoleUserPageQuery;
 import org.springframework.stereotype.Repository;
 

service-base/src/main/java/com/simuwang/base/pojo/dos/SysRoleUserDO.java

@@ -1,44 +0,0 @@
-package com.simuwang.base.pojo.dos;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.simuwang.base.pojo.vo.SysRoleUserVO;
-import com.simuwang.base.pojo.vo.SysRoleVO;
-import lombok.Getter;
-import lombok.Setter;
-
-@Setter
-@Getter
-public class SysRoleUserDO extends SysRoleDO<SysRoleUserVO> {
-    /**
-     * 用户ID
-     */
-    private Integer userId;
-    /**
-     * 用户名称
-     */
-    private String userName;
-    /**
-     * 用户邮箱
-     */
-    private String email;
-    /**
-     * 手机号码
-     */
-    private String phonenumber;
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    private Integer userStatus;
-
-    @Override
-    public SysRoleUserVO toVo() {
-        SysRoleVO vo = super.toVo();
-        SysRoleUserVO roleUserVO = BeanUtil.copyProperties(vo, SysRoleUserVO.class);
-        roleUserVO.setUserId(this.userId);
-        roleUserVO.setUserName(this.userName);
-        roleUserVO.setEmail(this.email);
-        roleUserVO.setPhonenumber(this.phonenumber);
-        roleUserVO.setUserStatus(this.userStatus);
-        return roleUserVO;
-    }
-}

service-base/src/main/java/com/simuwang/base/pojo/dos/SysMenuDO.java

@@ -1,10 +1,10 @@
-package com.simuwang.base.pojo.dos;
+package com.simuwang.base.pojo.dos.sys;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.simuwang.base.common.support.BaseEntity;
-import com.simuwang.base.pojo.vo.SysMenuVO;
+import com.simuwang.base.pojo.vo.sys.SysMenuVO;
 import lombok.Getter;
 import lombok.Setter;
 

service-base/src/main/java/com/simuwang/base/pojo/dos/SysRoleDO.java

@@ -1,11 +1,10 @@
-package com.simuwang.base.pojo.dos;
+package com.simuwang.base.pojo.dos.sys;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.simuwang.base.common.support.BaseEntity;
-import com.simuwang.base.common.support.BaseVO;
-import com.simuwang.base.pojo.vo.SysRoleVO;
+import com.simuwang.base.pojo.vo.sys.SysRoleVO;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,7 +17,7 @@ import lombok.Setter;
 @Setter
 @Getter
 @TableName("sys_role")
-public class SysRoleDO<VO extends BaseVO> extends BaseEntity<VO> {
+public class SysRoleDO extends BaseEntity<SysRoleVO> {
     /**
      * 角色ID
      */
@@ -60,8 +59,7 @@ public class SysRoleDO<VO extends BaseVO> extends BaseEntity<VO> {
     private String remark;
 
     @Override
-    @SuppressWarnings("unchecked")
-    public VO toVo() {
+    public SysRoleVO toVo() {
         SysRoleVO vo = new SysRoleVO();
         vo.setRoleId(this.roleId);
         vo.setRoleName(this.roleName);
@@ -71,6 +69,6 @@ public class SysRoleDO<VO extends BaseVO> extends BaseEntity<VO> {
         vo.setStatus(this.status);
         vo.setCreatorId(this.getCreatorId());
         vo.setCreateTime(this.getCreateTime());
-        return (VO) vo;
+        return vo;
     }
 }

service-base/src/main/java/com/simuwang/base/pojo/dos/sys/SysRoleUserDO.java

@@ -0,0 +1,76 @@
+package com.simuwang.base.pojo.dos.sys;
+
+import com.simuwang.base.common.support.BaseEntity;
+import com.simuwang.base.pojo.vo.sys.SysRoleUserVO;
+import lombok.Getter;
+import lombok.Setter;
+
+@Setter
+@Getter
+public class SysRoleUserDO extends BaseEntity<SysRoleUserVO> {
+    private Integer roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
+    /**
+     * 角色排序
+     */
+    private Integer roleSort;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 用户邮箱
+     */
+    private String email;
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private Integer userStatus;
+
+    @Override
+    public SysRoleUserVO toVo() {
+        SysRoleUserVO vo = new SysRoleUserVO();
+        vo.setRoleId(this.roleId);
+        vo.setRoleName(this.roleName);
+        vo.setRoleKey(this.roleKey);
+        vo.setRemark(this.remark);
+        vo.setRoleSort(this.roleSort);
+        vo.setStatus(this.status);
+        vo.setCreatorId(this.getCreatorId());
+        vo.setCreateTime(this.getCreateTime());
+        vo.setUserId(this.userId);
+        vo.setUserName(this.userName);
+        vo.setEmail(this.email);
+        vo.setPhonenumber(this.phonenumber);
+        vo.setUserStatus(this.userStatus);
+        return vo;
+    }
+}

service-base/src/main/java/com/simuwang/base/pojo/dos/SysUserDO.java

@@ -1,10 +1,10 @@
-package com.simuwang.base.pojo.dos;
+package com.simuwang.base.pojo.dos.sys;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.simuwang.base.common.support.BaseEntity;
-import com.simuwang.base.pojo.vo.SysUserVO;
+import com.simuwang.base.pojo.vo.sys.SysUserVO;
 import lombok.Getter;
 import lombok.Setter;
 

service-base/src/main/java/com/simuwang/base/pojo/vo/SysMenuVO.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.pojo.vo;
+package com.simuwang.base.pojo.vo.sys;
 
 
 import com.simuwang.base.common.support.BaseVO;

service-base/src/main/java/com/simuwang/base/pojo/vo/SysRoleUserVO.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.pojo.vo;
+package com.simuwang.base.pojo.vo.sys;
 
 import lombok.Getter;
 import lombok.Setter;

service-base/src/main/java/com/simuwang/base/pojo/vo/SysRoleVO.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.pojo.vo;
+package com.simuwang.base.pojo.vo.sys;
 
 import com.simuwang.base.common.support.BaseVO;
 import lombok.Getter;

service-base/src/main/java/com/simuwang/base/pojo/vo/SysUserVO.java

@@ -1,4 +1,4 @@
-package com.simuwang.base.pojo.vo;
+package com.simuwang.base.pojo.vo.sys;
 
 import com.simuwang.base.common.support.BaseVO;
 import lombok.Getter;

service-base/src/main/resources/mapper/SysUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.simuwang.base.mapper.SysUserMapper">
-    <select id="selectRoleByUserId" resultType="com.simuwang.base.pojo.dos.SysRoleDO">
+    <select id="selectRoleByUserId" resultType="com.simuwang.base.pojo.dos.sys.SysRoleDO">
         select t.role_id    as roleId,
                t.role_name  as roleName,
                t.role_key   as roleKey,
@@ -21,7 +21,7 @@
         order by t.role_id
     </select>
 
-    <select id="selectAllRole" resultType="com.simuwang.base.pojo.dos.SysRoleDO">
+    <select id="selectAllRole" resultType="com.simuwang.base.pojo.dos.sys.SysRoleDO">
         select t.role_id    as roleId,
                t.role_name  as roleName,
                t.role_key   as roleKey,
@@ -38,7 +38,7 @@
         order by t.role_id
     </select>
 
-    <select id="selectMenuByUserId" resultType="com.simuwang.base.pojo.dos.SysMenuDO">
+    <select id="selectMenuByUserId" resultType="com.simuwang.base.pojo.dos.sys.SysMenuDO">
         select sm.menu_id    as menuId,
                sm.menu_name  as menuName,
                sm.parent_id  as parentId,
@@ -68,7 +68,7 @@
         order by sm.menu_id
     </select>
 
-    <select id="selectAllMenu" resultType="com.simuwang.base.pojo.dos.SysMenuDO">
+    <select id="selectAllMenu" resultType="com.simuwang.base.pojo.dos.sys.SysMenuDO">
         select sm.menu_id    as menuId,
                sm.menu_name  as menuName,
                sm.parent_id  as parentId,
@@ -93,7 +93,7 @@
         order by sm.menu_id
     </select>
 
-    <select id="roleUserPage" resultType="com.simuwang.base.pojo.dos.SysRoleUserDO"
+    <select id="roleUserPage" resultType="com.simuwang.base.pojo.dos.sys.SysRoleUserDO"
             parameterType="com.simuwang.base.pojo.dto.query.RoleUserPageQuery">
         select t.role_id    as roleId,
                t.role_name  as roleName,

service-manage/src/main/java/com/simuwang/manage/api/system/SysUserController.java

@@ -5,8 +5,8 @@ import com.simuwang.base.pojo.dto.command.DeleteByIdCmd;
 import com.simuwang.base.pojo.dto.command.UpdateStatusCmd;
 import com.simuwang.base.pojo.dto.query.RoleUserPageQuery;
 import com.simuwang.base.pojo.dto.query.UserPageQuery;
-import com.simuwang.base.pojo.vo.SysRoleUserVO;
-import com.simuwang.base.pojo.vo.SysUserVO;
+import com.simuwang.base.pojo.vo.sys.SysRoleUserVO;
+import com.simuwang.base.pojo.vo.sys.SysUserVO;
 import com.simuwang.manage.service.system.SysUserService;
 import org.springframework.web.bind.annotation.*;
 

service-manage/src/main/java/com/simuwang/manage/dto/UserMenuTreeDTO.java

@@ -1,7 +1,7 @@
 package com.simuwang.manage.dto;
 
 import cn.hutool.core.collection.ListUtil;
-import com.simuwang.base.pojo.dos.SysMenuDO;
+import com.simuwang.base.pojo.dos.sys.SysMenuDO;
 
 import java.util.List;
 

service-manage/src/main/java/com/simuwang/manage/service/SystemService.java

@@ -1,9 +1,9 @@
 package com.simuwang.manage.service;
 
-import com.simuwang.base.pojo.dos.SysMenuDO;
-import com.simuwang.base.pojo.dos.SysRoleDO;
-import com.simuwang.base.pojo.dos.SysUserDO;
-import com.simuwang.base.service.UserAuthService;
+import com.simuwang.base.pojo.dos.sys.SysMenuDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleDO;
+import com.simuwang.base.pojo.dos.sys.SysUserDO;
+import com.simuwang.base.components.UserAuthService;
 import com.simuwang.base.common.util.TreeUtil;
 import com.simuwang.manage.dto.UserInfoVO;
 import com.simuwang.manage.dto.UserMenuTreeDTO;

service-manage/src/main/java/com/simuwang/manage/service/impl/system/SysUserServiceImpl.java

@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.simuwang.base.common.support.*;
 import com.simuwang.base.mapper.SysUserMapper;
-import com.simuwang.base.pojo.dos.SysRoleUserDO;
-import com.simuwang.base.pojo.dos.SysUserDO;
+import com.simuwang.base.pojo.dos.sys.SysRoleUserDO;
+import com.simuwang.base.pojo.dos.sys.SysUserDO;
 import com.simuwang.base.pojo.dto.query.RoleUserPageQuery;
 import com.simuwang.base.pojo.dto.query.UserPageQuery;
-import com.simuwang.base.pojo.vo.SysRoleUserVO;
-import com.simuwang.base.pojo.vo.SysUserVO;
+import com.simuwang.base.pojo.vo.sys.SysRoleUserVO;
+import com.simuwang.base.pojo.vo.sys.SysUserVO;
 import com.simuwang.manage.service.system.SysUserService;
 import org.springframework.stereotype.Service;
 

service-manage/src/main/java/com/simuwang/manage/service/system/SysUserService.java

@@ -2,9 +2,9 @@ package com.simuwang.manage.service.system;
 
 import com.simuwang.base.common.support.BaseMultiJoinService;
 import com.simuwang.base.common.support.BaseService;
-import com.simuwang.base.pojo.dos.SysUserDO;
-import com.simuwang.base.pojo.vo.SysUserVO;
-import com.simuwang.base.pojo.vo.SysRoleUserVO;
+import com.simuwang.base.pojo.dos.sys.SysUserDO;
+import com.simuwang.base.pojo.vo.sys.SysUserVO;
+import com.simuwang.base.pojo.vo.sys.SysRoleUserVO;
 
 /**
  * @author wangzaijun