admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 调整 system entity 实体与 controller 包结构

Browse Source
This commit is contained in:
疯狂的狮子li 2023-01-16 11:16:37 +08:00
parent df6867ee05
commit f3aff34602
54 changed files with 80 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.common;
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.config.RuoYiConfig;

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.SmsLoginBody;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java → ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.web.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.core.controller.BaseController;

6
ruoyi-admin/src/main/resources/application.yml
View File

@ -212,9 +212,11 @@ springdoc:
group-configs:
- group: 1.演示模块
packages-to-scan: com.ruoyi.demo
- group: 2.系统模块
- group: 2.通用模块
packages-to-scan: com.ruoyi.web
- group: 3.代码生成模块
- group: 3.系统模块
packages-to-scan: com.ruoyi.system
- group: 4.代码生成模块
packages-to-scan: com.ruoyi.generator
# 防止XSS攻击

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.collection.CollUtil;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.exception.NotLoginException;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ArrayUtil;
@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
@ -6,7 +6,7 @@ import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.tree.Tree;
@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.io.FileUtil;
@ -6,12 +6,11 @@ import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
@ -7,9 +7,9 @@ import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.secure.BCrypt;
@ -11,9 +11,9 @@ import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.excel.ExcelResult;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java → ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.annotation.Sensitive;

2
ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
View File

@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.excel.ExcelListener;
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.common.exception.ServiceException;

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
View File

@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
/**

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
View File

@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.RouterVo;
import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysUserRole;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import java.util.List;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
View File

@ -10,7 +10,7 @@ import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.event.LogininforEvent;
import com.ruoyi.common.core.domain.dto.RoleDTO;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.XcxLoginUser;
import com.ruoyi.common.enums.DeviceType;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
View File

@ -5,7 +5,7 @@ import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.event.LogininforEvent;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.user.CaptchaException;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.system.domain.SysRoleDept;

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -7,9 +7,9 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.helper.LoginHelper;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -10,8 +10,8 @@ import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.DictService;
import com.ruoyi.common.exception.ServiceException;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.common.utils.StringUtils;

2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;

6
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataBaseHelper;

2
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
<resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
<resultMap type="com.ruoyi.system.domain.SysDept" id="SysDeptResult">
</resultMap>
<select id="selectDeptList" resultMap="SysDeptResult">

2
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">
<resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
<resultMap type="com.ruoyi.system.domain.SysMenu" id="SysMenuResult">
</resultMap>
<select id="selectMenuListByUserId" resultMap="SysMenuResult">

2
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">
<resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
<resultMap type="com.ruoyi.system.domain.SysRole" id="SysRoleResult">
</resultMap>
<sql id="selectRoleVo">

6
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -5,17 +5,17 @@
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">
<!-- 多结构嵌套自动映射需带上每个实体的主键id 否则映射会失败 -->
<resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
<resultMap type="com.ruoyi.system.domain.SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
<association property="dept" column="dept_id" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
</resultMap>
<resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
<resultMap id="deptResult" type="com.ruoyi.system.domain.SysDept">
<id property="deptId" column="dept_id"/>
</resultMap>
<resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
<resultMap id="RoleResult" type="com.ruoyi.system.domain.SysRole">
<id property="roleId" column="role_id"/>
</resultMap>