From 5e41fa101ae2a08a48b92c8302e200a886c3e55a Mon Sep 17 00:00:00 2001 From: lycode Date: Thu, 28 Nov 2024 17:27:41 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E3=80=81=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E3=80=81=E9=83=A8=E9=97=A8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=80=81=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E3=80=81?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=81=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 109 +++++++++++++++++- .../framework/satoken/MySaTokenListener.java | 2 +- .../framework/satoken/SaTokenConfig.java | 2 +- .../web/controller/SysLoginController.java | 2 +- .../web/service/SysLoginService.java | 2 +- .../web/service/SysPermissionService.java | 11 +- .../web/service/SysRegisterService.java | 2 +- ...77\345\217\230\351\207\217\345\220\215.md" | 2 +- lycode_admin_vue/env.d.ts | 6 + lycode_admin_vue/pnpm-lock.yaml | 15 +++ .../src/api/modules/system/user.ts | 4 +- .../src/views/system/accountManage/index.vue | 37 +++--- .../constant/ParamConstant.java | 2 +- .../system/constant/SystemConstant.java | 18 +++ .../controller/SysDeptController.java | 12 +- .../controller/SysDictController.java | 14 +-- .../controller/SysDictTypeController.java | 10 +- .../controller/SysMenuController.java | 10 +- .../controller/SysPostController.java | 12 +- .../controller/SysRoleController.java | 12 +- .../controller/SysUserController.java | 50 ++++---- .../domain/dto/ChangeStatusDTO.java | 2 +- .../domain/dto/sysdept/SysDeptAddDTO.java | 2 +- .../domain/dto/sysdept/SysDeptUpDTO.java | 2 +- .../domain/dto/sysdict/SysDictAddDTO.java | 4 +- .../domain/dto/sysdict/SysDictListDTO.java | 2 +- .../domain/dto/sysdict/SysDictTypeAddDTO.java | 4 +- .../domain/dto/sysdict/SysDictTypeUpDTO.java | 4 +- .../domain/dto/sysdict/SysDictUpDTO.java | 4 +- .../domain/dto/sysmenu/MenuPermissionDTO.java | 2 +- .../domain/dto/sysmenu/SysMenuAddDTO.java | 2 +- .../domain/dto/sysmenu/SysMenuListDTO.java | 2 +- .../domain/dto/sysmenu/SysMenuUpDTO.java | 2 +- .../domain/dto/sysmenu/SysUserRoleDTO.java | 2 +- .../domain/dto/syspost/SysPostAddDTO.java | 4 +- .../domain/dto/syspost/SysPostListDTO.java | 2 +- .../domain/dto/syspost/SysPostUpdateDTO.java | 4 +- .../domain/dto/sysrole/SysRoleAddDTO.java | 2 +- .../domain/dto/sysrole/SysRoleMenuDTO.java | 2 +- .../domain/dto/sysrole/SysRoleUpDTO.java | 2 +- .../domain/dto/sysuser/SysUserAddDTO.java | 2 +- .../dto/sysuser/SysUserPasswordDTO.java | 2 +- .../domain/dto/sysuser/SysUserUpDTO.java | 2 +- .../domain/dto/sysuser/UserDeptDTO.java | 2 +- .../domain/entity/SysConfig.java | 2 +- .../domain/entity/SysDept.java | 2 +- .../domain/entity/SysDict.java | 2 +- .../domain/entity/SysDictType.java | 2 +- .../domain/entity/SysPost.java | 4 +- .../domain/entity/SysRoleDept.java | 2 +- .../domain/entity/SysRoleMenu.java | 2 +- .../domain/entity/SysUserPost.java | 2 +- .../domain/entity/SysUserRole.java | 2 +- .../domain/vo/DeptTreeVO.java | 2 +- .../domain/vo/DictCustomVO.java | 2 +- .../domain/vo/MenuTreeVO.java | 2 +- .../{rbac => system}/domain/vo/SysDeptVO.java | 2 +- .../{rbac => system}/domain/vo/SysMenuVO.java | 2 +- .../{rbac => system}/domain/vo/SysPostVO.java | 2 +- .../domain/vo/SysRoleMenuVO.java | 2 +- .../domain/vo/SysUserRoleVO.java | 2 +- .../{rbac => system}/domain/vo/SysUserVO.java | 4 +- .../domain/vo/TotalDeptVO.java | 2 +- .../mapper/SysDeptMapper.java | 4 +- .../mapper/SysDictMapper.java | 8 +- .../mapper/SysDictTypeMapper.java | 4 +- .../mapper/SysMenuMapper.java | 2 +- .../mapper/SysPostMapper.java | 6 +- .../mapper/SysRoleDeptMapper.java | 4 +- .../mapper/SysRoleMapper.java | 2 +- .../mapper/SysRoleMenuMapper.java | 2 +- .../mapper/SysUserMapper.java | 4 +- .../mapper/SysUserPostMapper.java | 4 +- .../mapper/SysUserRoleMapper.java | 4 +- .../service/SysConfigService.java | 4 +- .../service/SysDeptService.java | 10 +- .../service/SysDictService.java | 12 +- .../service/SysDictTypeService.java | 8 +- .../service/SysMenuService.java | 8 +- .../service/SysPostService.java | 10 +- .../service/SysRoleService.java | 12 +- .../service/SysUserService.java | 24 ++-- .../service/impl/SysDeptServiceImpl.java | 27 ++--- .../service/impl/SysDictServiceImpl.java | 20 ++-- .../service/impl/SysDictTypeServiceImpl.java | 12 +- .../service/impl/SysMenuServiceImpl.java | 14 +-- .../service/impl/SysPostServiceImpl.java | 16 +-- .../service/impl/SysRoleServiceImpl.java | 24 ++-- .../service/impl/SysUserServiceImpl.java | 41 +++---- .../resources/mapper/system/SysDeptMapper.xml | 8 +- .../resources/mapper/system/SysDictMapper.xml | 14 +-- .../mapper/system/SysDictTypeMapper.xml | 8 +- .../resources/mapper/system/SysMenuMapper.xml | 2 +- .../resources/mapper/system/SysPostMapper.xml | 10 +- .../resources/mapper/system/SysRoleMapper.xml | 2 +- .../mapper/system/SysRoleMenuMapper.xml | 4 +- .../resources/mapper/system/SysUserMapper.xml | 8 +- .../mapper/system/SysUserRoleMapper.xml | 6 +- 98 files changed, 476 insertions(+), 306 deletions(-) rename system/src/main/java/cn/lycode/{rbac => system}/constant/ParamConstant.java (72%) create mode 100644 system/src/main/java/cn/lycode/system/constant/SystemConstant.java rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysDeptController.java (88%) rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysDictController.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysDictTypeController.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysMenuController.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysPostController.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysRoleController.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/controller/SysUserController.java (77%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/ChangeStatusDTO.java (88%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdept/SysDeptAddDTO.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdept/SysDeptUpDTO.java (93%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdict/SysDictAddDTO.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdict/SysDictListDTO.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdict/SysDictTypeAddDTO.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdict/SysDictTypeUpDTO.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysdict/SysDictUpDTO.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysmenu/MenuPermissionDTO.java (78%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysmenu/SysMenuAddDTO.java (94%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysmenu/SysMenuListDTO.java (80%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysmenu/SysMenuUpDTO.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysmenu/SysUserRoleDTO.java (86%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/syspost/SysPostAddDTO.java (88%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/syspost/SysPostListDTO.java (88%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/syspost/SysPostUpdateDTO.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysrole/SysRoleAddDTO.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysrole/SysRoleMenuDTO.java (86%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysrole/SysRoleUpDTO.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysuser/SysUserAddDTO.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysuser/SysUserPasswordDTO.java (79%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysuser/SysUserUpDTO.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/dto/sysuser/UserDeptDTO.java (86%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysConfig.java (96%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysDept.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysDict.java (94%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysDictType.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysPost.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysRoleDept.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysRoleMenu.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysUserPost.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/entity/SysUserRole.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/DeptTreeVO.java (91%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/DictCustomVO.java (93%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/MenuTreeVO.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/SysDeptVO.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/SysMenuVO.java (97%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/SysPostVO.java (92%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/SysRoleMenuVO.java (88%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/SysUserRoleVO.java (91%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/SysUserVO.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/domain/vo/TotalDeptVO.java (83%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysDeptMapper.java (96%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysDictMapper.java (75%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysDictTypeMapper.java (86%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysMenuMapper.java (98%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysPostMapper.java (74%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysRoleDeptMapper.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysRoleMapper.java (97%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysRoleMenuMapper.java (97%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysUserMapper.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysUserPostMapper.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/mapper/SysUserRoleMapper.java (88%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysConfigService.java (95%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysDeptService.java (71%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysDictService.java (62%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysDictTypeService.java (72%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysMenuService.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysPostService.java (66%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysRoleService.java (85%) rename system/src/main/java/cn/lycode/{rbac => system}/service/SysUserService.java (79%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysDeptServiceImpl.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysDictServiceImpl.java (89%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysDictTypeServiceImpl.java (84%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysMenuServiceImpl.java (96%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysPostServiceImpl.java (81%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysRoleServiceImpl.java (90%) rename system/src/main/java/cn/lycode/{rbac => system}/service/impl/SysUserServiceImpl.java (85%) diff --git a/README.md b/README.md index 5dd4e70..a0e355e 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,113 @@ spring.datasource.password= ``` +模块依赖关系 + +admin--->framework--->system--->common
+admin--->generator------------->common + + +# 已完成功能 V1.0.0 + +## 系统管理 + +### 登录与Session管理 + +- [x] 登录后用户的session中包括用户基本信息和用户角色。 +- [x] 角色—权限、 角色—菜单 统一进行缓存。 权限、菜单发生变动后，清除相关角色的缓存即可 + +### 菜单管理 +- [x] 新增、修改、删除菜单后，清除角色—菜单缓存 +- [ ] 超级管理员获取全部菜单不加缓存 + +### 部门管理 + +- [x] 部门列表查询 +- [x] 添加部门 +- [x] 编辑部门（ancestors、isLock） +- [x] 删除部门 （禁止删除带子部门和带员工的部门） + +### 角色管理 +- [x] 分页查询列表 +- [x] 添加和编辑角色弹窗增加：角色排序、角色禁用 +- [x] 修改把禁用按钮去掉 +- [x] 修改角色基本信息、禁止修改超级管理员 +- [x] 修改角色权限 +- [ ] 修改角色数据权限 +- [x] 删除角色 + +### 用户管理 +- [x] 查询部门树 +- [x] 查询部门数附带每个部门的人数 +- [x] 分页查询用户列表, 除了基本用户信息还包括用户的角色、部门信息 +- [x] 根据部门树查询用户 +- [x] 添加用户 +- [x] 添加用户、用户操作前端页面修改 +- [x] 检查前端按钮权限标识 +- [x] 修改用户 + - [ ] 输入身份证、手机号校验、邮箱、【工号、用户名】规则校验 +- [x] 删除用户 + - [x] 测试联动删除用户所有绑定角色信息 +- [x] 设置用户角色 +- [ ] 设置角色部门、岗位 +- [ ] 重置用户密码 +- [ ] 解锁用户 +- [ ] 用户名需保证唯一、nickname不需要唯一 + + +### 字典管理 +若依拉取字典数据是这个页面需要什么就拉取什么，没刷新的话拉取一次就不拉了 +这个geekAdmin是一次性拉取所有字典数据，进入具体页面时不再拉取，刷新就又重新拉取所有字典数据。 +如果字典数据变得特别多，可以优化成若依的方式，不过一般字典数据不是很多，都无所谓，字典数据也可以放入缓存。一次性拉取后，系统更流畅，代码更简洁？ + +- [x] 字典类型加一个业务类型字段、 分为系统字典和业务字典 +- [x] 字典类型列表 + - [x] 字典类型对应字段列表 + - [x] 字典添加 + - [x] 字典修改 + - [x] 字典删除 + - [x] 字典锁定 +- [x] 新增字典类型 +- [x] 删除字典类型（逻辑删除，不同步删字典内容） +- [x] 锁定字典类型 +- [x] 字典类型对应的字典列表 + + +### 参数管理 + + + + +### 岗位管理 +- [x] 自动代码生成，增删改查 + +## 系统工具 + +### 代码生成 +- [x] 导入表列表查询 +- [ ] 导入表 + - [x] 导入表信息 + - [ ] 导入表的列信息 +- [x] 已导入的表列表查询 + - [x] 编辑 + - [x] 删除 + - [x] 预览 + - [x] 代码生成预览 + - [x] 加入前端代码和SQL的预览 + - [x] 代码生成模板修改 + - [x] 生成代码 + + +- [x] 生成代码配置加一个swagger选项 +- [x] 加一个同步功能，而不是必须重新删除 +- [x] 覆盖生成 +- [ ] 自动插入菜单和按钮，插入菜单和按钮之后，记得更新菜单和按钮的缓存，不然用户感知不到 + + +### 表单构建 + -模块依赖关系 -admin--->framework--->system--->common - --->generator------------->common +## 定时任务 \ No newline at end of file diff --git a/framework/src/main/java/cn/lycode/framework/satoken/MySaTokenListener.java b/framework/src/main/java/cn/lycode/framework/satoken/MySaTokenListener.java index 29adfbf..36d4fb3 100644 --- a/framework/src/main/java/cn/lycode/framework/satoken/MySaTokenListener.java +++ b/framework/src/main/java/cn/lycode/framework/satoken/MySaTokenListener.java @@ -3,7 +3,7 @@ package cn.lycode.framework.satoken; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; -import cn.lycode.rbac.service.SysUserService; +import cn.lycode.system.service.SysUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/framework/src/main/java/cn/lycode/framework/satoken/SaTokenConfig.java b/framework/src/main/java/cn/lycode/framework/satoken/SaTokenConfig.java index 0b3e162..ba94cf1 100644 --- a/framework/src/main/java/cn/lycode/framework/satoken/SaTokenConfig.java +++ b/framework/src/main/java/cn/lycode/framework/satoken/SaTokenConfig.java @@ -27,7 +27,7 @@ public class SaTokenConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 打开注解鉴权 -// registry.addInterceptor(new SaInterceptor().isAnnotation(true)).addPathPatterns("/**").excludePathPatterns(whitelistProperties.getWhitelist()); + // registry.addInterceptor(new SaInterceptor().isAnnotation(true)).addPathPatterns("/**").excludePathPatterns(whitelistProperties.getWhitelist()); // 注册 Sa-Token 拦截器，打开注解式鉴权功能 registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**").excludePathPatterns(whitelistProperties.getWhitelist());; } diff --git a/framework/src/main/java/cn/lycode/framework/web/controller/SysLoginController.java b/framework/src/main/java/cn/lycode/framework/web/controller/SysLoginController.java index 8cfdc37..4933f46 100644 --- a/framework/src/main/java/cn/lycode/framework/web/controller/SysLoginController.java +++ b/framework/src/main/java/cn/lycode/framework/web/controller/SysLoginController.java @@ -6,7 +6,7 @@ import cn.lycode.common.core.controller.BaseController; import cn.lycode.common.core.domain.AjaxResult; import cn.lycode.common.core.domain.model.user.LoginBody; import cn.lycode.framework.web.domain.LoginVO; -import cn.lycode.rbac.domain.vo.SysMenuVO; +import cn.lycode.system.domain.vo.SysMenuVO; import cn.lycode.framework.web.service.SysLoginService; import cn.lycode.framework.web.service.SysPermissionService; import lombok.RequiredArgsConstructor; diff --git a/framework/src/main/java/cn/lycode/framework/web/service/SysLoginService.java b/framework/src/main/java/cn/lycode/framework/web/service/SysLoginService.java index caa5697..119321d 100644 --- a/framework/src/main/java/cn/lycode/framework/web/service/SysLoginService.java +++ b/framework/src/main/java/cn/lycode/framework/web/service/SysLoginService.java @@ -10,7 +10,7 @@ import cn.lycode.common.core.domain.model.user.LoginUserInfo; import cn.lycode.common.enums.ErrorEnum; import cn.lycode.common.utils.SecurityUtils; import cn.lycode.framework.web.domain.LoginVO; -import cn.lycode.rbac.service.SysUserService; +import cn.lycode.system.service.SysUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; diff --git a/framework/src/main/java/cn/lycode/framework/web/service/SysPermissionService.java b/framework/src/main/java/cn/lycode/framework/web/service/SysPermissionService.java index 60646fd..b7eac7a 100644 --- a/framework/src/main/java/cn/lycode/framework/web/service/SysPermissionService.java +++ b/framework/src/main/java/cn/lycode/framework/web/service/SysPermissionService.java @@ -4,9 +4,9 @@ import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.session.SaSessionCustomUtil; import cn.dev33.satoken.stp.StpUtil; import cn.lycode.common.constant.Constants; -import cn.lycode.rbac.domain.vo.SysMenuVO; -import cn.lycode.rbac.service.SysMenuService; -import cn.lycode.rbac.service.SysRoleService; +import cn.lycode.system.domain.vo.SysMenuVO; +import cn.lycode.system.service.SysMenuService; +import cn.lycode.system.service.SysRoleService; import cn.lycode.common.utils.SecurityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -92,9 +92,8 @@ public class SysPermissionService { Set rolePermFlagSet = getRolePermFlag(loginUserId); SaSession userSession = StpUtil.getSessionByLoginId(loginUserId); if (rolePermFlagSet.contains(Constants.SUPER_ADMIN)) { - //超级管理员拥有所有菜单. - SaSession roleSession = SaSessionCustomUtil.getSessionById("role-" + Constants.SUPER_ADMIN); - sysMenuVOList = roleSession.get("Menu_List", menuService::selectFrontMenuAll); + //超级管理员拥有所有菜单. 且不带缓存，每次刷新都会请求菜单 + sysMenuVOList = menuService.selectFrontMenuAll(); }else { for (String roleFlag : rolePermFlagSet) { //roleSession.get 方法有Sa-token提供缓存 diff --git a/framework/src/main/java/cn/lycode/framework/web/service/SysRegisterService.java b/framework/src/main/java/cn/lycode/framework/web/service/SysRegisterService.java index 36abe07..b2eb4dd 100644 --- a/framework/src/main/java/cn/lycode/framework/web/service/SysRegisterService.java +++ b/framework/src/main/java/cn/lycode/framework/web/service/SysRegisterService.java @@ -6,7 +6,7 @@ import cn.lycode.common.constant.UserConstants; import cn.lycode.common.core.domain.model.user.RegisterBody; import cn.lycode.common.utils.SecurityUtils; import cn.lycode.common.utils.StringUtils; -import cn.lycode.rbac.service.SysUserService; +import cn.lycode.system.service.SysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git "a/generator/src/main/resources/templates/\346\250\241\346\235\277\345\217\230\351\207\217\345\220\215.md" "b/generator/src/main/resources/templates/\346\250\241\346\235\277\345\217\230\351\207\217\345\220\215.md" index 3b417da..1e0c708 100644 --- "a/generator/src/main/resources/templates/\346\250\241\346\235\277\345\217\230\351\207\217\345\220\215.md" +++ "b/generator/src/main/resources/templates/\346\250\241\346\235\277\345\217\230\351\207\217\345\220\215.md" @@ -27,7 +27,7 @@ | idType | String 主键ts类型, eg:number | | hasSort | boolean 列表查询的时候是否引入sort排序 | | **Java类名和包名** | ------------------------------------------------------------------------------------- | -| entityPkg | String, 生成实体类的相对路径,eg:cn.lycode.rbac.domain.entity | +| entityPkg | String, 生成实体类的相对路径,eg:cn.lycode.system.domain.entity | | mapperPkg | String, 生成mapper的相对路径 | | mapperXmlPkg | String, 生成mapper.xml的相对路径 | | servicePkg | String, 生成service的相对路径 | diff --git a/lycode_admin_vue/env.d.ts b/lycode_admin_vue/env.d.ts index 11f02fe..d8479a5 100644 --- a/lycode_admin_vue/env.d.ts +++ b/lycode_admin_vue/env.d.ts @@ -1 +1,7 @@ /// +declare module '*.vue' { + import type { DefineComponent } from 'vue' + // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types + const component: DefineComponent<{}, {}, any> + export default component +} diff --git a/lycode_admin_vue/pnpm-lock.yaml b/lycode_admin_vue/pnpm-lock.yaml index a2ad7e7..b65e73e 100644 --- a/lycode_admin_vue/pnpm-lock.yaml +++ b/lycode_admin_vue/pnpm-lock.yaml @@ -41,6 +41,9 @@ dependencies: sortablejs: specifier: ^1.15.1 version: 1.15.3 + uuid: + specifier: ^10.0.0 + version: 10.0.0 vite-plugin-svg-icons: specifier: ^2.0.1 version: 2.0.1(vite@4.5.3) @@ -70,6 +73,9 @@ devDependencies: '@types/sortablejs': specifier: ^1.15.7 version: 1.15.8 + '@types/uuid': + specifier: ^10.0.0 + version: 10.0.0 '@vitejs/plugin-vue': specifier: ^4.4.0 version: 4.6.2(vite@4.5.3)(vue@3.4.38) @@ -801,6 +807,10 @@ packages: '@types/node': 18.19.48 dev: false + /@types/uuid@10.0.0: + resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==} + dev: true + /@types/web-bluetooth@0.0.16: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} dev: false @@ -4076,6 +4086,11 @@ packages: /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + /uuid@10.0.0: + resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==} + hasBin: true + dev: false + /vary@1.1.2: resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==} engines: {node: '>= 0.8'} diff --git a/lycode_admin_vue/src/api/modules/system/user.ts b/lycode_admin_vue/src/api/modules/system/user.ts index fcadbc0..4184f57 100644 --- a/lycode_admin_vue/src/api/modules/system/user.ts +++ b/lycode_admin_vue/src/api/modules/system/user.ts @@ -64,7 +64,7 @@ export const setUserRole = (params: IUser.RoleForm) => { * @returns {*} */ export const changePassword = (params: IUser.PasswordForm) => { - return http.put(ADMIN_MODULE + `/sys-user/password`, params) + return http.post(ADMIN_MODULE + `/sys-user/password`, params) } /** @@ -73,7 +73,7 @@ export const changePassword = (params: IUser.PasswordForm) => { */ export const resetPassword = (params: { id: number }) => { const { id } = params - return http.put(ADMIN_MODULE + `/sys-user/reset/password/${id}`, {}) + return http.post(ADMIN_MODULE + `/sys-user/reset/password/${id}`, {}) } /** diff --git a/lycode_admin_vue/src/views/system/accountManage/index.vue b/lycode_admin_vue/src/views/system/accountManage/index.vue index c169655..73ceb89 100644 --- a/lycode_admin_vue/src/views/system/accountManage/index.vue +++ b/lycode_admin_vue/src/views/system/accountManage/index.vue @@ -125,8 +125,21 @@ 重置密码 +
+ + 设置部门 + +
+ +
+ + 设置岗位 + +
+
+ 删除
@@ -153,7 +166,10 @@ import { User, Unlock, Refresh, - DArrowRight + DArrowRight, + School, + OfficeBuilding, + HomeFilled } from '@element-plus/icons-vue' import ProTable from '@/components/ProTable/index.vue' import DeptTree from '@/views/system/accountManage/components/DeptTree.vue' @@ -195,17 +211,11 @@ const accountStatusOption = optionsStore.getDictOptions('account_status') // 表格配置项 const columns: ColumnProps[] = [ { type: 'selection', width: 55, selectable: (row) => row.id !== 1 }, - { prop: 'username', label: '账户', width: 150, align: 'left' }, - { prop: 'nickName', label: '昵称', width: 150, align: 'left' }, + { prop: 'username', label: '账户', width: 110, align: 'left' }, + { prop: 'nickName', label: '昵称', width: 110, align: 'left' }, { prop: 'mobile', label: '手机号', width: 120 }, - { - prop: 'deptInfo', - label: '部门' - }, - { - prop: 'roleInfo', - label: '角色' - }, + { prop: 'deptInfo', label: '部门', width: 110 }, + { prop: 'roleInfo', label: '角色', width: 110 }, { prop: 'accountStatusCd', label: '状态', @@ -214,8 +224,8 @@ const columns: ColumnProps[] = [ width: 80, fieldNames: { label: 'codeName', value: 'id', tagType: 'callbackShowStyle' } }, - { prop: 'createTime', label: '创建时间', width: 165 }, - { prop: 'operation', label: '操作', width: 260, fixed: 'right' } + { prop: 'createTime', label: '创建时间', width: 125 }, + { prop: 'operation', label: '操作', width: 230, fixed: 'right' } ] const searchColumns: SearchProps[] = [ @@ -343,6 +353,7 @@ const resetPwd = async (row: any) => { const initParam = reactive({ deptId: -1 }) +//全部，后端设置treeId=-1, 未设置部门, 后端设置treeId=-2 const selectTreeId = ref([]) const changeDeptTree = (val: number) => { if (val) { diff --git a/system/src/main/java/cn/lycode/rbac/constant/ParamConstant.java b/system/src/main/java/cn/lycode/system/constant/ParamConstant.java similarity index 72% rename from system/src/main/java/cn/lycode/rbac/constant/ParamConstant.java rename to system/src/main/java/cn/lycode/system/constant/ParamConstant.java index e8aa781..9070bb8 100644 --- a/system/src/main/java/cn/lycode/rbac/constant/ParamConstant.java +++ b/system/src/main/java/cn/lycode/system/constant/ParamConstant.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.constant; +package cn.lycode.system.constant; public class ParamConstant { diff --git a/system/src/main/java/cn/lycode/system/constant/SystemConstant.java b/system/src/main/java/cn/lycode/system/constant/SystemConstant.java new file mode 100644 index 0000000..09105b6 --- /dev/null +++ b/system/src/main/java/cn/lycode/system/constant/SystemConstant.java @@ -0,0 +1,18 @@ +package cn.lycode.system.constant; + +/** + * @Title: SystemContanst + * @Author lyg + * @Date 2024/11/22 14:07 + * @description: 系统常量 + */ +public class SystemConstant { + + // 部门树常量 + public static Long ALL_DEPT_TREE_ID = -1L; + public static String ALL_DEPT_TREE_NAME = "全部"; + + public static Long NO_DEPT_TREE_ID = -2L; + public static String NO_DEPT_TREE_NAME = "全部"; + +} diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysDeptController.java b/system/src/main/java/cn/lycode/system/controller/SysDeptController.java similarity index 88% rename from system/src/main/java/cn/lycode/rbac/controller/SysDeptController.java rename to system/src/main/java/cn/lycode/system/controller/SysDeptController.java index abddb38..d8138c1 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysDeptController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysDeptController.java @@ -1,14 +1,14 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.lycode.common.core.controller.BaseController; import cn.lycode.common.core.domain.AjaxResult; import cn.lycode.common.core.domain.model.SelectIdsDTO; -import cn.lycode.rbac.domain.dto.sysdept.SysDeptAddDTO; -import cn.lycode.rbac.domain.dto.sysdept.SysDeptUpDTO; -import cn.lycode.rbac.domain.vo.DeptTreeVO; -import cn.lycode.rbac.domain.vo.SysDeptVO; -import cn.lycode.rbac.service.SysDeptService; +import cn.lycode.system.domain.dto.sysdept.SysDeptAddDTO; +import cn.lycode.system.domain.dto.sysdept.SysDeptUpDTO; +import cn.lycode.system.domain.vo.DeptTreeVO; +import cn.lycode.system.domain.vo.SysDeptVO; +import cn.lycode.system.service.SysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysDictController.java b/system/src/main/java/cn/lycode/system/controller/SysDictController.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/controller/SysDictController.java rename to system/src/main/java/cn/lycode/system/controller/SysDictController.java index f5b3392..2fea237 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysDictController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysDictController.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; @@ -6,12 +6,12 @@ import cn.lycode.common.core.controller.BaseController; import cn.lycode.common.core.domain.AjaxResult; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.sysdict.SysDictAddDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictListDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictUpDTO; -import cn.lycode.rbac.domain.entity.SysDict; -import cn.lycode.rbac.domain.vo.DictCustomVO; -import cn.lycode.rbac.service.SysDictService; +import cn.lycode.system.domain.dto.sysdict.SysDictAddDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictListDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictUpDTO; +import cn.lycode.system.domain.entity.SysDict; +import cn.lycode.system.domain.vo.DictCustomVO; +import cn.lycode.system.service.SysDictService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysDictTypeController.java b/system/src/main/java/cn/lycode/system/controller/SysDictTypeController.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/controller/SysDictTypeController.java rename to system/src/main/java/cn/lycode/system/controller/SysDictTypeController.java index 57095bb..5959689 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysDictTypeController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.lycode.common.core.controller.BaseController; @@ -6,10 +6,10 @@ import cn.lycode.common.core.domain.AjaxResult; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.sysdict.SysDictTypeAddDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictTypeUpDTO; -import cn.lycode.rbac.domain.entity.SysDictType; -import cn.lycode.rbac.service.SysDictTypeService; +import cn.lycode.system.domain.dto.sysdict.SysDictTypeAddDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictTypeUpDTO; +import cn.lycode.system.domain.entity.SysDictType; +import cn.lycode.system.service.SysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysMenuController.java b/system/src/main/java/cn/lycode/system/controller/SysMenuController.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/controller/SysMenuController.java rename to system/src/main/java/cn/lycode/system/controller/SysMenuController.java index e83a207..7b9e930 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysMenuController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; @@ -7,10 +7,10 @@ import cn.lycode.common.core.domain.AjaxResult; import cn.lycode.common.core.domain.entity.SysMenu; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; -import cn.lycode.rbac.domain.dto.sysmenu.MenuPermissionDTO; -import cn.lycode.rbac.domain.vo.MenuTreeVO; -import cn.lycode.rbac.domain.vo.SysMenuVO; -import cn.lycode.rbac.service.SysMenuService; +import cn.lycode.system.domain.dto.sysmenu.MenuPermissionDTO; +import cn.lycode.system.domain.vo.MenuTreeVO; +import cn.lycode.system.domain.vo.SysMenuVO; +import cn.lycode.system.service.SysMenuService; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysPostController.java b/system/src/main/java/cn/lycode/system/controller/SysPostController.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/controller/SysPostController.java rename to system/src/main/java/cn/lycode/system/controller/SysPostController.java index 113bea3..4dc78a4 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysPostController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysPostController.java @@ -1,15 +1,15 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.lycode.common.core.controller.BaseController; import cn.lycode.common.core.domain.AjaxResult; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.syspost.SysPostAddDTO; -import cn.lycode.rbac.domain.dto.syspost.SysPostListDTO; -import cn.lycode.rbac.domain.dto.syspost.SysPostUpdateDTO; -import cn.lycode.rbac.domain.vo.SysPostVO; -import cn.lycode.rbac.service.SysPostService; +import cn.lycode.system.domain.dto.syspost.SysPostAddDTO; +import cn.lycode.system.domain.dto.syspost.SysPostListDTO; +import cn.lycode.system.domain.dto.syspost.SysPostUpdateDTO; +import cn.lycode.system.domain.vo.SysPostVO; +import cn.lycode.system.service.SysPostService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysRoleController.java b/system/src/main/java/cn/lycode/system/controller/SysRoleController.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/controller/SysRoleController.java rename to system/src/main/java/cn/lycode/system/controller/SysRoleController.java index 00a2906..d37bf7b 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysRoleController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.lycode.common.core.controller.BaseController; @@ -7,11 +7,11 @@ import cn.lycode.common.core.domain.entity.SysRole; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.ChangeStatusDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleAddDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleMenuDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleUpDTO; -import cn.lycode.rbac.service.SysRoleService; +import cn.lycode.system.domain.dto.ChangeStatusDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleAddDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleMenuDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleUpDTO; +import cn.lycode.system.service.SysRoleService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/system/src/main/java/cn/lycode/rbac/controller/SysUserController.java b/system/src/main/java/cn/lycode/system/controller/SysUserController.java similarity index 77% rename from system/src/main/java/cn/lycode/rbac/controller/SysUserController.java rename to system/src/main/java/cn/lycode/system/controller/SysUserController.java index 3fa857a..4f5eb25 100644 --- a/system/src/main/java/cn/lycode/rbac/controller/SysUserController.java +++ b/system/src/main/java/cn/lycode/system/controller/SysUserController.java @@ -1,5 +1,6 @@ -package cn.lycode.rbac.controller; +package cn.lycode.system.controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; import cn.lycode.common.annotation.valid.NotZero; @@ -10,16 +11,16 @@ import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; import cn.lycode.common.utils.SecurityUtils; -import cn.lycode.rbac.domain.dto.sysmenu.SysUserRoleDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserAddDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserPasswordDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserUpDTO; -import cn.lycode.rbac.domain.dto.sysuser.UserDeptDTO; -import cn.lycode.rbac.domain.vo.DeptTreeVO; -import cn.lycode.rbac.domain.vo.SysUserRoleVO; -import cn.lycode.rbac.domain.vo.SysUserVO; -import cn.lycode.rbac.service.SysDeptService; -import cn.lycode.rbac.service.SysUserService; +import cn.lycode.system.domain.dto.sysmenu.SysUserRoleDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserAddDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserPasswordDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserUpDTO; +import cn.lycode.system.domain.dto.sysuser.UserDeptDTO; +import cn.lycode.system.domain.vo.DeptTreeVO; +import cn.lycode.system.domain.vo.SysUserRoleVO; +import cn.lycode.system.domain.vo.SysUserVO; +import cn.lycode.system.service.SysDeptService; +import cn.lycode.system.service.SysUserService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -40,6 +41,7 @@ public class SysUserController extends BaseController { * 用户管理-部门树形列表 * @return DeptTreeVO */ + @SaCheckLogin @GetMapping("/dept/tree") public AjaxResult> tree() { return AjaxResult.success(sysDeptService.getDeptTreeWithAdditionalNodes()); @@ -111,15 +113,10 @@ public class SysUserController extends BaseController { return AjaxResult.success(); } - - - - - /** * 登录用户信息查询 */ - @SaIgnore + @SaCheckLogin @GetMapping("/userinfo") public AjaxResult getUserInfo() { return AjaxResult.success(sysUserService.getUserInfo(SecurityUtils.getLoginUserId())); @@ -130,7 +127,8 @@ public class SysUserController extends BaseController { * @param dto 原密码和新密码 * @return 是否成功 */ - @PutMapping("/password") + @SaCheckLogin + @PostMapping("/password") public AjaxResult changePassword(@Valid @RequestBody SysUserPasswordDTO dto) { return toAjax(sysUserService.changePassword(dto)); } @@ -139,11 +137,24 @@ public class SysUserController extends BaseController { * 重置账户密码 * @param userId 用户id */ - @PutMapping("/reset/password/{userId}") + @PostMapping("/reset/password/{userId}") public AjaxResult resetPassword(@PathVariable Long userId) { return toAjax(sysUserService.resetPassword(userId)); } + /** + * 解锁用户 + * @param dto 用户ids + */ + @PostMapping("/unlock") + public AjaxResult unlockUser(@RequestBody SelectIdsDTO dto) { + int count = sysUserService.unlockUser(dto.getIds()); + if (count == dto.getIds().size()) { + return AjaxResult.success("全部解锁成功！"); + } + return AjaxResult.failed((dto.getIds().size() - count) + "个用户未解锁成功！"); + } + /** * 批量绑定用户和部门 */ @@ -154,5 +165,4 @@ public class SysUserController extends BaseController { return AjaxResult.success(); } - } diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/ChangeStatusDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/ChangeStatusDTO.java similarity index 88% rename from system/src/main/java/cn/lycode/rbac/domain/dto/ChangeStatusDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/ChangeStatusDTO.java index 5c7f8b5..7e1c67f 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/ChangeStatusDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/ChangeStatusDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto; +package cn.lycode.system.domain.dto; import cn.lycode.common.enums.TrueFalseEnum; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdept/SysDeptAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdept/SysDeptAddDTO.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdept/SysDeptAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdept/SysDeptAddDTO.java index 69cc1ca..3902a71 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdept/SysDeptAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdept/SysDeptAddDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysdept; +package cn.lycode.system.domain.dto.sysdept; import cn.lycode.common.enums.TrueFalseEnum; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdept/SysDeptUpDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdept/SysDeptUpDTO.java similarity index 93% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdept/SysDeptUpDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdept/SysDeptUpDTO.java index 7296c50..e815fb5 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdept/SysDeptUpDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdept/SysDeptUpDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysdept; +package cn.lycode.system.domain.dto.sysdept; import cn.lycode.common.annotation.valid.NotZero; import cn.lycode.common.enums.TrueFalseEnum; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictAddDTO.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictAddDTO.java index 13614fd..ec83f41 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictAddDTO.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.domain.dto.sysdict; +package cn.lycode.system.domain.dto.sysdict; import cn.lycode.common.utils.SecurityUtils; -import cn.lycode.rbac.domain.entity.SysDict; +import cn.lycode.system.domain.entity.SysDict; import lombok.Data; import javax.validation.constraints.Max; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictListDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictListDTO.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictListDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictListDTO.java index 23c3263..d5e61b0 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictListDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictListDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysdict; +package cn.lycode.system.domain.dto.sysdict; import cn.lycode.common.annotation.valid.NotZero; import cn.lycode.common.core.page.PageDomain; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictTypeAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictTypeAddDTO.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictTypeAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictTypeAddDTO.java index 8736411..f74dce2 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictTypeAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictTypeAddDTO.java @@ -1,6 +1,6 @@ -package cn.lycode.rbac.domain.dto.sysdict; +package cn.lycode.system.domain.dto.sysdict; -import cn.lycode.rbac.domain.entity.SysDictType; +import cn.lycode.system.domain.entity.SysDictType; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictTypeUpDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictTypeUpDTO.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictTypeUpDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictTypeUpDTO.java index 79ac691..b1e7ae9 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictTypeUpDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictTypeUpDTO.java @@ -1,8 +1,8 @@ -package cn.lycode.rbac.domain.dto.sysdict; +package cn.lycode.system.domain.dto.sysdict; import cn.lycode.common.enums.TrueFalseEnum; import cn.lycode.common.utils.SecurityUtils; -import cn.lycode.rbac.domain.entity.SysDictType; +import cn.lycode.system.domain.entity.SysDictType; import lombok.Data; import javax.validation.constraints.NotBlank; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictUpDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictUpDTO.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictUpDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictUpDTO.java index d3db450..ea21eb8 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysdict/SysDictUpDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysdict/SysDictUpDTO.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.domain.dto.sysdict; +package cn.lycode.system.domain.dto.sysdict; import cn.lycode.common.utils.SecurityUtils; -import cn.lycode.rbac.domain.entity.SysDict; +import cn.lycode.system.domain.entity.SysDict; import lombok.Data; import javax.validation.constraints.Max; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/MenuPermissionDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/MenuPermissionDTO.java similarity index 78% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/MenuPermissionDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysmenu/MenuPermissionDTO.java index 8e21d8d..6ad79b8 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/MenuPermissionDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/MenuPermissionDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysmenu; +package cn.lycode.system.domain.dto.sysmenu; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuAddDTO.java similarity index 94% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuAddDTO.java index 0e6ba6b..265e23b 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuAddDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysmenu; +package cn.lycode.system.domain.dto.sysmenu; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuListDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuListDTO.java similarity index 80% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuListDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuListDTO.java index 783f0da..e8c3e4b 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuListDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuListDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysmenu; +package cn.lycode.system.domain.dto.sysmenu; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuUpDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuUpDTO.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuUpDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuUpDTO.java index 4e575d3..7e42ab7 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysMenuUpDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysMenuUpDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysmenu; +package cn.lycode.system.domain.dto.sysmenu; import cn.lycode.common.annotation.valid.NotZero; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysUserRoleDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysUserRoleDTO.java similarity index 86% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysUserRoleDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysUserRoleDTO.java index c295673..5601033 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysmenu/SysUserRoleDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysmenu/SysUserRoleDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysmenu; +package cn.lycode.system.domain.dto.sysmenu; import cn.lycode.common.annotation.valid.NotZero; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostAddDTO.java similarity index 88% rename from system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostAddDTO.java index d6c8689..e55abbc 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostAddDTO.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.domain.dto.syspost; +package cn.lycode.system.domain.dto.syspost; import cn.lycode.common.utils.SecurityUtils; -import cn.lycode.rbac.domain.entity.SysPost; +import cn.lycode.system.domain.entity.SysPost; import lombok.Data; import java.util.Date; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostListDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostListDTO.java similarity index 88% rename from system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostListDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostListDTO.java index b28dfcf..93d954b 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostListDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostListDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.syspost; +package cn.lycode.system.domain.dto.syspost; import cn.lycode.common.core.page.PageDomain; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostUpdateDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostUpdateDTO.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostUpdateDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostUpdateDTO.java index 104b663..9fd0f0c 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/syspost/SysPostUpdateDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/syspost/SysPostUpdateDTO.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.domain.dto.syspost; +package cn.lycode.system.domain.dto.syspost; import cn.lycode.common.utils.SecurityUtils; -import cn.lycode.rbac.domain.entity.SysPost; +import cn.lycode.system.domain.entity.SysPost; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleAddDTO.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleAddDTO.java index b66c1bc..67944d4 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleAddDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysrole; +package cn.lycode.system.domain.dto.sysrole; import cn.lycode.common.enums.TrueFalseEnum; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleMenuDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleMenuDTO.java similarity index 86% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleMenuDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleMenuDTO.java index 9243bdc..b7a40b0 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleMenuDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleMenuDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysrole; +package cn.lycode.system.domain.dto.sysrole; import cn.lycode.common.annotation.valid.NotZero; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleUpDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleUpDTO.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleUpDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleUpDTO.java index c82ffd7..ca4f56f 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysrole/SysRoleUpDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysrole/SysRoleUpDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysrole; +package cn.lycode.system.domain.dto.sysrole; import cn.lycode.common.annotation.valid.NotZero; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserAddDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserAddDTO.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserAddDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserAddDTO.java index 09beacd..5dc09b5 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserAddDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserAddDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysuser; +package cn.lycode.system.domain.dto.sysuser; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserPasswordDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserPasswordDTO.java similarity index 79% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserPasswordDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserPasswordDTO.java index e69e890..8f3205a 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserPasswordDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserPasswordDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysuser; +package cn.lycode.system.domain.dto.sysuser; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserUpDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserUpDTO.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserUpDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserUpDTO.java index 739e43b..f480c2a 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/SysUserUpDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/SysUserUpDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysuser; +package cn.lycode.system.domain.dto.sysuser; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/UserDeptDTO.java b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/UserDeptDTO.java similarity index 86% rename from system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/UserDeptDTO.java rename to system/src/main/java/cn/lycode/system/domain/dto/sysuser/UserDeptDTO.java index 06808e9..a052346 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/dto/sysuser/UserDeptDTO.java +++ b/system/src/main/java/cn/lycode/system/domain/dto/sysuser/UserDeptDTO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.dto.sysuser; +package cn.lycode.system.domain.dto.sysuser; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysConfig.java b/system/src/main/java/cn/lycode/system/domain/entity/SysConfig.java similarity index 96% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysConfig.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysConfig.java index 08241ce..44ec779 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysConfig.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysConfig.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import cn.lycode.common.core.domain.BaseEntity; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysDept.java b/system/src/main/java/cn/lycode/system/domain/entity/SysDept.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysDept.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysDept.java index a309afd..e15f5a7 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysDept.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysDept.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import cn.lycode.common.core.domain.BaseEntity; import cn.lycode.common.enums.TrueFalseEnum; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysDict.java b/system/src/main/java/cn/lycode/system/domain/entity/SysDict.java similarity index 94% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysDict.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysDict.java index deace21..7b01e6a 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysDict.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysDict.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import cn.lycode.common.core.domain.BaseEntity; import cn.lycode.common.enums.TrueFalseEnum; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysDictType.java b/system/src/main/java/cn/lycode/system/domain/entity/SysDictType.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysDictType.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysDictType.java index 90e2603..71b201a 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysDictType.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysDictType.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import cn.lycode.common.core.domain.BaseEntity; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysPost.java b/system/src/main/java/cn/lycode/system/domain/entity/SysPost.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysPost.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysPost.java index 9ea1281..9c40019 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysPost.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysPost.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import cn.lycode.common.core.domain.BaseEntity; -import cn.lycode.rbac.domain.vo.SysPostVO; +import cn.lycode.system.domain.vo.SysPostVO; import lombok.Data; import java.io.Serializable; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysRoleDept.java b/system/src/main/java/cn/lycode/system/domain/entity/SysRoleDept.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysRoleDept.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysRoleDept.java index 60de710..f7ac95a 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysRoleDept.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysRoleDept.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysRoleMenu.java b/system/src/main/java/cn/lycode/system/domain/entity/SysRoleMenu.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysRoleMenu.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysRoleMenu.java index c71f74b..7440662 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysRoleMenu.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysRoleMenu.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysUserPost.java b/system/src/main/java/cn/lycode/system/domain/entity/SysUserPost.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysUserPost.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysUserPost.java index 925f2d5..b1ae742 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysUserPost.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysUserPost.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/entity/SysUserRole.java b/system/src/main/java/cn/lycode/system/domain/entity/SysUserRole.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/domain/entity/SysUserRole.java rename to system/src/main/java/cn/lycode/system/domain/entity/SysUserRole.java index 9697198..c5ddaa2 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/entity/SysUserRole.java +++ b/system/src/main/java/cn/lycode/system/domain/entity/SysUserRole.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.entity; +package cn.lycode.system.domain.entity; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/DeptTreeVO.java b/system/src/main/java/cn/lycode/system/domain/vo/DeptTreeVO.java similarity index 91% rename from system/src/main/java/cn/lycode/rbac/domain/vo/DeptTreeVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/DeptTreeVO.java index 3906423..b1499b4 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/DeptTreeVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/DeptTreeVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import cn.lycode.common.core.service.Treeable; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/DictCustomVO.java b/system/src/main/java/cn/lycode/system/domain/vo/DictCustomVO.java similarity index 93% rename from system/src/main/java/cn/lycode/rbac/domain/vo/DictCustomVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/DictCustomVO.java index 2c7676b..bbc9193 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/DictCustomVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/DictCustomVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/MenuTreeVO.java b/system/src/main/java/cn/lycode/system/domain/vo/MenuTreeVO.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/domain/vo/MenuTreeVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/MenuTreeVO.java index b56e78f..01f7aff 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/MenuTreeVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/MenuTreeVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import cn.lycode.common.core.service.Treeable; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/SysDeptVO.java b/system/src/main/java/cn/lycode/system/domain/vo/SysDeptVO.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/domain/vo/SysDeptVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/SysDeptVO.java index 2274426..b0c4090 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/SysDeptVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/SysDeptVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import cn.lycode.common.core.service.Treeable; import cn.lycode.common.enums.TrueFalseEnum; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/SysMenuVO.java b/system/src/main/java/cn/lycode/system/domain/vo/SysMenuVO.java similarity index 97% rename from system/src/main/java/cn/lycode/rbac/domain/vo/SysMenuVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/SysMenuVO.java index 8a3284b..bd8cd7d 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/SysMenuVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/SysMenuVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import cn.lycode.common.enums.TrueFalseEnum; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/SysPostVO.java b/system/src/main/java/cn/lycode/system/domain/vo/SysPostVO.java similarity index 92% rename from system/src/main/java/cn/lycode/rbac/domain/vo/SysPostVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/SysPostVO.java index ad03eb7..90d00e5 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/SysPostVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/SysPostVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import cn.lycode.common.enums.TrueFalseEnum; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/SysRoleMenuVO.java b/system/src/main/java/cn/lycode/system/domain/vo/SysRoleMenuVO.java similarity index 88% rename from system/src/main/java/cn/lycode/rbac/domain/vo/SysRoleMenuVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/SysRoleMenuVO.java index a0b5cf2..4c798ad 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/SysRoleMenuVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/SysRoleMenuVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/SysUserRoleVO.java b/system/src/main/java/cn/lycode/system/domain/vo/SysUserRoleVO.java similarity index 91% rename from system/src/main/java/cn/lycode/rbac/domain/vo/SysUserRoleVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/SysUserRoleVO.java index 1940755..b73323b 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/SysUserRoleVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/SysUserRoleVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/SysUserVO.java b/system/src/main/java/cn/lycode/system/domain/vo/SysUserVO.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/domain/vo/SysUserVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/SysUserVO.java index d40ec5d..b80dce9 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/SysUserVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/SysUserVO.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import cn.lycode.common.core.domain.entity.SysRole; -import cn.lycode.rbac.domain.entity.SysDept; +import cn.lycode.system.domain.entity.SysDept; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/domain/vo/TotalDeptVO.java b/system/src/main/java/cn/lycode/system/domain/vo/TotalDeptVO.java similarity index 83% rename from system/src/main/java/cn/lycode/rbac/domain/vo/TotalDeptVO.java rename to system/src/main/java/cn/lycode/system/domain/vo/TotalDeptVO.java index facb820..12f3eb0 100644 --- a/system/src/main/java/cn/lycode/rbac/domain/vo/TotalDeptVO.java +++ b/system/src/main/java/cn/lycode/system/domain/vo/TotalDeptVO.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.domain.vo; +package cn.lycode.system.domain.vo; import lombok.Data; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysDeptMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysDeptMapper.java similarity index 96% rename from system/src/main/java/cn/lycode/rbac/mapper/SysDeptMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysDeptMapper.java index eb6ab03..0ecb95f 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysDeptMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysDeptMapper.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; import cn.lycode.common.core.domain.model.ConditionDTO; -import cn.lycode.rbac.domain.entity.SysDept; +import cn.lycode.system.domain.entity.SysDept; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysDictMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysDictMapper.java similarity index 75% rename from system/src/main/java/cn/lycode/rbac/mapper/SysDictMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysDictMapper.java index 069e7f0..12a93fb 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysDictMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysDictMapper.java @@ -1,8 +1,8 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; -import cn.lycode.rbac.domain.dto.sysdict.SysDictListDTO; -import cn.lycode.rbac.domain.entity.SysDict; -import cn.lycode.rbac.domain.vo.DictCustomVO; +import cn.lycode.system.domain.dto.sysdict.SysDictListDTO; +import cn.lycode.system.domain.entity.SysDict; +import cn.lycode.system.domain.vo.DictCustomVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysDictTypeMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysDictTypeMapper.java similarity index 86% rename from system/src/main/java/cn/lycode/rbac/mapper/SysDictTypeMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysDictTypeMapper.java index aea9cde..02c4f37 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysDictTypeMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; import cn.lycode.common.core.domain.model.ConditionDTO; -import cn.lycode.rbac.domain.entity.SysDictType; +import cn.lycode.system.domain.entity.SysDictType; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysMenuMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysMenuMapper.java similarity index 98% rename from system/src/main/java/cn/lycode/rbac/mapper/SysMenuMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysMenuMapper.java index 3a4f9f9..012522f 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysMenuMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysMenuMapper.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; import cn.lycode.common.core.domain.entity.SysMenu; import cn.lycode.common.core.domain.model.ConditionDTO; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysPostMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysPostMapper.java similarity index 74% rename from system/src/main/java/cn/lycode/rbac/mapper/SysPostMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysPostMapper.java index f404b35..a8966d5 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysPostMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysPostMapper.java @@ -1,8 +1,8 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; -import cn.lycode.rbac.domain.dto.syspost.SysPostListDTO; -import cn.lycode.rbac.domain.entity.SysPost; +import cn.lycode.system.domain.dto.syspost.SysPostListDTO; +import cn.lycode.system.domain.entity.SysPost; import java.util.List; /** diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysRoleDeptMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysRoleDeptMapper.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/mapper/SysRoleDeptMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysRoleDeptMapper.java index 836e26e..3e658e3 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysRoleDeptMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysRoleDeptMapper.java @@ -1,6 +1,6 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; -import cn.lycode.rbac.domain.entity.SysRoleDept; +import cn.lycode.system.domain.entity.SysRoleDept; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysRoleMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysRoleMapper.java similarity index 97% rename from system/src/main/java/cn/lycode/rbac/mapper/SysRoleMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysRoleMapper.java index 17f00f6..99c6181 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysRoleMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysRoleMapper.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; import cn.lycode.common.core.domain.entity.SysRole; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysRoleMenuMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysRoleMenuMapper.java similarity index 97% rename from system/src/main/java/cn/lycode/rbac/mapper/SysRoleMenuMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysRoleMenuMapper.java index 5419a57..eabc2af 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysRoleMenuMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysRoleMenuMapper.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; import org.apache.ibatis.annotations.Param; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysUserMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysUserMapper.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/mapper/SysUserMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysUserMapper.java index 55107c3..6f134e0 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysUserMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; import cn.lycode.common.core.domain.entity.SysUser; import cn.lycode.common.core.domain.model.ConditionDTO; -import cn.lycode.rbac.domain.vo.SysUserVO; +import cn.lycode.system.domain.vo.SysUserVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysUserPostMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysUserPostMapper.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/mapper/SysUserPostMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysUserPostMapper.java index 81e7662..cbe1671 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysUserPostMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysUserPostMapper.java @@ -1,6 +1,6 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; -import cn.lycode.rbac.domain.entity.SysUserPost; +import cn.lycode.system.domain.entity.SysUserPost; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/mapper/SysUserRoleMapper.java b/system/src/main/java/cn/lycode/system/mapper/SysUserRoleMapper.java similarity index 88% rename from system/src/main/java/cn/lycode/rbac/mapper/SysUserRoleMapper.java rename to system/src/main/java/cn/lycode/system/mapper/SysUserRoleMapper.java index b5e9e54..7f6c56c 100644 --- a/system/src/main/java/cn/lycode/rbac/mapper/SysUserRoleMapper.java +++ b/system/src/main/java/cn/lycode/system/mapper/SysUserRoleMapper.java @@ -1,6 +1,6 @@ -package cn.lycode.rbac.mapper; +package cn.lycode.system.mapper; -import cn.lycode.rbac.domain.entity.SysUserRole; +import cn.lycode.system.domain.entity.SysUserRole; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysConfigService.java b/system/src/main/java/cn/lycode/system/service/SysConfigService.java similarity index 95% rename from system/src/main/java/cn/lycode/rbac/service/SysConfigService.java rename to system/src/main/java/cn/lycode/system/service/SysConfigService.java index 4a82724..688ac43 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysConfigService.java +++ b/system/src/main/java/cn/lycode/system/service/SysConfigService.java @@ -1,6 +1,6 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; -import cn.lycode.rbac.domain.entity.SysConfig; +import cn.lycode.system.domain.entity.SysConfig; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysDeptService.java b/system/src/main/java/cn/lycode/system/service/SysDeptService.java similarity index 71% rename from system/src/main/java/cn/lycode/rbac/service/SysDeptService.java rename to system/src/main/java/cn/lycode/system/service/SysDeptService.java index 714f6df..6142bef 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysDeptService.java +++ b/system/src/main/java/cn/lycode/system/service/SysDeptService.java @@ -1,10 +1,10 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.model.SelectIdsDTO; -import cn.lycode.rbac.domain.dto.sysdept.SysDeptAddDTO; -import cn.lycode.rbac.domain.dto.sysdept.SysDeptUpDTO; -import cn.lycode.rbac.domain.vo.DeptTreeVO; -import cn.lycode.rbac.domain.vo.SysDeptVO; +import cn.lycode.system.domain.dto.sysdept.SysDeptAddDTO; +import cn.lycode.system.domain.dto.sysdept.SysDeptUpDTO; +import cn.lycode.system.domain.vo.DeptTreeVO; +import cn.lycode.system.domain.vo.SysDeptVO; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysDictService.java b/system/src/main/java/cn/lycode/system/service/SysDictService.java similarity index 62% rename from system/src/main/java/cn/lycode/rbac/service/SysDictService.java rename to system/src/main/java/cn/lycode/system/service/SysDictService.java index 3d06ed5..1f0b8f4 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysDictService.java +++ b/system/src/main/java/cn/lycode/system/service/SysDictService.java @@ -1,12 +1,12 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.sysdict.SysDictAddDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictListDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictUpDTO; -import cn.lycode.rbac.domain.entity.SysDict; -import cn.lycode.rbac.domain.vo.DictCustomVO; +import cn.lycode.system.domain.dto.sysdict.SysDictAddDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictListDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictUpDTO; +import cn.lycode.system.domain.entity.SysDict; +import cn.lycode.system.domain.vo.DictCustomVO; import java.util.List; import java.util.Map; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysDictTypeService.java b/system/src/main/java/cn/lycode/system/service/SysDictTypeService.java similarity index 72% rename from system/src/main/java/cn/lycode/rbac/service/SysDictTypeService.java rename to system/src/main/java/cn/lycode/system/service/SysDictTypeService.java index 6d59547..2f89e61 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysDictTypeService.java +++ b/system/src/main/java/cn/lycode/system/service/SysDictTypeService.java @@ -1,11 +1,11 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.sysdict.SysDictTypeAddDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictTypeUpDTO; -import cn.lycode.rbac.domain.entity.SysDictType; +import cn.lycode.system.domain.dto.sysdict.SysDictTypeAddDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictTypeUpDTO; +import cn.lycode.system.domain.entity.SysDictType; import java.util.List; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysMenuService.java b/system/src/main/java/cn/lycode/system/service/SysMenuService.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/service/SysMenuService.java rename to system/src/main/java/cn/lycode/system/service/SysMenuService.java index d649223..c70da76 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysMenuService.java +++ b/system/src/main/java/cn/lycode/system/service/SysMenuService.java @@ -1,12 +1,12 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.entity.SysMenu; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; -import cn.lycode.rbac.domain.dto.sysmenu.MenuPermissionDTO; -import cn.lycode.rbac.domain.vo.MenuTreeVO; -import cn.lycode.rbac.domain.vo.SysMenuVO; +import cn.lycode.system.domain.dto.sysmenu.MenuPermissionDTO; +import cn.lycode.system.domain.vo.MenuTreeVO; +import cn.lycode.system.domain.vo.SysMenuVO; import java.util.List; import java.util.Set; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysPostService.java b/system/src/main/java/cn/lycode/system/service/SysPostService.java similarity index 66% rename from system/src/main/java/cn/lycode/rbac/service/SysPostService.java rename to system/src/main/java/cn/lycode/system/service/SysPostService.java index c18502d..e13d4e7 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysPostService.java +++ b/system/src/main/java/cn/lycode/system/service/SysPostService.java @@ -1,11 +1,11 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.syspost.SysPostAddDTO; -import cn.lycode.rbac.domain.dto.syspost.SysPostListDTO; -import cn.lycode.rbac.domain.dto.syspost.SysPostUpdateDTO; -import cn.lycode.rbac.domain.vo.SysPostVO; +import cn.lycode.system.domain.dto.syspost.SysPostAddDTO; +import cn.lycode.system.domain.dto.syspost.SysPostListDTO; +import cn.lycode.system.domain.dto.syspost.SysPostUpdateDTO; +import cn.lycode.system.domain.vo.SysPostVO; /** * 岗位信息表 Service diff --git a/system/src/main/java/cn/lycode/rbac/service/SysRoleService.java b/system/src/main/java/cn/lycode/system/service/SysRoleService.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/service/SysRoleService.java rename to system/src/main/java/cn/lycode/system/service/SysRoleService.java index d045bc8..064f46e 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysRoleService.java +++ b/system/src/main/java/cn/lycode/system/service/SysRoleService.java @@ -1,14 +1,14 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.entity.SysRole; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.ChangeStatusDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleAddDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleMenuDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleUpDTO; -import cn.lycode.rbac.domain.vo.SysRoleMenuVO; +import cn.lycode.system.domain.dto.ChangeStatusDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleAddDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleMenuDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleUpDTO; +import cn.lycode.system.domain.vo.SysRoleMenuVO; import java.util.List; import java.util.Set; diff --git a/system/src/main/java/cn/lycode/rbac/service/SysUserService.java b/system/src/main/java/cn/lycode/system/service/SysUserService.java similarity index 79% rename from system/src/main/java/cn/lycode/rbac/service/SysUserService.java rename to system/src/main/java/cn/lycode/system/service/SysUserService.java index cf117aa..92a71c1 100644 --- a/system/src/main/java/cn/lycode/rbac/service/SysUserService.java +++ b/system/src/main/java/cn/lycode/system/service/SysUserService.java @@ -1,17 +1,17 @@ -package cn.lycode.rbac.service; +package cn.lycode.system.service; import cn.lycode.common.core.domain.entity.SysUser; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.domain.model.user.RegisterBody; import cn.lycode.common.core.page.PageResult; -import cn.lycode.rbac.domain.dto.sysmenu.SysUserRoleDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserAddDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserPasswordDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserUpDTO; -import cn.lycode.rbac.domain.dto.sysuser.UserDeptDTO; -import cn.lycode.rbac.domain.vo.SysUserRoleVO; -import cn.lycode.rbac.domain.vo.SysUserVO; +import cn.lycode.system.domain.dto.sysmenu.SysUserRoleDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserAddDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserPasswordDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserUpDTO; +import cn.lycode.system.domain.dto.sysuser.UserDeptDTO; +import cn.lycode.system.domain.vo.SysUserRoleVO; +import cn.lycode.system.domain.vo.SysUserVO; import java.util.List; @@ -99,6 +99,13 @@ public interface SysUserService { * @param dto 用户信息 */ int update(SysUserUpDTO dto); + + /** + * 解锁用户 + * @param ids 用户ids + * @return 成功个数 + */ + int unlockUser(List ids); /** * 删除用户 * @@ -108,5 +115,4 @@ public interface SysUserService { - } diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysDeptServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysDeptServiceImpl.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysDeptServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysDeptServiceImpl.java index 5d0002a..cb6811d 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysDeptServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; @@ -7,14 +7,15 @@ import cn.lycode.common.enums.ErrorEnum; import cn.lycode.common.enums.TrueFalseEnum; import cn.lycode.common.utils.Convert; import cn.lycode.common.utils.StringUtils; -import cn.lycode.rbac.domain.dto.sysdept.SysDeptAddDTO; -import cn.lycode.rbac.domain.dto.sysdept.SysDeptUpDTO; -import cn.lycode.rbac.domain.entity.SysDept; -import cn.lycode.rbac.domain.vo.DeptTreeVO; -import cn.lycode.rbac.domain.vo.SysDeptVO; -import cn.lycode.rbac.mapper.SysDeptMapper; -import cn.lycode.rbac.mapper.SysUserMapper; -import cn.lycode.rbac.service.SysDeptService; +import cn.lycode.system.constant.SystemConstant; +import cn.lycode.system.domain.dto.sysdept.SysDeptAddDTO; +import cn.lycode.system.domain.dto.sysdept.SysDeptUpDTO; +import cn.lycode.system.domain.entity.SysDept; +import cn.lycode.system.domain.vo.DeptTreeVO; +import cn.lycode.system.domain.vo.SysDeptVO; +import cn.lycode.system.mapper.SysDeptMapper; +import cn.lycode.system.mapper.SysUserMapper; +import cn.lycode.system.service.SysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -88,16 +89,16 @@ public class SysDeptServiceImpl implements SysDeptService { private DeptTreeVO createUnsetNode() { DeptTreeVO unset = new DeptTreeVO(); - unset.setId(-2L); - unset.setDeptName("未设置部门"); + unset.setId(SystemConstant.NO_DEPT_TREE_ID); + unset.setDeptName(SystemConstant.NO_DEPT_TREE_NAME); unset.setUserTotal(userMapper.selectNoDeptUserCount()); return unset; } private DeptTreeVO createAllNode() { DeptTreeVO all = new DeptTreeVO(); - all.setId(-1L); - all.setDeptName("全部"); + all.setId(SystemConstant.ALL_DEPT_TREE_ID); + all.setDeptName(SystemConstant.ALL_DEPT_TREE_NAME); all.setUserTotal(userMapper.selectAllUserCount()); return all; } diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysDictServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysDictServiceImpl.java similarity index 89% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysDictServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysDictServiceImpl.java index 009ed35..8ac67a0 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysDictServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysDictServiceImpl.java @@ -1,18 +1,18 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; import cn.lycode.common.core.page.PageUtil; import cn.lycode.common.enums.ErrorEnum; -import cn.lycode.rbac.domain.dto.sysdict.SysDictAddDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictListDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictUpDTO; -import cn.lycode.rbac.domain.entity.SysDict; -import cn.lycode.rbac.domain.entity.SysDictType; -import cn.lycode.rbac.domain.vo.DictCustomVO; -import cn.lycode.rbac.mapper.SysDictMapper; -import cn.lycode.rbac.mapper.SysDictTypeMapper; -import cn.lycode.rbac.service.SysDictService; +import cn.lycode.system.domain.dto.sysdict.SysDictAddDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictListDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictUpDTO; +import cn.lycode.system.domain.entity.SysDict; +import cn.lycode.system.domain.entity.SysDictType; +import cn.lycode.system.domain.vo.DictCustomVO; +import cn.lycode.system.mapper.SysDictMapper; +import cn.lycode.system.mapper.SysDictTypeMapper; +import cn.lycode.system.service.SysDictService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysDictTypeServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysDictTypeServiceImpl.java similarity index 84% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysDictTypeServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysDictTypeServiceImpl.java index db49d65..6aeecbc 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysDictTypeServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysDictTypeServiceImpl.java @@ -1,14 +1,14 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.core.domain.model.ConditionDTO; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; import cn.lycode.common.core.page.PageUtil; -import cn.lycode.rbac.domain.dto.sysdict.SysDictTypeAddDTO; -import cn.lycode.rbac.domain.dto.sysdict.SysDictTypeUpDTO; -import cn.lycode.rbac.domain.entity.SysDictType; -import cn.lycode.rbac.mapper.SysDictTypeMapper; -import cn.lycode.rbac.service.SysDictTypeService; +import cn.lycode.system.domain.dto.sysdict.SysDictTypeAddDTO; +import cn.lycode.system.domain.dto.sysdict.SysDictTypeUpDTO; +import cn.lycode.system.domain.entity.SysDictType; +import cn.lycode.system.mapper.SysDictTypeMapper; +import cn.lycode.system.service.SysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysMenuServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysMenuServiceImpl.java similarity index 96% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysMenuServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysMenuServiceImpl.java index 14ce8d4..737037a 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysMenuServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.constant.Constants; import cn.lycode.common.core.domain.entity.SysMenu; @@ -10,12 +10,12 @@ import cn.lycode.common.event.EventPublisher; import cn.lycode.common.event.PermsChangeEvent; import cn.lycode.common.event.PermsMeta; import cn.lycode.common.utils.StringUtils; -import cn.lycode.rbac.domain.dto.sysmenu.MenuPermissionDTO; -import cn.lycode.rbac.domain.vo.MenuTreeVO; -import cn.lycode.rbac.domain.vo.SysMenuVO; -import cn.lycode.rbac.mapper.SysMenuMapper; -import cn.lycode.rbac.mapper.SysRoleMenuMapper; -import cn.lycode.rbac.service.SysMenuService; +import cn.lycode.system.domain.dto.sysmenu.MenuPermissionDTO; +import cn.lycode.system.domain.vo.MenuTreeVO; +import cn.lycode.system.domain.vo.SysMenuVO; +import cn.lycode.system.mapper.SysMenuMapper; +import cn.lycode.system.mapper.SysRoleMenuMapper; +import cn.lycode.system.service.SysMenuService; import lombok.RequiredArgsConstructor; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysPostServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysPostServiceImpl.java similarity index 81% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysPostServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysPostServiceImpl.java index 496415c..f8b8f9a 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysPostServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysPostServiceImpl.java @@ -1,16 +1,16 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.core.domain.model.SelectIdsDTO; import cn.lycode.common.core.page.PageResult; import cn.lycode.common.core.page.PageUtil; import cn.lycode.common.enums.ErrorEnum; -import cn.lycode.rbac.domain.dto.syspost.SysPostAddDTO; -import cn.lycode.rbac.domain.dto.syspost.SysPostListDTO; -import cn.lycode.rbac.domain.dto.syspost.SysPostUpdateDTO; -import cn.lycode.rbac.domain.entity.SysPost; -import cn.lycode.rbac.domain.vo.SysPostVO; -import cn.lycode.rbac.mapper.SysPostMapper; -import cn.lycode.rbac.service.SysPostService; +import cn.lycode.system.domain.dto.syspost.SysPostAddDTO; +import cn.lycode.system.domain.dto.syspost.SysPostListDTO; +import cn.lycode.system.domain.dto.syspost.SysPostUpdateDTO; +import cn.lycode.system.domain.entity.SysPost; +import cn.lycode.system.domain.vo.SysPostVO; +import cn.lycode.system.mapper.SysPostMapper; +import cn.lycode.system.service.SysPostService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysRoleServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysRoleServiceImpl.java similarity index 90% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysRoleServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysRoleServiceImpl.java index a42b063..d6d57a0 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysRoleServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.core.domain.entity.SysRole; import cn.lycode.common.core.domain.model.ConditionDTO; @@ -11,17 +11,17 @@ import cn.lycode.common.event.PermsMeta; import cn.lycode.common.exception.ServiceException; import cn.lycode.common.utils.SecurityUtils; import cn.lycode.common.utils.StringUtils; -import cn.lycode.rbac.domain.dto.ChangeStatusDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleAddDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleMenuDTO; -import cn.lycode.rbac.domain.dto.sysrole.SysRoleUpDTO; -import cn.lycode.rbac.domain.vo.MenuTreeVO; -import cn.lycode.rbac.domain.vo.SysRoleMenuVO; -import cn.lycode.rbac.mapper.SysRoleMapper; -import cn.lycode.rbac.mapper.SysRoleMenuMapper; -import cn.lycode.rbac.mapper.SysUserRoleMapper; -import cn.lycode.rbac.service.SysMenuService; -import cn.lycode.rbac.service.SysRoleService; +import cn.lycode.system.domain.dto.ChangeStatusDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleAddDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleMenuDTO; +import cn.lycode.system.domain.dto.sysrole.SysRoleUpDTO; +import cn.lycode.system.domain.vo.MenuTreeVO; +import cn.lycode.system.domain.vo.SysRoleMenuVO; +import cn.lycode.system.mapper.SysRoleMapper; +import cn.lycode.system.mapper.SysRoleMenuMapper; +import cn.lycode.system.mapper.SysUserRoleMapper; +import cn.lycode.system.service.SysMenuService; +import cn.lycode.system.service.SysRoleService; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/system/src/main/java/cn/lycode/rbac/service/impl/SysUserServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java similarity index 85% rename from system/src/main/java/cn/lycode/rbac/service/impl/SysUserServiceImpl.java rename to system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java index 8cab2ab..067dda7 100644 --- a/system/src/main/java/cn/lycode/rbac/service/impl/SysUserServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package cn.lycode.rbac.service.impl; +package cn.lycode.system.service.impl; import cn.lycode.common.core.domain.entity.SysRole; import cn.lycode.common.core.domain.entity.SysUser; @@ -11,18 +11,18 @@ import cn.lycode.common.enums.ErrorEnum; import cn.lycode.common.event.EventPublisher; import cn.lycode.common.utils.SecurityUtils; import cn.lycode.common.utils.StringUtils; -import cn.lycode.rbac.constant.ParamConstant; -import cn.lycode.rbac.domain.dto.sysmenu.SysUserRoleDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserAddDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserPasswordDTO; -import cn.lycode.rbac.domain.dto.sysuser.SysUserUpDTO; -import cn.lycode.rbac.domain.dto.sysuser.UserDeptDTO; -import cn.lycode.rbac.domain.vo.SysUserRoleVO; -import cn.lycode.rbac.domain.vo.SysUserVO; -import cn.lycode.rbac.mapper.SysDeptMapper; -import cn.lycode.rbac.mapper.SysUserMapper; -import cn.lycode.rbac.service.SysRoleService; -import cn.lycode.rbac.service.SysUserService; +import cn.lycode.system.constant.ParamConstant; +import cn.lycode.system.domain.dto.sysmenu.SysUserRoleDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserAddDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserPasswordDTO; +import cn.lycode.system.domain.dto.sysuser.SysUserUpDTO; +import cn.lycode.system.domain.dto.sysuser.UserDeptDTO; +import cn.lycode.system.domain.vo.SysUserRoleVO; +import cn.lycode.system.domain.vo.SysUserVO; +import cn.lycode.system.mapper.SysDeptMapper; +import cn.lycode.system.mapper.SysUserMapper; +import cn.lycode.system.service.SysRoleService; +import cn.lycode.system.service.SysUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; @@ -140,20 +140,15 @@ public class SysUserServiceImpl implements SysUserService { PageUtil.startPage(dto); List sysUserVOS = new ArrayList<>(); if (dto.getDeptId() != null && dto.getDeptId() == -1) { + //-1 表示部门列表选择为：全部 sysUserVOS = sysUserMapper.selectAllDeptUserVOList(dto); }else if (dto.getDeptId() != null && dto.getDeptId() == -2) { + //-1 表示部门列表选择为：未设置部门 sysUserVOS = sysUserMapper.selectNoDeptUserVOList(dto); }else if (dto.getIsThisDeep() != null && dto.getIsThisDeep()) { //查询指定部门的列表 sysUserVOS = sysUserMapper.selectUserVOListByDept(dto); }else { - //查询指定部门及子部门 - //这里被过滤了， pageSize 突然=0 分页查询里面不能查多条？ -// List deptIdList = sysDeptMapper.selectChildrenDeptIdById(dto.getDeptId()); -// log.info("查询指定部门及子部门， 部门ID={},子部门ID={}",deptId,deptIdList); -// if (deptIdList.size() > 0) { -// -// } sysUserVOS = sysUserMapper.selectUserVOListByDeptAndChildren(dto); } @@ -188,6 +183,12 @@ public class SysUserServiceImpl implements SysUserService { return sysUserMapper.updateUser(sysUser); } + @Override + public int unlockUser(List ids) { + // TODO 实现用户多次登录失败，账户锁定功能后， 完善解锁用户功能 + return ids.size(); + } + @Override @Transactional diff --git a/system/src/main/resources/mapper/system/SysDeptMapper.xml b/system/src/main/resources/mapper/system/SysDeptMapper.xml index 30bb2de..a3ea2bf 100644 --- a/system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -50,7 +50,7 @@ - + insert into sys_dept id, @@ -88,7 +88,7 @@ - + update sys_dept ancestors = #{ancestors}, diff --git a/system/src/main/resources/mapper/system/SysDictMapper.xml b/system/src/main/resources/mapper/system/SysDictMapper.xml index 7c6e103..b704d66 100644 --- a/system/src/main/resources/mapper/system/SysDictMapper.xml +++ b/system/src/main/resources/mapper/system/SysDictMapper.xml @@ -1,8 +1,8 @@ - + - + @@ -38,7 +38,7 @@ - d.del_flag = 'F' @@ -49,7 +49,7 @@ ORDER BY d.sys_dict_type_id ASC, d.dict_sort ASC - SELECT id,sys_dict_type_id,code_name,alias,dict_sort,callback_show_style, remark,is_lock,is_disable,create_time,update_time FROM sys_dict @@ -65,7 +65,7 @@ ORDER BY sys_dict_type_id ASC, dict_sort ASC - SELECT COUNT(*) FROM sys_dict WHERE del_flag = 'F' AND sys_dict_type_id = #{sysDictTypeId} AND code_name = #{codeName} @@ -77,7 +77,7 @@ SELECT MAX(id) FROM sys_dict WHERE del_flag = 'F' AND sys_dict_type_id = #{sysDictTypeId} - + insert into sys_dict id, @@ -107,7 +107,7 @@ - + UPDATE sys_dict diff --git a/system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 5331c05..cdef6b1 100644 --- a/system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -41,7 +41,7 @@ ORDER BY id DESC - insert into sys_dict_type @@ -70,7 +70,7 @@ - + UPDATE sys_dict_type diff --git a/system/src/main/resources/mapper/system/SysMenuMapper.xml b/system/src/main/resources/mapper/system/SysMenuMapper.xml index fe862c6..db0c1d8 100644 --- a/system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/system/src/main/resources/mapper/system/SysPostMapper.xml b/system/src/main/resources/mapper/system/SysPostMapper.xml index 8f581ab..9fa8081 100644 --- a/system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/system/src/main/resources/mapper/system/SysPostMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -25,7 +25,7 @@ - WHERE u.username = #{username} + LIMIT 1 - SELECT COUNT(*) FROM sys_user WHERE username = #{username} + + - - - - DELETE - FROM sys_user_role - WHERE user_id = #{userId} - - - - DELETE - FROM sys_user_role - WHERE user_id IN - - #{user_id} - - - - insert into sys_user_role VALUES - - (id, #{userId}, #{roleId}) - - diff --git a/system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 0a11adc..650416e 100644 --- a/system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -17,36 +17,35 @@ SELECT count(1) FROM sys_user_role WHERE role_id=#{roleId} - - INSERT INTO sys_user_role(user_id, role_id) VALUES - - (#{item.userId},#{item.roleId}) - - - - + - - DELETE from sys_user_role WHERE user_id=#{userId} + + DELETE + FROM sys_user_role + WHERE user_id = #{userId} - - DELETE FROM sys_user_role WHERE user_id IN - - #{userId} + + DELETE + FROM sys_user_role + WHERE user_id IN + + #{user_id} - - DELETE FROM sys_user_role WHERE user_id=#{userId} AND role_id=#{roleId} - - - - DELETE FROM sys_user_role WHERE role_id=#{roleId} AND user_id IN - - #{userId} + + insert into sys_user_role VALUES + + (id, #{userId}, #{roleId}) - + + + \ No newline at end of file -- Gitee From 5a9c72273861953edb66f3ae297dd856db032f9c Mon Sep 17 00:00:00 2001 From: lycode Date: Fri, 29 Nov 2024 16:56:39 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=A7=92=E8=89=B2list=E8=8E=B7=E5=8F=96bug=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9Amybatis=E6=98=A0=E5=B0=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lycode_admin_vue/src/views/system/accountManage/index.vue | 4 ++-- .../cn/lycode/system/service/impl/SysUserServiceImpl.java | 5 ++--- system/src/main/resources/mapper/system/SysUserMapper.xml | 6 ++++-- .../src/main/resources/mapper/system/SysUserRoleMapper.xml | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lycode_admin_vue/src/views/system/accountManage/index.vue b/lycode_admin_vue/src/views/system/accountManage/index.vue index 2b7232f..4d7e7b2 100644 --- a/lycode_admin_vue/src/views/system/accountManage/index.vue +++ b/lycode_admin_vue/src/views/system/accountManage/index.vue @@ -214,8 +214,8 @@ const columns: ColumnProps[] = [ { prop: 'username', label: '账户', width: 110, align: 'left' }, { prop: 'nickName', label: '昵称', width: 110, align: 'left' }, { prop: 'mobile', label: '手机号', width: 120 }, - { prop: 'deptInfo', label: '部门', width: 110 }, - { prop: 'roleInfo', label: '角色', width: 110 }, + { prop: 'deptInfo', label: '部门', width: 100 }, + { prop: 'roleInfo', label: '角色', width: 150 }, { prop: 'accountStatusCd', label: '状态', diff --git a/system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java b/system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java index 23fba25..24e7d02 100644 --- a/system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java +++ b/system/src/main/java/cn/lycode/system/service/impl/SysUserServiceImpl.java @@ -44,13 +44,13 @@ import java.util.List; @Slf4j public class SysUserServiceImpl implements SysUserService { - private final SysUserMapper sysUserMapper; private final SysRoleService sysRoleService; private final SysDeptService sysDeptService; private final SysUserRoleService sysUserRoleService; - private final EventPublisher eventPublisher; + private final SysUserMapper sysUserMapper; + @Override public SysUser getSysUserByUsernameOrNo(String input) { SysUser user = sysUserMapper.selectUserByUsername(input); @@ -108,7 +108,6 @@ public class SysUserServiceImpl implements SysUserService { if (!StringUtils.isEmpty(dto.getRoleIds())) { sysUserRoleService.batchAddUserRoles(dto.getUserId(), dto.getRoleIds()); } - // //更新此用户的session里面的权限。 eventPublisher.publish(new SessionChangeEvent(this, SessionChangeMeta.user(dto.getUserId()))); } diff --git a/system/src/main/resources/mapper/system/SysUserMapper.xml b/system/src/main/resources/mapper/system/SysUserMapper.xml index 13ed022..1249989 100644 --- a/system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/system/src/main/resources/mapper/system/SysUserMapper.xml @@ -33,7 +33,8 @@ - SELECT u.id, + SELECT + u.id, u.dept_id, u.person_no, u.username, @@ -95,7 +96,7 @@ - + @@ -129,6 +130,7 @@ d.ancestors, d.leader, d.is_lock, + r.id AS `role_id`, r.role_name, r.data_scope FROM sys_user u diff --git a/system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 650416e..686170a 100644 --- a/system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -41,7 +41,7 @@ insert into sys_user_role VALUES - (id, #{userId}, #{roleId}) + (null, #{userId}, #{roleId}) -- Gitee From cd89d3ada9bdc2f90a1d0727a897c1d3c4425618 Mon Sep 17 00:00:00 2001 From: lycode Date: Fri, 29 Nov 2024 18:33:44 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=AB=AF=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=94=A8=E6=88=B7=E5=B2=97=E4=BD=8D=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E5=89=8D=E7=AB=AF=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BC=BA=E5=B0=91=E5=B2=97=E4=BD=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- .../lycode/system/SysUserPostServiceTest.java | 35 +++++ .../src/api/interface/system/sysPost.ts | 5 + .../src/api/modules/system/sysPost.ts | 6 +- .../src/api/modules/system/user.ts | 12 +- .../accountManage/components/UserAdd.vue | 4 +- .../accountManage/components/UserEdit.vue | 5 - .../accountManage/components/UserPostForm.vue | 139 ++++++++++++++++++ .../src/views/system/accountManage/index.vue | 58 +++++++- .../system/controller/SysPostController.java | 8 + .../system/controller/SysUserController.java | 15 +- .../system/domain/entity/SysUserPost.java | 15 ++ .../lycode/system/mapper/SysPostMapper.java | 2 +- .../system/mapper/SysUserPostMapper.java | 16 +- .../lycode/system/service/SysPostService.java | 4 + .../system/service/SysUserPostService.java | 17 +++ .../service/impl/SysPostServiceImpl.java | 10 ++ .../service/impl/SysUserPostServiceImpl.java | 32 ++++ .../service/impl/SysUserServiceImpl.java | 14 +- .../mapper/system/SysUserPostMapper.xml | 37 +++++ 20 files changed, 402 insertions(+), 38 deletions(-) create mode 100644 admin/src/test/java/cn/lycode/system/SysUserPostServiceTest.java create mode 100644 lycode_admin_vue/src/views/system/accountManage/components/UserPostForm.vue create mode 100644 system/src/main/java/cn/lycode/system/domain/entity/SysUserPost.java create mode 100644 system/src/main/java/cn/lycode/system/service/SysUserPostService.java create mode 100644 system/src/main/java/cn/lycode/system/service/impl/SysUserPostServiceImpl.java create mode 100644 system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/README.md b/README.md index 655daca..bf7c2f9 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,14 @@ admin--->generator------------->common - [x] 删除用户 - [x] 测试联动删除用户所有绑定角色信息 - [x] 设置用户角色 -- [x] 设置角色部门 -- [ ] 设置角色岗位 +- [x] 批量设置角色部门 +- [ ] 批量设置角色岗位 +- [ ] 编辑用户加入岗位和部门 - [x] 重置用户密码 - [x] 用户名需保证唯一、nickname不需要唯一 - [x] 按用户名/工号/身份证查询时加入limit 1 防止错误数据引发系统故障 - [ ] 多次输错密码锁定用户几分钟 / 手动解锁用户 +- [ ] 点击用户名显示用户详情 diff --git a/admin/src/test/java/cn/lycode/system/SysUserPostServiceTest.java b/admin/src/test/java/cn/lycode/system/SysUserPostServiceTest.java new file mode 100644 index 0000000..2c91814 --- /dev/null +++ b/admin/src/test/java/cn/lycode/system/SysUserPostServiceTest.java @@ -0,0 +1,35 @@ +package cn.lycode.system; + +import cn.lycode.system.service.SysUserPostService; +import org.junit.Ignore; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Title: SysUserPostServiceTest + * @Author lyg + * @Date 2024/11/29 17:10 + * @description: + */ +@SpringBootTest +public class SysUserPostServiceTest { + + @Autowired + SysUserPostService sysUserPostService; + + @Test + @Ignore + public void batchAddUserPost(){ + List userIdList = new ArrayList<>(); + userIdList.add(1L); + userIdList.add(14L); + List postIdList = new ArrayList<>(); + postIdList.add(1L); + postIdList.add(2L); + sysUserPostService.batchAddUserPost(userIdList, postIdList); + } +} diff --git a/lycode_admin_vue/src/api/interface/system/sysPost.ts b/lycode_admin_vue/src/api/interface/system/sysPost.ts index 9a26de4..f6f5566 100644 --- a/lycode_admin_vue/src/api/interface/system/sysPost.ts +++ b/lycode_admin_vue/src/api/interface/system/sysPost.ts @@ -27,4 +27,9 @@ export namespace ISysPost { remark?: string } + export interface PostSetting { + userIds: number[] + postIds: number[] + } + } \ No newline at end of file diff --git a/lycode_admin_vue/src/api/modules/system/sysPost.ts b/lycode_admin_vue/src/api/modules/system/sysPost.ts index 7b8801d..0132ca2 100644 --- a/lycode_admin_vue/src/api/modules/system/sysPost.ts +++ b/lycode_admin_vue/src/api/modules/system/sysPost.ts @@ -12,6 +12,10 @@ export const getSysPostListApi = (params: ISysPost.Query) => { return http.get>(ADMIN_MODULE + `/sys-post/list`, params) } +export const getSysPostOptionApi = () => { + return http.get(ADMIN_MODULE + `/sys-post/option`) +} + /** * 添加 * @param params @@ -36,7 +40,7 @@ export const updateSysPostApi = (params: ISysPost.Form) => { * @returns {*} */ export const removeSysPostApi = (params: { ids: number[] }) => { - return http.post(ADMIN_MODULE + `/sys-post/remove`, params) + return http.post(ADMIN_MODULE + `/sys-post/remove`, params) } /** diff --git a/lycode_admin_vue/src/api/modules/system/user.ts b/lycode_admin_vue/src/api/modules/system/user.ts index 4184f57..5267876 100644 --- a/lycode_admin_vue/src/api/modules/system/user.ts +++ b/lycode_admin_vue/src/api/modules/system/user.ts @@ -3,6 +3,7 @@ import { ADMIN_MODULE } from '@/api/helper/prefix' import type { IUser } from '@/api/interface/system/user' import type { IPage } from '@/api/interface' import type { ISysDept } from '@/api/interface/system/sysDept' +import type { ISysPost } from '@/api/interface/system/sysPost' /** * 获取用户列表 @@ -85,7 +86,7 @@ export const getUserinfo = () => { } /** - * 添加 + * 绑定部门 * @param params * @returns {*} */ @@ -93,6 +94,15 @@ export const bindUserDeptApi = (params: ISysDept.DeptSetting) => { return http.post(ADMIN_MODULE + `/sys-user/dept/bind`, params) } +/** + * 绑定岗位 + * @param params + * @returns {*} + */ +export const bindUserPostApi = (params: ISysPost.PostSetting) => { + return http.post(ADMIN_MODULE + `/sys-user/post/bind`, params) +} + /** * 用户部门属性列表 */ diff --git a/lycode_admin_vue/src/views/system/accountManage/components/UserAdd.vue b/lycode_admin_vue/src/views/system/accountManage/components/UserAdd.vue index 27c376b..c37bed8 100644 --- a/lycode_admin_vue/src/views/system/accountManage/components/UserAdd.vue +++ b/lycode_admin_vue/src/views/system/accountManage/components/UserAdd.vue @@ -99,11 +99,11 @@ - + + +