BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 9dd2bc95fb19e43034efc565c594db6cc459fb44

Authored by YunaiV
1 parent 3fb292a4

调整 dal 结构，将 dataobject 抽出来，层级更平铺

Inline Side-by-side
Showing 124 changed files with 202 additions and 209 deletions

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 124 files are displayed.

src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.framework.apollo.internals;
2 2  
3   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  3 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
4 4  
5 5 import java.util.Date;
6 6 import java.util.List;
... ...
src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java
  View file @9dd2bc9
... ... @@ -3,8 +3,8 @@ package cn.iocoder.dashboard.framework.apollo.internals;
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
6   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config.InfConfigDAOImpl;
7   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  6 +import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl;
  7 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
8 8 import com.ctrip.framework.apollo.Apollo;
9 9 import com.ctrip.framework.apollo.build.ApolloInjector;
10 10 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
... ...
src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java
  View file @9dd2bc9
1 1 /**
2 2 * 配置中心客户端，基于 Apollo Client 进行简化
3 3 *
4   - * 差别在于，我们使用 {@link cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO} 表作为配置源。
  4 + * 差别在于，我们使用 {@link cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO} 表作为配置源。
5 5 * 当然，功能肯定也会相对少些，满足最小化诉求。
6 6 *
7 7 * 1. 项目初始化时，可以使用 SysConfigDO 表的配置
... ...
src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.framework.dict.core.service;
2 2  
3   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  3 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
4 4  
5 5 import java.util.List;
6 6  
... ...
src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.framework.dict.core.util;
2 2  
3 3 import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService;
4   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  4 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
5 5 import lombok.extern.slf4j.Slf4j;
6 6  
7 7 /**
... ...
src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ package cn.iocoder.dashboard.framework.excel.core.convert;
4 4 import cn.hutool.core.convert.Convert;
5 5 import cn.iocoder.dashboard.framework.dict.core.util.DictUtils;
6 6 import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
8 8 import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
9 9 import com.alibaba.excel.converters.Converter;
10 10 import com.alibaba.excel.enums.CellDataTypeEnum;
... ...
src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.framework.mybatis.core.type;
2 2  
3   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  3 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
4 4 import cn.iocoder.dashboard.util.json.JsonUtils;
5 5 import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
6 6 import com.fasterxml.jackson.core.type.TypeReference;
... ...
src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.framework.security.core.service;
2 2  
3   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
  3 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
4 4  
5 5 /**
6 6 * Security 框架 Permission Service 接口，定义 security 组件需要的功能
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java
  View file @9dd2bc9
... ... @@ -6,7 +6,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
6 6 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
7 7 import cn.iocoder.dashboard.modules.infra.controller.config.vo.*;
8 8 import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert;
9   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  9 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
10 10 import cn.iocoder.dashboard.modules.infra.service.config.InfConfigService;
11 11 import io.swagger.annotations.Api;
12 12 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateRe
5 5 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExcelVO;
6 6 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigRespVO;
7 7 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
8   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  8 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
9 9 import org.mapstruct.Mapper;
10 10 import org.mapstruct.factory.Mappers;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dataobject/config/InfConfigDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config;
  1 +package cn.iocoder.dashboard.modules.infra.dal.dataobject.config;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum;
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/package-info.java 0 → 100644
  View file @9dd2bc9
  1 +package cn.iocoder.dashboard.modules.infra.dal.dataobject;
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/config/InfConfigDAOImpl.java renamed to src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config;
  1 +package cn.iocoder.dashboard.modules.infra.dal.mysql.config;
2 2  
3 3 import cn.iocoder.dashboard.framework.apollo.internals.ConfigFrameworkDAO;
4   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  4 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
5 5 import org.springframework.jdbc.core.BeanPropertyRowMapper;
6 6 import org.springframework.jdbc.core.JdbcTemplate;
7 7 import org.springframework.jdbc.datasource.DriverManagerDataSource;
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/config/InfConfigMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config;
  1 +package cn.iocoder.dashboard.modules.infra.dal.mysql.config;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO;
7 7 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO;
8   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  8 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
9 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/package-info.java deleted
View file @3fb292a
1   -package cn.iocoder.dashboard.modules.infra.dal.mysql.dao;
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dataobject/package-info.java deleted
View file @3fb292a
1   -package cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject;
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/package-info.java 0 → 100644
  View file @9dd2bc9
  1 +package cn.iocoder.dashboard.modules.infra.dal.mysql;
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateRe
5 5 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO;
6 6 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO;
7 7 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
8   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  8 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
9 9  
10 10 import java.util.List;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportRe
7 7 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO;
8 8 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
9 9 import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert;
10   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config.InfConfigMapper;
11   -import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
  10 +import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigMapper;
  11 +import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
12 12 import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum;
13 13 import cn.iocoder.dashboard.modules.infra.mq.producer.config.InfConfigProducer;
14 14 import cn.iocoder.dashboard.modules.infra.service.config.InfConfigService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
  View file @9dd2bc9
... ... @@ -8,9 +8,9 @@ import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginR
8 8 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO;
9 9 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO;
10 10 import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
12   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
13   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
  12 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
  13 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
14 14 import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
15 15 import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService;
16 16 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java
  View file @9dd2bc9
... ... @@ -5,9 +5,9 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
5 5 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
7 7 import cn.iocoder.dashboard.modules.system.convert.auth.SysUserSessionConvert;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
  9 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
11 11 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
12 12 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
13 13 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysFileController.java
  View file @9dd2bc9
... ... @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.common;
2 2  
3 3 import cn.hutool.core.io.IoUtil;
4 4 import cn.iocoder.dashboard.common.pojo.CommonResult;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
6 6 import cn.iocoder.dashboard.modules.system.service.common.SysFileService;
7 7 import cn.iocoder.dashboard.util.servlet.ServletUtils;
8 8 import io.swagger.annotations.Api;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.common.pojo.CommonResult;
5 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.*;
6 6 import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
8 8 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
9 9 import io.swagger.annotations.Api;
10 10 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java
  View file @9dd2bc9
... ... @@ -6,7 +6,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
6 6 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
7 7 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*;
8 8 import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
  9 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
10 10 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService;
11 11 import io.swagger.annotations.Api;
12 12 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
5 5 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
7 7 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
9 9 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
10 10 import io.swagger.annotations.Api;
11 11 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
5 5 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*;
7 7 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
9 9 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
10 10 import io.swagger.annotations.Api;
11 11 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
  View file @9dd2bc9
... ... @@ -8,7 +8,7 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLogi
8 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
9 9 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO;
10 10 import cn.iocoder.dashboard.modules.system.convert.logger.SysLoginLogConvert;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
12 12 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService;
13 13 import io.swagger.annotations.Api;
14 14 import io.swagger.annotations.ApiOperation;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java
  View file @9dd2bc9
... ... @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOp
11 11 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
12 12 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO;
13 13 import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert;
14   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
15   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  14 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
  15 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
16 16 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService;
17 17 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
18 18 import cn.iocoder.dashboard.util.collection.CollectionUtils;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.common.pojo.CommonResult;
5 5 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.*;
6 6 import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
8 8 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
9 9 import io.swagger.annotations.Api;
10 10 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java
  View file @9dd2bc9
... ... @@ -6,7 +6,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
6 6 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
7 7 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*;
8 8 import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
  9 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
10 10 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
11 11 import io.swagger.annotations.Api;
12 12 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/test/SysTestDemoController.java
  View file @9dd2bc9
... ... @@ -7,7 +7,7 @@ import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoPageReq
7 7 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoRespVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoUpdateReqVO;
9 9 import cn.iocoder.dashboard.modules.system.convert.test.SysTestDemoConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test.SysTestDemoDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.dataobject.test.SysTestDemoDO;
11 11 import cn.iocoder.dashboard.modules.system.service.test.SysTestDemoService;
12 12 import io.swagger.annotations.Api;
13 13 import io.swagger.annotations.ApiImplicitParam;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java
  View file @9dd2bc9
... ... @@ -7,8 +7,8 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
7 7 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
8 8 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*;
9 9 import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
12 12 import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum;
13 13 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
14 14 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java
  View file @9dd2bc9
... ... @@ -3,9 +3,9 @@ package cn.iocoder.dashboard.modules.system.convert.auth;
3 3 import cn.iocoder.dashboard.framework.security.core.LoginUser;
4 4 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
9 9 import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum;
10 10 import cn.iocoder.dashboard.util.collection.CollectionUtils;
11 11 import org.mapstruct.Mapper;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.modules.system.convert.auth;
2 2  
3 3 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO;
4   -import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageItemRespVO;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
  4 +import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
6 5 import org.mapstruct.Mapper;
7 6 import org.mapstruct.factory.Mappers;
8 7  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate
4 4 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptRespVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptSimpleRespVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
8 8 import org.mapstruct.Mapper;
9 9 import org.mapstruct.factory.Mappers;
10 10  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java
  View file @9dd2bc9
... ... @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.dept;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
6 6 import org.mapstruct.Mapper;
7 7 import org.mapstruct.factory.Mappers;
8 8  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
  View file @9dd2bc9
... ... @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
6 6 import org.mapstruct.Mapper;
7 7 import org.mapstruct.factory.Mappers;
8 8  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java
  View file @9dd2bc9
... ... @@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
6 6 import org.mapstruct.Mapper;
7 7 import org.mapstruct.factory.Mappers;
8 8  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
8 8 import org.mapstruct.Mapper;
9 9 import org.mapstruct.factory.Mappers;
10 10  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java
  View file @9dd2bc9
... ... @@ -4,8 +4,8 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
9 9 import cn.iocoder.dashboard.util.collection.MapUtils;
10 10 import org.mapstruct.Mapper;
11 11 import org.mapstruct.factory.Mappers;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
8 8 import org.mapstruct.Mapper;
9 9 import org.mapstruct.factory.Mappers;
10 10  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenu
4 4 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuSimpleRespVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
8 8 import org.mapstruct.Mapper;
9 9 import org.mapstruct.factory.Mappers;
10 10  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.modules.system.convert.permission;
2 2  
3 3 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*;
4   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
  4 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
5 5 import org.mapstruct.Mapper;
6 6 import org.mapstruct.factory.Mappers;
7 7  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.modules.system.convert.user;
2 2  
3 3 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*;
4   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  4 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
6 6 import org.mapstruct.Mapper;
7 7 import org.mapstruct.factory.Mappers;
8 8  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/auth/SysUserSessionDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.auth;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.dashboard.framework.security.core.LoginUser;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
6 6 import com.baomidou.mybatisplus.annotation.IdType;
7 7 import com.baomidou.mybatisplus.annotation.TableId;
8 8 import com.baomidou.mybatisplus.annotation.TableName;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/common/SysFileDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/common/SysFileDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.common;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.IdType;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dept/SysDeptDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.dept;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dept/SysPostDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.dept;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dict/SysDictDataDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.dict;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dict/SysDictTypeDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.dict;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/logger/SysLoginLogDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.logger;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/logger/SysOperateLogDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.logger;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.CommonResult;
4 4 import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
7 7 import com.baomidou.mybatisplus.annotation.TableField;
8 8 import com.baomidou.mybatisplus.annotation.TableId;
9 9 import com.baomidou.mybatisplus.annotation.TableName;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/notice/SysNoticeDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.notice;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysMenuDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysRoleDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysRoleMenuDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.TableId;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysUserRoleDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.TableId;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/test/SysTestDemoDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/test/SysTestDemoDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.test;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
4 4 import com.baomidou.mybatisplus.annotation.TableId;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/user/SysUserDO.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user;
  1 +package cn.iocoder.dashboard.modules.system.dal.dataobject.user;
2 2  
3 3 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/auth/SysUserSessionMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.auth;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.auth;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
10 10 import java.util.Collection;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/common/SysFileMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/common/SysFileMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.common;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.common;
2 2  
3   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
  3 +import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
4 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
6 6 import org.apache.ibatis.annotations.Mapper;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dept/SysDeptMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.dept;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
5 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
7 7 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dept/SysPostMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.dept;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
9 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictDataMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.dict;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
9 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictTypeMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.dict;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
9 9 import org.apache.ibatis.annotations.Mapper;
10 10  
11 11 import java.util.List;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/logger/SysLoginLogMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.logger;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
9 9 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/logger/SysOperateLogMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.logger;
2 2  
3 3 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
4 4 import cn.iocoder.dashboard.common.pojo.PageResult;
... ... @@ -6,7 +6,7 @@ import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
7 7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
  9 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
12 12 import java.util.Collection;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/notice/SysNoticeMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.notice;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.notice;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
10 10 @Mapper
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysMenuMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
5 5 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
7 7 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
8 8 import org.apache.ibatis.annotations.Mapper;
9 9  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
9 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11 import org.springframework.lang.Nullable;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMenuMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
2 2  
3 3 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
4   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleMenuDO;
  4 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleMenuDO;
5 5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 6 import org.apache.ibatis.annotations.Mapper;
7 7  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysUserRoleMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
2 2  
3   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysUserRoleDO;
  3 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysUserRoleDO;
4 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 5 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
6 6 import org.apache.ibatis.annotations.Mapper;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/test/SysTestDemoMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/test/SysTestDemoMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.test;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.test;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test.SysTestDemoDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.test.SysTestDemoDO;
7 7 import org.apache.ibatis.annotations.Mapper;
8 8 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoPageReqVO;
9 9  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/user/SysUserMapper.java renamed to src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java
  View file @9dd2bc9
1   -package cn.iocoder.dashboard.modules.system.dal.mysql.dao.user;
  1 +package cn.iocoder.dashboard.modules.system.dal.mysql.user;
2 2  
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
5 5 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
6 6 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
9 9 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java
  View file @9dd2bc9
... ... @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.auth;
3 3 import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.security.core.LoginUser;
5 5 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
7 7  
8 8 /**
9 9 * 在线用户 Session Service 接口
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,7 +7,7 @@ import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
7 7 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
9 9 import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
11 11 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum;
12 12 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum;
13 13 import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,9 +7,9 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
7 7 import cn.iocoder.dashboard.framework.security.config.SecurityProperties;
8 8 import cn.iocoder.dashboard.framework.security.core.LoginUser;
9 9 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.auth.SysUserSessionMapper;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
12   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.mysql.auth.SysUserSessionMapper;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
  12 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
13 13 import cn.iocoder.dashboard.modules.system.dal.redis.dao.auth.SysLoginUserRedisDAO;
14 14 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
15 15 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysFileService.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.modules.system.service.common;
2 2  
3   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
  3 +import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
4 4  
5 5 /**
6 6 * 文件 Service 接口
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysFileServiceImpl.java
  View file @9dd2bc9
... ... @@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.common.impl;
2 2  
3 3 import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil;
4 4 import cn.iocoder.dashboard.framework.file.config.FileProperties;
5   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.common.SysFileMapper;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
  5 +import cn.iocoder.dashboard.modules.system.dal.mysql.common.SysFileMapper;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
7 7 import cn.iocoder.dashboard.modules.system.service.common.SysFileService;
8 8 import org.springframework.stereotype.Service;
9 9  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
8 8 import cn.iocoder.dashboard.util.collection.CollectionUtils;
9 9  
10 10 import java.util.Collection;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreate
5 5 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
9 9 import org.springframework.lang.Nullable;
10 10  
11 11 import java.util.Collection;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java
  View file @9dd2bc9
... ... @@ -8,8 +8,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate
8 8 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
9 9 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
10 10 import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept.SysDeptMapper;
12   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
  11 +import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysDeptMapper;
  12 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
13 13 import cn.iocoder.dashboard.modules.system.enums.dept.DeptIdEnum;
14 14 import cn.iocoder.dashboard.modules.system.mq.producer.dept.SysDeptProducer;
15 15 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExport
7 7 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
9 9 import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept.SysPostMapper;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysPostMapper;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
12 12 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService;
13 13 import org.springframework.stereotype.Service;
14 14  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java
  View file @9dd2bc9
... ... @@ -6,7 +6,7 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCr
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataUpdateReqVO;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
  9 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
10 10  
11 11 import java.util.List;
12 12  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCr
5 5 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUpdateReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
9 9  
10 10 import java.util.List;
11 11  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
  View file @9dd2bc9
... ... @@ -10,9 +10,9 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataEx
10 10 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
11 11 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataUpdateReqVO;
12 12 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert;
13   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict.SysDictDataMapper;
14   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
15   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
  13 +import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictDataMapper;
  14 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
  15 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
16 16 import cn.iocoder.dashboard.modules.system.mq.producer.dict.SysDictDataProducer;
17 17 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
18 18 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeEx
7 7 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUpdateReqVO;
9 9 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict.SysDictTypeMapper;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictTypeMapper;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
12 12 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
13 13 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
14 14 import org.springframework.stereotype.Service;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
8 8  
9 9 import java.util.List;
10 10  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService;
5 5 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
8 8  
9 9 import java.util.List;
10 10  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.modules.system.service.logger.impl;
2 2  
3   -import cn.hutool.core.collection.CollUtil;
4   -import cn.hutool.core.util.StrUtil;
5 3 import cn.iocoder.dashboard.common.pojo.PageResult;
6 4 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
7 5 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
8 6 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
9 7 import cn.iocoder.dashboard.modules.system.convert.logger.SysLoginLogConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger.SysLoginLogMapper;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
12   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper;
  9 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
13 10 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService;
14 11 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
15 12 import org.springframework.stereotype.Service;
16 13  
17 14 import javax.annotation.Resource;
18   -import java.util.Collection;
19 15 import java.util.List;
20 16  
21   -import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet;
22   -
23 17 /**
24 18 * 登陆日志 Service 实现
25 19 */
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,9 +7,9 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOp
7 7 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
9 9 import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger.SysOperateLogMapper;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
12   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
  12 +import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
13 13 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService;
14 14 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
15 15 import cn.iocoder.dashboard.util.string.StrUtils;
... ... @@ -22,8 +22,8 @@ import java.util.Collection;
22 22 import java.util.Collections;
23 23 import java.util.List;
24 24  
25   -import static cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH;
26   -import static cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH;
  25 +import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH;
  26 +import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH;
27 27 import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet;
28 28  
29 29 @Service
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
8 8  
9 9 /**
10 10 * 通知公告 Service 接口
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java
  View file @9dd2bc9
... ... @@ -6,8 +6,8 @@ import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateR
6 6 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
8 8 import cn.iocoder.dashboard.modules.system.convert.notice.SysNoticeConvert;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.notice.SysNoticeMapper;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
  9 +import cn.iocoder.dashboard.modules.system.dal.mysql.notice.SysNoticeMapper;
  10 +import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
11 11 import cn.iocoder.dashboard.modules.system.service.notice.SysNoticeService;
12 12 import org.springframework.stereotype.Service;
13 13  
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java
  View file @9dd2bc9
... ... @@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission;
3 3 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
4 4 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
6   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
  6 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
7 7  
8 8 import java.util.Collection;
9 9 import java.util.List;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java
  View file @9dd2bc9
1 1 package cn.iocoder.dashboard.modules.system.service.permission;
2 2  
3 3 import cn.iocoder.dashboard.framework.security.core.service.SecurityPermissionFrameworkService;
4   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
  4 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
5 5 import org.springframework.lang.Nullable;
6 6  
7 7 import java.util.Collection;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java
  View file @9dd2bc9
... ... @@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRole
5 5 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
7 7 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
9 9 import org.springframework.lang.Nullable;
10 10  
11 11 import java.util.Collection;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
  View file @9dd2bc9
... ... @@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenu
7 7 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
8 8 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
9 9 import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysMenuMapper;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
  10 +import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
12 12 import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum;
13 13 import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
14 14 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
  View file @9dd2bc9
... ... @@ -5,12 +5,12 @@ import cn.hutool.core.collection.CollectionUtil;
5 5 import cn.hutool.core.util.ArrayUtil;
6 6 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
7 7 import cn.iocoder.dashboard.framework.security.core.util.SecurityUtils;
8   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMenuMapper;
9   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysUserRoleMapper;
10   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
11   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
12   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleMenuDO;
13   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysUserRoleDO;
  8 +import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMenuMapper;
  9 +import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysUserRoleMapper;
  10 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
  11 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
  12 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleMenuDO;
  13 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysUserRoleDO;
14 14 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysPermissionProducer;
15 15 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
16 16 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
  View file @9dd2bc9
... ... @@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRole
11 11 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
12 12 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
13 13 import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert;
14   -import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMapper;
15   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
  14 +import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper;
  15 +import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
16 16 import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum;
17 17 import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum;
18 18 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer;
... ...
src/main/java/cn/iocoder/dashboard/modules/system/service/test/SysTestDemoService.java
  View file @9dd2bc9
... ... @@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
4 4 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoCreateReqVO;
5 5 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoPageReqVO;
6 6 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoUpdateReqVO;
7   -import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test.SysTestDemoDO;
  7 +import cn.iocoder.dashboard.modules.system.dal.dataobject.test.SysTestDemoDO;
8 8  
9 9 import javax.validation.Valid;
10 10 import java.util.Collection;
... ...