From 45e0207b3855d5ce9a4e703a294db19fd10777d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Wed, 7 Dec 2022 11:39:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=8C=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=B7=BB=E5=8A=A0mybatisPlus=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=AE=80=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +- .../com/pearadmin/EntranceApplication.java | 4 +- .../common/config/MybatisPlusConfig.java | 25 ++++ .../config/proprety/SwaggerProperty.java | 40 ++++-- .../common/constant/GenerateConstant.java | 128 +++++++++++++----- .../submit/RepeatSubmitInterceptor.java | 1 - .../plugin/system/service/SystemService.java | 6 +- .../pearadmin/common/tools/SequenceUtil.java | 20 ++- .../common/tools/SqlInjectionUtil.java | 2 - .../common/tools/string/CharsetKit.java | 24 +++- .../common/tools/string/StringUtil.java | 8 +- .../pearadmin/common/web/base/BaseDomain.java | 3 + .../domain/response/module/ResultSelect.java | 3 +- .../modules/gen/domain/GenTable.java | 92 +++++++++---- .../modules/gen/domain/GenTableColumn.java | 72 +++++++--- .../gen/mapper/GenTableColumnMapper.java | 6 +- .../modules/gen/mapper/GenTableMapper.java | 6 +- .../gen/service/IGenTableColumnService.java | 3 +- .../modules/gen/service/IGenTableService.java | 3 +- .../impl/GenTableColumnServiceImpl.java | 3 +- .../gen/service/impl/GenTableServiceImpl.java | 3 +- .../modules/gen/tools/VelocityUtils.java | 8 +- .../job/controller/ScheduleJobController.java | 1 + .../modules/job/handler/ScheduleStarted.java | 2 +- .../modules/job/mapper/ScheduleJobMapper.java | 20 +-- .../modules/job/mapper/ScheduleLogMapper.java | 12 +- .../job/service/IScheduleJobService.java | 5 +- .../job/service/IScheduleLogService.java | 3 +- .../service/impl/ScheduleJobServiceImpl.java | 11 +- .../service/impl/ScheduleLogServiceImpl.java | 3 +- .../pro/controller/ProEditorController.java | 6 +- .../sys/context/SystemServiceImpl.java | 2 - .../sys/controller/SysDictDataController.java | 2 +- .../sys/controller/SysNoticeController.java | 2 +- .../sys/controller/SysUserController.java | 22 ++- .../modules/sys/domain/SysNotice.java | 32 +++-- .../pearadmin/modules/sys/domain/SysUser.java | 9 +- .../modules/sys/mapper/SysConfigMapper.java | 20 +-- .../modules/sys/mapper/SysDeptMapper.java | 18 +-- .../modules/sys/mapper/SysDictDataMapper.java | 19 +-- .../modules/sys/mapper/SysDictTypeMapper.java | 20 +-- .../modules/sys/mapper/SysFileMapper.java | 6 +- .../modules/sys/mapper/SysLogMapper.java | 6 +- .../modules/sys/mapper/SysMailMapper.java | 8 +- .../modules/sys/mapper/SysNoticeMapper.java | 6 +- .../modules/sys/mapper/SysPowerMapper.java | 10 +- .../modules/sys/mapper/SysRoleMapper.java | 12 +- .../sys/mapper/SysRolePowerMapper.java | 6 +- .../modules/sys/mapper/SysUserMapper.java | 22 +-- .../modules/sys/mapper/SysUserRoleMapper.java | 6 +- .../sys/service/ISysConfigService.java | 7 +- .../modules/sys/service/ISysDeptService.java | 3 +- .../sys/service/ISysDictDataService.java | 7 +- .../sys/service/ISysDictTypeService.java | 7 +- .../modules/sys/service/ISysFileService.java | 3 +- .../modules/sys/service/ISysLogService.java | 3 +- .../modules/sys/service/ISysMailService.java | 5 +- .../sys/service/ISysNoticeService.java | 3 +- .../modules/sys/service/ISysPowerService.java | 3 +- .../modules/sys/service/ISysRoleService.java | 5 +- .../modules/sys/service/ISysUserService.java | 5 +- .../service/impl/SysConfigServiceImpl.java | 7 +- .../sys/service/impl/SysDeptServiceImpl.java | 3 +- .../service/impl/SysDictDataServiceImpl.java | 7 +- .../service/impl/SysDictTypeServiceImpl.java | 7 +- .../service/impl/SysFileFTPServiceImpl.java | 5 +- .../sys/service/impl/SysFileServiceImpl.java | 5 +- .../sys/service/impl/SysLogServiceImpl.java | 3 +- .../sys/service/impl/SysMailServiceImpl.java | 10 +- .../service/impl/SysNoticeServiceImpl.java | 3 +- .../sys/service/impl/SysPowerServiceImpl.java | 5 +- .../sys/service/impl/SysRoleServiceImpl.java | 11 +- .../sys/service/impl/SysUserServiceImpl.java | 13 +- src/main/resources/application.yml | 7 +- .../mapper}/GenTableColumnMapper.xml | 10 +- .../mapper}/GenTableMapper.xml | 14 +- .../mapper}/ScheduleJobMapper.xml | 8 +- .../mapper}/ScheduleLogMapper.xml | 6 +- .../mapper}/SysConfigMapper.xml | 6 +- .../mapper}/SysDeptMapper.xml | 6 +- .../mapper}/SysDictDataMapper.xml | 8 +- .../mapper}/SysDictTypeMapper.xml | 8 +- .../mapper}/SysFileMapper.xml | 0 .../xml => resources/mapper}/SysLogMapper.xml | 44 +++--- .../mapper}/SysMailMapper.xml | 0 .../mapper}/SysNoticeMapper.xml | 0 .../mapper}/SysPowerMapper.xml | 8 +- .../mapper}/SysRoleMapper.xml | 8 +- .../mapper}/SysRolePowerMapper.xml | 2 +- .../mapper}/SysUserMapper.xml | 6 +- .../mapper}/SysUserRoleMapper.xml | 2 +- 91 files changed, 616 insertions(+), 418 deletions(-) create mode 100644 src/main/java/com/pearadmin/common/config/MybatisPlusConfig.java rename src/main/{java/com/pearadmin/modules/gen/mapper/xml => resources/mapper}/GenTableColumnMapper.xml (93%) rename src/main/{java/com/pearadmin/modules/gen/mapper/xml => resources/mapper}/GenTableMapper.xml (95%) rename src/main/{java/com/pearadmin/modules/job/mapper/xml => resources/mapper}/ScheduleJobMapper.xml (92%) rename src/main/{java/com/pearadmin/modules/job/mapper/xml => resources/mapper}/ScheduleLogMapper.xml (90%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysConfigMapper.xml (94%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysDeptMapper.xml (94%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysDictDataMapper.xml (92%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysDictTypeMapper.xml (91%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysFileMapper.xml (100%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysLogMapper.xml (84%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysMailMapper.xml (100%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysNoticeMapper.xml (100%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysPowerMapper.xml (94%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysRoleMapper.xml (93%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysRolePowerMapper.xml (95%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysUserMapper.xml (96%) rename src/main/{java/com/pearadmin/modules/sys/mapper/xml => resources/mapper}/SysUserRoleMapper.xml (95%) diff --git a/pom.xml b/pom.xml index 58c53b4..a4f69f3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 8.0.19 - 3.4.3.4 + 3.4.1 2.9.2 @@ -41,8 +41,6 @@ 1.3.0 3.5.0 - - 2.3.30 1.6.2 @@ -176,12 +174,6 @@ mybatis-plus-generator ${generator.version} - - - org.freemarker - freemarker - ${freemarker.version} - com.github.whvcse diff --git a/src/main/java/com/pearadmin/EntranceApplication.java b/src/main/java/com/pearadmin/EntranceApplication.java index 7584d20..492670a 100644 --- a/src/main/java/com/pearadmin/EntranceApplication.java +++ b/src/main/java/com/pearadmin/EntranceApplication.java @@ -1,14 +1,16 @@ package com.pearadmin; import org.activiti.spring.boot.SecurityAutoConfiguration; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * Pear Admin Fast 启动类 - * */ + */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, org.activiti.spring.boot.SecurityAutoConfiguration.class, SecurityAutoConfiguration.class}) +@MapperScan("com.pearadmin.modules.**.mapper") public class EntranceApplication { public static void main(String[] args) { diff --git a/src/main/java/com/pearadmin/common/config/MybatisPlusConfig.java b/src/main/java/com/pearadmin/common/config/MybatisPlusConfig.java new file mode 100644 index 0000000..e0067a8 --- /dev/null +++ b/src/main/java/com/pearadmin/common/config/MybatisPlusConfig.java @@ -0,0 +1,25 @@ +package com.pearadmin.common.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@MapperScan("com.pearadmin.modules.**.mapper") +public class MybatisPlusConfig { + + /** + * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; + } + + +} diff --git a/src/main/java/com/pearadmin/common/config/proprety/SwaggerProperty.java b/src/main/java/com/pearadmin/common/config/proprety/SwaggerProperty.java index 03ab5fa..11fb1c1 100644 --- a/src/main/java/com/pearadmin/common/config/proprety/SwaggerProperty.java +++ b/src/main/java/com/pearadmin/common/config/proprety/SwaggerProperty.java @@ -13,34 +13,54 @@ import springfox.documentation.service.Contact; @ConfigurationProperties("pear.swagger") public class SwaggerProperty { - /** 是 否 开 启 */ + /** + * 是 否 开 启 + */ private Boolean enable = true; - /** 分 组 名 称 */ + /** + * 分 组 名 称 + */ private String groupName; - /** 系 统 标 题 */ + /** + * 系 统 标 题 + */ private String title; - /** 描 述 信 息 */ + /** + * 描 述 信 息 + */ private String describe; - /** 版 本 信 息 */ + /** + * 版 本 信 息 + */ private String version; - /** 扫 描 路 径 */ + /** + * 扫 描 路 径 + */ private String scanPackage; - /** 扩 展 信 息 */ + /** + * 扩 展 信 息 + */ private Contact contact; - /** 协 议 */ + /** + * 协 议 + */ private String licence; - /** 协 议 链 接 */ + /** + * 协 议 链 接 + */ private String licenceUrl; - /** 组 织 链 接 */ + /** + * 组 织 链 接 + */ private String termsOfServiceUrl; } \ No newline at end of file diff --git a/src/main/java/com/pearadmin/common/constant/GenerateConstant.java b/src/main/java/com/pearadmin/common/constant/GenerateConstant.java index 63dd7e3..48ff314 100644 --- a/src/main/java/com/pearadmin/common/constant/GenerateConstant.java +++ b/src/main/java/com/pearadmin/common/constant/GenerateConstant.java @@ -7,106 +7,170 @@ package com.pearadmin.common.constant; */ public class GenerateConstant { - /** 单表（增删改查） */ + /** + * 单表（增删改查） + */ public static final String TPL_CRUD = "crud"; - /** 树表（增删改查） */ + /** + * 树表（增删改查） + */ public static final String TPL_TREE = "tree"; - /** 主子表（增删改查） */ + /** + * 主子表（增删改查） + */ public static final String TPL_SUB = "sub"; - /** 树编码字段 */ + /** + * 树编码字段 + */ public static final String TREE_CODE = "treeCode"; - /** 树父编码字段 */ + /** + * 树父编码字段 + */ public static final String TREE_PARENT_CODE = "treeParentCode"; - /** 树名称字段 */ + /** + * 树名称字段 + */ public static final String TREE_NAME = "treeName"; - /** 上级菜单ID字段 */ + /** + * 上级菜单ID字段 + */ public static final String PARENT_MENU_ID = "parentMenuId"; - /** 上级菜单名称字段 */ + /** + * 上级菜单名称字段 + */ public static final String PARENT_MENU_NAME = "parentMenuName"; - /** 数据库字符串类型 */ + /** + * 数据库字符串类型 + */ public static final String[] COLUMNTYPE_STR = {"char", "varchar", "nvarchar", "varchar2", "tinytext", "text", "mediumtext", "longtext"}; - /** 数据库时间类型 */ + /** + * 数据库时间类型 + */ public static final String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp"}; - /** 数据库布尔类型 */ + /** + * 数据库布尔类型 + */ public static final String[] COLUMNTYPE_BOOL = {"bit"}; - /** 数据库数字类型 */ + /** + * 数据库数字类型 + */ public static final String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "number", "integer", "bigint", "float", "float", "double", "decimal"}; - /** 页面不需要编辑字段 */ + /** + * 页面不需要编辑字段 + */ public static final String[] COLUMNNAME_NOT_EDIT = {"id", "create_by", "create_time", "del_flag"}; - /** 页面不需要显示的列表字段 */ + /** + * 页面不需要显示的列表字段 + */ public static final String[] COLUMNNAME_NOT_LIST = {"id", "create_by", "create_time", "del_flag", "update_by", "update_time"}; - /** 页面不需要查询字段 */ + /** + * 页面不需要查询字段 + */ public static final String[] COLUMNNAME_NOT_QUERY = {"id", "create_by", "create_time", "del_flag", "update_by", "update_time", "remark"}; - /** Entity基类字段 */ + /** + * Entity基类字段 + */ public static final String[] BASE_ENTITY = {"createBy", "createTime", "updateBy", "updateTime", "remark"}; - /** Tree基类字段 */ + /** + * Tree基类字段 + */ public static final String[] TREE_ENTITY = {"parentName", "parentId"}; - /** 文本框 */ + /** + * 文本框 + */ public static final String HTML_INPUT = "input"; - /** 文本域 */ + /** + * 文本域 + */ public static final String HTML_TEXTAREA = "textarea"; - /** 下拉框 */ + /** + * 下拉框 + */ public static final String HTML_SELECT = "select"; - /** 单选框 */ + /** + * 单选框 + */ public static final String HTML_RADIO = "radio"; - /** 复选框 */ + /** + * 复选框 + */ public static final String HTML_CHECKBOX = "checkbox"; - /** 日期控件 */ + /** + * 日期控件 + */ public static final String HTML_DATETIME = "datetime"; - /** 上传控件 */ + /** + * 上传控件 + */ public static final String HTML_UPLOAD = "upload"; - /** 字符串类型 */ + /** + * 字符串类型 + */ public static final String TYPE_STRING = "String"; - /** 整型 */ + /** + * 整型 + */ public static final String TYPE_INTEGER = "Integer"; - /** 长整型 */ + /** + * 长整型 + */ public static final String TYPE_LONG = "Long"; - /** 浮点型 */ + /** + * 浮点型 + */ public static final String TYPE_DOUBLE = "Double"; - /** 高精度计算类型 */ + /** + * 高精度计算类型 + */ public static final String TYPE_BIGDECIMAL = "BigDecimal"; - /** 时间类型 */ + /** + * 时间类型 + */ public static final String TYPE_DATE = "Date"; public static final String TYPE_BOOLEAN = "Boolean"; - /** 模糊查询 */ + /** + * 模糊查询 + */ public static final String QUERY_LIKE = "LIKE"; - /** 需要 */ + /** + * 需要 + */ public static final String REQUIRE = "1"; } diff --git a/src/main/java/com/pearadmin/common/plugin/submit/RepeatSubmitInterceptor.java b/src/main/java/com/pearadmin/common/plugin/submit/RepeatSubmitInterceptor.java index 84f255f..722b1d3 100644 --- a/src/main/java/com/pearadmin/common/plugin/submit/RepeatSubmitInterceptor.java +++ b/src/main/java/com/pearadmin/common/plugin/submit/RepeatSubmitInterceptor.java @@ -51,7 +51,6 @@ public abstract class RepeatSubmitInterceptor implements HandlerInterceptor { * * @param request * @return - * * @throws Exception */ public abstract boolean isRepeatSubmit(HttpServletRequest request); diff --git a/src/main/java/com/pearadmin/common/plugin/system/service/SystemService.java b/src/main/java/com/pearadmin/common/plugin/system/service/SystemService.java index b05f44d..5e03583 100644 --- a/src/main/java/com/pearadmin/common/plugin/system/service/SystemService.java +++ b/src/main/java/com/pearadmin/common/plugin/system/service/SystemService.java @@ -61,9 +61,9 @@ public interface SystemService { /** * 查询表字典 通过查询指定table的 text code 获取字典（指定查询条件） * - * @param table 表名 - * @param text label - * @param code value + * @param table 表名 + * @param text label + * @param code value * @param filterSql 条件 */ List queryTableDictItemsByCodeAndFilter(String table, String text, String code, String filterSql); diff --git a/src/main/java/com/pearadmin/common/tools/SequenceUtil.java b/src/main/java/com/pearadmin/common/tools/SequenceUtil.java index 50dad15..d8a4272 100644 --- a/src/main/java/com/pearadmin/common/tools/SequenceUtil.java +++ b/src/main/java/com/pearadmin/common/tools/SequenceUtil.java @@ -16,15 +16,25 @@ public class SequenceUtil { private static final long WORKER_ID = 0; /*** 数 据 中 心 */ private static final long CENTER_ID = 0; - /** 机 器 编 号 所 占 位 数 */ + /** + * 机 器 编 号 所 占 位 数 + */ private static final long WORKER_ID_BITS = 5L; - /** 数 据 标 识 所 占 位 数 */ + /** + * 数 据 标 识 所 占 位 数 + */ private static final long CENTER_ID_BITS = 5L; - /** 开 始 时 间 戳 */ + /** + * 开 始 时 间 戳 + */ private static final long POC = 1288834974657L; - /** 序 列 在 Id 中 所 占 的 位 数 */ + /** + * 序 列 在 Id 中 所 占 的 位 数 + */ private static final long SEQUENCE_BITS = 12L; - /** 为 算 法 提 供 可 用 配 置 */ + /** + * 为 算 法 提 供 可 用 配 置 + */ private static final long WORKER_ID_SHIFT = SEQUENCE_BITS; private static final long MAX_WORKER_ID = ~(-1L << WORKER_ID_BITS); private static final long MAX_CENTER_ID = ~(-1L << CENTER_ID_BITS); diff --git a/src/main/java/com/pearadmin/common/tools/SqlInjectionUtil.java b/src/main/java/com/pearadmin/common/tools/SqlInjectionUtil.java index 0fb9cd0..c45d38a 100644 --- a/src/main/java/com/pearadmin/common/tools/SqlInjectionUtil.java +++ b/src/main/java/com/pearadmin/common/tools/SqlInjectionUtil.java @@ -74,7 +74,6 @@ public class SqlInjectionUtil { /** * @param value sql语句 - * * @特殊方法(不通用) 仅用于字典条件SQL参数，注入过滤 */ @@ -86,7 +85,6 @@ public class SqlInjectionUtil { /** * @param value sql语句 - * * @特殊方法(不通用) 仅用于Online报表SQL解析，注入过滤 */ @Deprecated diff --git a/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java b/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java index 38d39dd..9a51233 100644 --- a/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java +++ b/src/main/java/com/pearadmin/common/tools/string/CharsetKit.java @@ -8,18 +8,30 @@ import java.nio.charset.StandardCharsets; * 字符集工具类 */ public class CharsetKit { - /** ISO-8859-1 */ + /** + * ISO-8859-1 + */ public static final String ISO_8859_1 = "ISO-8859-1"; - /** UTF-8 */ + /** + * UTF-8 + */ public static final String UTF_8 = "UTF-8"; - /** GBK */ + /** + * GBK + */ public static final String GBK = "GBK"; - /** ISO-8859-1 */ + /** + * ISO-8859-1 + */ public static final Charset CHARSET_ISO_8859_1 = StandardCharsets.ISO_8859_1; - /** UTF-8 */ + /** + * UTF-8 + */ public static final Charset CHARSET_UTF_8 = StandardCharsets.UTF_8; - /** GBK */ + /** + * GBK + */ public static final Charset CHARSET_GBK = Charset.forName(GBK); /** diff --git a/src/main/java/com/pearadmin/common/tools/string/StringUtil.java b/src/main/java/com/pearadmin/common/tools/string/StringUtil.java index 334f5e4..92c4ddf 100644 --- a/src/main/java/com/pearadmin/common/tools/string/StringUtil.java +++ b/src/main/java/com/pearadmin/common/tools/string/StringUtil.java @@ -10,10 +10,14 @@ import java.util.Map; * 字符串工具类 */ public class StringUtil extends org.apache.commons.lang3.StringUtils { - /** 空字符串 */ + /** + * 空字符串 + */ private static final String NULLSTR = ""; - /** 下划线 */ + /** + * 下划线 + */ private static final char SEPARATOR = '_'; /** diff --git a/src/main/java/com/pearadmin/common/web/base/BaseDomain.java b/src/main/java/com/pearadmin/common/web/base/BaseDomain.java index ee21e55..cd9c980 100644 --- a/src/main/java/com/pearadmin/common/web/base/BaseDomain.java +++ b/src/main/java/com/pearadmin/common/web/base/BaseDomain.java @@ -31,6 +31,7 @@ public class BaseDomain implements Serializable { /** * 创建人名称 */ + @TableField(exist = false) private String createName; /** @@ -48,6 +49,7 @@ public class BaseDomain implements Serializable { /** * 修改人名称 */ + @TableField(exist = false) private String updateName; /** @@ -58,5 +60,6 @@ public class BaseDomain implements Serializable { /** * 请求参数 */ + @TableField(exist = false) private Map params; } diff --git a/src/main/java/com/pearadmin/common/web/domain/response/module/ResultSelect.java b/src/main/java/com/pearadmin/common/web/domain/response/module/ResultSelect.java index 1460a5e..fd026f8 100644 --- a/src/main/java/com/pearadmin/common/web/domain/response/module/ResultSelect.java +++ b/src/main/java/com/pearadmin/common/web/domain/response/module/ResultSelect.java @@ -28,7 +28,8 @@ public class ResultSelect implements Serializable { */ private List s; - public ResultSelect() {} + public ResultSelect() { + } public ResultSelect(String v, String n) { this.v = v; diff --git a/src/main/java/com/pearadmin/modules/gen/domain/GenTable.java b/src/main/java/com/pearadmin/modules/gen/domain/GenTable.java index 9c8fa91..8809f3f 100644 --- a/src/main/java/com/pearadmin/modules/gen/domain/GenTable.java +++ b/src/main/java/com/pearadmin/modules/gen/domain/GenTable.java @@ -16,73 +16,119 @@ import java.util.List; @Alias("GenTable") public class GenTable extends BaseDomain { - /** 编号 */ + /** + * 编号 + */ private String tableId; - /** 表名称 */ + /** + * 表名称 + */ private String tableName; - /** 表描述 */ + /** + * 表描述 + */ private String tableComment; - /** 关联父表的表名 */ + /** + * 关联父表的表名 + */ private String subTableName; - /** 本表关联父表的外键名 */ + /** + * 本表关联父表的外键名 + */ private String subTableFkName; - /** 实体类名称(首字母大写) */ + /** + * 实体类名称(首字母大写) + */ private String className; - /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */ + /** + * 使用的模板（crud单表操作 tree树表操作 sub主子表操作） + */ private String tplCategory; - /** 生成包路径 */ + /** + * 生成包路径 + */ private String packageName; - /** 生成模块名 */ + /** + * 生成模块名 + */ private String moduleName; - /** 生成业务名 */ + /** + * 生成业务名 + */ private String businessName; - /** 生成功能名 */ + /** + * 生成功能名 + */ private String functionName; - /** 生成作者 */ + /** + * 生成作者 + */ private String functionAuthor; - /** 生成代码方式（0zip压缩包 1自定义路径） */ + /** + * 生成代码方式（0zip压缩包 1自定义路径） + */ private String genType; - /** 生成路径（不填默认项目路径） */ + /** + * 生成路径（不填默认项目路径） + */ private String genPath; - /** 主键信息 */ + /** + * 主键信息 + */ private GenTableColumn pkColumn; - /** 子表信息 */ + /** + * 子表信息 + */ private GenTable subTable; - /** 表列信息 */ + /** + * 表列信息 + */ private List columns; - /** 其它生成选项 */ + /** + * 其它生成选项 + */ private String options; - /** 树编码字段 */ + /** + * 树编码字段 + */ private String treeCode; - /** 树父编码字段 */ + /** + * 树父编码字段 + */ private String treeParentCode; - /** 树名称字段 */ + /** + * 树名称字段 + */ private String treeName; - /** 上级菜单ID字段 */ + /** + * 上级菜单ID字段 + */ private String parentMenuId; - /** 上级菜单名称字段 */ + /** + * 上级菜单名称字段 + */ private String parentMenuName; public static boolean isSub(String tplCategory) { diff --git a/src/main/java/com/pearadmin/modules/gen/domain/GenTableColumn.java b/src/main/java/com/pearadmin/modules/gen/domain/GenTableColumn.java index a7d3a3e..8000c23 100644 --- a/src/main/java/com/pearadmin/modules/gen/domain/GenTableColumn.java +++ b/src/main/java/com/pearadmin/modules/gen/domain/GenTableColumn.java @@ -13,58 +13,94 @@ import org.apache.ibatis.type.Alias; @Alias("GenTableColumn") public class GenTableColumn extends BaseDomain { - /** 编号 */ + /** + * 编号 + */ private String columnId; - /** 归属表编号 */ + /** + * 归属表编号 + */ private String tableId; - /** 列名称 */ + /** + * 列名称 + */ private String columnName; - /** 列描述 */ + /** + * 列描述 + */ private String columnComment; - /** 列类型 */ + /** + * 列类型 + */ private String columnType; - /** JAVA类型 */ + /** + * JAVA类型 + */ private String javaType; - /** JAVA字段名 */ + /** + * JAVA字段名 + */ private String javaField; - /** 是否主键（1是） */ + /** + * 是否主键（1是） + */ private String isPk; - /** 是否自增（1是） */ + /** + * 是否自增（1是） + */ private String isIncrement; - /** 是否必填（1是） */ + /** + * 是否必填（1是） + */ private String isRequired; - /** 是否为插入字段（1是） */ + /** + * 是否为插入字段（1是） + */ private String isInsert; - /** 是否编辑字段（1是） */ + /** + * 是否编辑字段（1是） + */ private String isEdit; - /** 是否列表字段（1是） */ + /** + * 是否列表字段（1是） + */ private String isList; - /** 是否查询字段（1是） */ + /** + * 是否查询字段（1是） + */ private String isQuery; - /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */ + /** + * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） + */ private String queryType; - /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件） */ + /** + * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、upload上传控件） + */ private String htmlType; - /** 字典类型 */ + /** + * 字典类型 + */ private String dictType; - /** 排序 */ + /** + * 排序 + */ private Integer sort; public static boolean isSuperColumn(String javaField) { diff --git a/src/main/java/com/pearadmin/modules/gen/mapper/GenTableColumnMapper.java b/src/main/java/com/pearadmin/modules/gen/mapper/GenTableColumnMapper.java index f364a6f..902df01 100644 --- a/src/main/java/com/pearadmin/modules/gen/mapper/GenTableColumnMapper.java +++ b/src/main/java/com/pearadmin/modules/gen/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.gen.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.gen.domain.GenTableColumn; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,8 +10,8 @@ import java.util.List; * Author: 就眠仪式 * CreateTime: 2019/10/23 */ -@Mapper -public interface GenTableColumnMapper { + +public interface GenTableColumnMapper extends BaseMapper { /** * 根据表名称查询列信息 * diff --git a/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java b/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java index 471ce16..b24332a 100644 --- a/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java +++ b/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.gen.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.gen.domain.GenTable; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,8 +10,8 @@ import java.util.List; * Author: 就眠仪式 * CreateTime: 2019/10/23 */ -@Mapper -public interface GenTableMapper { + +public interface GenTableMapper extends BaseMapper { /** * 查询业务列表 * diff --git a/src/main/java/com/pearadmin/modules/gen/service/IGenTableColumnService.java b/src/main/java/com/pearadmin/modules/gen/service/IGenTableColumnService.java index f3bbb01..34f8274 100644 --- a/src/main/java/com/pearadmin/modules/gen/service/IGenTableColumnService.java +++ b/src/main/java/com/pearadmin/modules/gen/service/IGenTableColumnService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.gen.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pearadmin.modules.gen.domain.GenTableColumn; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * Author: 就眠仪式 * CreateTime: 2019/10/23 */ -public interface IGenTableColumnService { +public interface IGenTableColumnService extends IService { /** * 查询业务字段列表 * diff --git a/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java b/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java index 0917d01..7f7afd8 100644 --- a/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java +++ b/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.gen.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pearadmin.modules.gen.domain.GenTable; import java.util.List; @@ -10,7 +11,7 @@ import java.util.Map; * Author: 就眠仪式 * CreateTime: 2019/10/23 */ -public interface IGenTableService { +public interface IGenTableService extends IService { /** * 查询业务列表 * diff --git a/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableColumnServiceImpl.java b/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableColumnServiceImpl.java index c46f50e..ad44f72 100644 --- a/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableColumnServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableColumnServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.gen.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.tools.string.Convert; import com.pearadmin.modules.gen.domain.GenTableColumn; import com.pearadmin.modules.gen.mapper.GenTableColumnMapper; @@ -15,7 +16,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class GenTableColumnServiceImpl implements IGenTableColumnService { +public class GenTableColumnServiceImpl extends ServiceImpl implements IGenTableColumnService { @Resource private GenTableColumnMapper genTableColumnMapper; diff --git a/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java b/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java index 7389904..7934870 100644 --- a/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java @@ -2,6 +2,7 @@ package com.pearadmin.modules.gen.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.constant.CommonConstant; import com.pearadmin.common.constant.GenerateConstant; import com.pearadmin.common.constant.SystemConstant; @@ -45,7 +46,7 @@ import java.util.zip.ZipOutputStream; * CreateTime: 2019/10/23 */ @Service -public class GenTableServiceImpl implements IGenTableService { +public class GenTableServiceImpl extends ServiceImpl implements IGenTableService { private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); @Resource diff --git a/src/main/java/com/pearadmin/modules/gen/tools/VelocityUtils.java b/src/main/java/com/pearadmin/modules/gen/tools/VelocityUtils.java index cd7a484..51c0319 100644 --- a/src/main/java/com/pearadmin/modules/gen/tools/VelocityUtils.java +++ b/src/main/java/com/pearadmin/modules/gen/tools/VelocityUtils.java @@ -19,10 +19,14 @@ import java.util.List; * CreateTime: 2019/10/23 */ public class VelocityUtils { - /** 项目空间路径 */ + /** + * 项目空间路径 + */ private static final String PROJECT_PATH = "main/java"; - /** html空间路径 */ + /** + * html空间路径 + */ private static final String TEMPLATES_PATH = "main/resources/templates"; /** diff --git a/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java b/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java index 8553524..fedbe7f 100644 --- a/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java +++ b/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java @@ -14,6 +14,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; + import javax.annotation.Resource; import java.time.LocalDateTime; diff --git a/src/main/java/com/pearadmin/modules/job/handler/ScheduleStarted.java b/src/main/java/com/pearadmin/modules/job/handler/ScheduleStarted.java index 3902366..255cff6 100644 --- a/src/main/java/com/pearadmin/modules/job/handler/ScheduleStarted.java +++ b/src/main/java/com/pearadmin/modules/job/handler/ScheduleStarted.java @@ -24,7 +24,7 @@ public class ScheduleStarted { @PostConstruct public void init() { - List scheduleJobList = scheduleJobMapper.selectList(null); + List scheduleJobList = scheduleJobMapper.selectList1(null); for (ScheduleJob scheduleJob : scheduleJobList) { CronTrigger cronTrigger = ScheduleHandler.getCronTrigger(scheduler, Long.parseLong(scheduleJob.getJobId())); if (cronTrigger == null) { diff --git a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java index f47926e..1a391cc 100644 --- a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java +++ b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.job.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.job.domain.ScheduleJob; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,22 +10,15 @@ import java.util.List; * Author: 就免仪式 * CreateTime: 2019/10/23 */ -@Mapper -public interface ScheduleJobMapper { - /** - * Describe: 定时任务入库 - * Param: ScheduleJob - * Return: Integer 影响条数 - */ - Integer insert(ScheduleJob scheduleJob); +public interface ScheduleJobMapper extends BaseMapper { /** * Describe: 根据条件查询定时任务列表 * Param: ScheduleJob * Return: ScheduleJob 列表 */ - List selectList(ScheduleJob param); + List selectList1(ScheduleJob param); /** * Describe: 根据 jobId 查询定时任务 @@ -34,13 +27,6 @@ public interface ScheduleJobMapper { */ ScheduleJob selectById(String jobId); - /** - * Describe: 根据 JobId 修改定时任务 - * Param: ScheduleJob - * Return: Integer 影响条数 - */ - Integer updateById(ScheduleJob scheduleJob); - /** * Describe: 根据 JobId 删除定时任务 * Param: ScheduleJob diff --git a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java index ab2aaa6..1711605 100644 --- a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java +++ b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.job.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.job.domain.ScheduleLog; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,15 +10,9 @@ import java.util.List; * Author: 就免仪式 * CreateTime: 2019/10/23 */ -@Mapper -public interface ScheduleLogMapper { - /** - * Describe: 插入定时任务日志 - * Param: ScheduleLogBean - * Return: Integer 影响条数 - */ - Integer insert(ScheduleLog scheduleLog); +public interface ScheduleLogMapper extends BaseMapper { + /** * Describe: 根据条件查询定时任务日志列表 diff --git a/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java b/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java index 2b62d08..79b44aa 100644 --- a/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java +++ b/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.job.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleJob; @@ -11,14 +12,14 @@ import java.util.List; * Author: 就免仪式 * CreateTime: 2019/10/23 */ -public interface IScheduleJobService { +public interface IScheduleJobService extends IService { /** * Describe: 新增定时任务 * Param: ScheduleJob * Return: Boolean 执行结果 */ - Boolean save(ScheduleJob scheduleJob); + boolean save(ScheduleJob scheduleJob); /** * Describe: 修改定时任务 diff --git a/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java b/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java index bdc12d5..38a8a67 100644 --- a/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java +++ b/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.job.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleLog; @@ -12,7 +13,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ -public interface IScheduleLogService { +public interface IScheduleLogService extends IService { /** * Describe: 定时任务日志入库 diff --git a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java index b61f462..3f2a066 100644 --- a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -1,11 +1,12 @@ package com.pearadmin.modules.job.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleJob; -import com.pearadmin.modules.job.mapper.ScheduleJobMapper; import com.pearadmin.modules.job.handler.ScheduleHandler; +import com.pearadmin.modules.job.mapper.ScheduleJobMapper; import com.pearadmin.modules.job.service.IScheduleJobService; import lombok.extern.slf4j.Slf4j; import org.quartz.Scheduler; @@ -22,7 +23,7 @@ import java.util.List; */ @Slf4j @Service -public class ScheduleJobServiceImpl implements IScheduleJobService { +public class ScheduleJobServiceImpl extends ServiceImpl implements IScheduleJobService { /** * 引 入 服 务 @@ -50,7 +51,7 @@ public class ScheduleJobServiceImpl implements IScheduleJobService { @Override public PageInfo page(ScheduleJob param, PageDomain pageDomain) { PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = scheduleJobMapper.selectList(param); + List list = scheduleJobMapper.selectList1(param); return new PageInfo<>(list); } @@ -61,7 +62,7 @@ public class ScheduleJobServiceImpl implements IScheduleJobService { */ @Override public List list(ScheduleJob param) { - return scheduleJobMapper.selectList(param); + return scheduleJobMapper.selectList1(param); } /** @@ -71,7 +72,7 @@ public class ScheduleJobServiceImpl implements IScheduleJobService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean save(ScheduleJob record) { + public boolean save(ScheduleJob record) { ScheduleHandler.createJob(scheduler, record); int result = scheduleJobMapper.insert(record); if (result > 0) { diff --git a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java index 8a08556..1273ced 100644 --- a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.job.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; @@ -19,7 +20,7 @@ import java.util.List; */ @Slf4j @Service("scheduleLogService") -public class ScheduleLogServiceImpl implements IScheduleLogService { +public class ScheduleLogServiceImpl extends ServiceImpl implements IScheduleLogService { @Resource private ScheduleLogMapper scheduleLogMapper; diff --git a/src/main/java/com/pearadmin/modules/pro/controller/ProEditorController.java b/src/main/java/com/pearadmin/modules/pro/controller/ProEditorController.java index 1e99d59..5e95dda 100644 --- a/src/main/java/com/pearadmin/modules/pro/controller/ProEditorController.java +++ b/src/main/java/com/pearadmin/modules/pro/controller/ProEditorController.java @@ -73,12 +73,12 @@ public class ProEditorController extends BaseController implements ModelDataJson * @param modelId 模型ID * @param name 流程模型名称 * @param description 流程描述 - * @param json_xml 流程文件 - * @param svg_xml 流程图片 + * @param json_xml 流程文件 + * @param svg_xml 流程图片 */ @RequestMapping(value = "/model/{modelId}/save", method = RequestMethod.PUT) @ResponseStatus(value = HttpStatus.OK) - public void saveModel(@PathVariable String modelId, String name, String description,String json_xml, String svg_xml) { + public void saveModel(@PathVariable String modelId, String name, String description, String json_xml, String svg_xml) { try { Model model = repositoryService.getModel(modelId); ObjectNode modelJson = (ObjectNode) objectMapper.readTree(model.getMetaInfo()); diff --git a/src/main/java/com/pearadmin/modules/sys/context/SystemServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/context/SystemServiceImpl.java index c0dd688..55b57e5 100644 --- a/src/main/java/com/pearadmin/modules/sys/context/SystemServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/context/SystemServiceImpl.java @@ -6,8 +6,6 @@ import com.pearadmin.modules.sys.domain.*; import com.pearadmin.modules.sys.mapper.*; import com.pearadmin.modules.sys.service.ISysDictDataService; import com.pearadmin.modules.sys.service.ISysLogService; -import com.pearadmin.modules.sys.domain.*; -import com.pearadmin.modules.sys.mapper.*; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java index 69981fc..6595138 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java @@ -5,8 +5,8 @@ import com.pearadmin.common.constant.CommonConstant; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.plugin.system.domain.SysBaseDict; import com.pearadmin.common.plugin.system.service.SystemService; -import com.pearadmin.common.tools.SqlInjectionUtil; import com.pearadmin.common.tools.SequenceUtil; +import com.pearadmin.common.tools.SqlInjectionUtil; import com.pearadmin.common.web.base.BaseController; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.common.web.domain.response.Result; diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java index f468c0c..1624fcf 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java @@ -107,7 +107,7 @@ public class SysNoticeController extends BaseController { @GetMapping("/add") @PreAuthorize("hasPermission('/system/notice/add','system:notice:add')") public ModelAndView add(Model model) { - model.addAttribute("users", sysUserService.list(null)); + model.addAttribute("users", sysUserService.list1(null)); return jumpPage(prefix + "/add"); } diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java index bed7dab..4aef927 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.plugin.logging.aop.annotation.Logging; import com.pearadmin.common.plugin.logging.aop.enums.BusinessType; @@ -8,6 +10,7 @@ import com.pearadmin.common.plugin.submit.annotation.RepeatSubmit; import com.pearadmin.common.tools.SecurityUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.ServletUtil; +import com.pearadmin.common.tools.string.StringUtil; import com.pearadmin.common.web.base.BaseController; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.common.web.domain.response.Result; @@ -87,8 +90,19 @@ public class SysUserController extends BaseController { @PreAuthorize("hasPermission('/system/user/data','sys:user:data')") @Logging(title = "查询用户", describe = "查询用户", type = BusinessType.QUERY) public ResultTable data(PageDomain pageDomain, SysUser param) { - PageInfo pageInfo = sysUserService.page(param, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + QueryWrapper wrapper = new QueryWrapper<>(); + if (StringUtil.isNotEmpty(param.getDeptId())) { + wrapper.eq("dept_id", param.getDeptId()); + } + if (StringUtil.isNotEmpty(param.getRealName())) { + wrapper.like("real_name", param.getRealName()); + } + if (StringUtil.isNotEmpty(param.getUsername())) { + wrapper.like("username", param.getUsername()); + } + IPage pageData = sysUserService.page(page, wrapper); + return pageTable(pageData.getRecords(), page.getTotal()); } /** @@ -100,7 +114,7 @@ public class SysUserController extends BaseController { @ApiOperation(value = "获取用户新增视图") @PreAuthorize("hasPermission('/system/user/add','sys:user:add')") public ModelAndView add(Model model) { - model.addAttribute("sysRoles", sysRoleService.list(null)); + model.addAttribute("sysRoles", sysRoleService.list1(null)); return jumpPage(MODULE_PATH + "add"); } diff --git a/src/main/java/com/pearadmin/modules/sys/domain/SysNotice.java b/src/main/java/com/pearadmin/modules/sys/domain/SysNotice.java index 4a0346e..3f400a1 100644 --- a/src/main/java/com/pearadmin/modules/sys/domain/SysNotice.java +++ b/src/main/java/com/pearadmin/modules/sys/domain/SysNotice.java @@ -11,28 +11,44 @@ import lombok.Data; */ @Data public class SysNotice extends BaseDomain { - /** 编号 */ + /** + * 编号 + */ private String id; - /** 标题 */ + /** + * 标题 + */ private String title; - /** 内容 */ + /** + * 内容 + */ private String content; - /** 发送人 */ + /** + * 发送人 + */ private String sender; - /** 发送人 */ + /** + * 发送人 + */ private String senderName; - /** 接收者 */ + /** + * 接收者 + */ private String accept; - /** 接收人 */ + /** + * 接收人 + */ private String acceptName; - /** 类型 */ + /** + * 类型 + */ private String type; } diff --git a/src/main/java/com/pearadmin/modules/sys/domain/SysUser.java b/src/main/java/com/pearadmin/modules/sys/domain/SysUser.java index 831b2df..3ce6850 100644 --- a/src/main/java/com/pearadmin/modules/sys/domain/SysUser.java +++ b/src/main/java/com/pearadmin/modules/sys/domain/SysUser.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.pearadmin.common.web.base.BaseDomain; -import lombok.Getter; -import lombok.Setter; +import lombok.Data; import org.apache.ibatis.type.Alias; import org.springframework.security.core.CredentialsContainer; import org.springframework.security.core.GrantedAuthority; @@ -17,8 +17,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Getter -@Setter +@Data @Alias("SysUser") public class SysUser extends BaseDomain implements UserDetails, CredentialsContainer { @@ -93,6 +92,7 @@ public class SysUser extends BaseDomain implements UserDetails, CredentialsConta /** * 计算列 */ + @TableField(exist = false) private String roleIds; @@ -104,6 +104,7 @@ public class SysUser extends BaseDomain implements UserDetails, CredentialsConta /** * 权限 这里暂时不用 security 的 Authorities */ + @TableField(exist = false) private List powerList; @Override diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java index 6f5edef..38988cb 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysConfig; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysConfigMapper { + +public interface SysConfigMapper extends BaseMapper { /** * Describe: 查询系统配置信息 @@ -21,13 +21,6 @@ public interface SysConfigMapper { */ List selectList(SysConfig param); - /** - * Describe: 添加系统配置 - * Param: SysConfig - * Return: 执行结果 - */ - Integer insert(SysConfig sysConfig); - /** * Describe: 根据 Id 查询系统配置 * Param: id @@ -42,13 +35,6 @@ public interface SysConfigMapper { */ SysConfig selectByCode(@Param("code") String code); - /** - * Describe: 根据 Id 修改系统配置 - * Param: SysConfig - * Return: Boolean - */ - Integer updateById(SysConfig sysConfig); - /** * Describe: 根据 Id 删除系统配置 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java index 83e4cd3..a71d166 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysDept; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysDeptMapper { + +public interface SysDeptMapper extends BaseMapper { /** * Describe: 查询部门列表 @@ -21,12 +21,6 @@ public interface SysDeptMapper { */ List selectList(SysDept param); - /** - * Describe: 添加部门数据 - * Param: SysDept - * Return: 执行结果 - */ - Integer insert(SysDept sysDept); /** * Describe: 根据 Id 查询部门 @@ -35,12 +29,6 @@ public interface SysDeptMapper { */ SysDept selectById(@Param("id") String id); - /** - * Describe: 根据 Id 修改部门 - * Param: SysDept - * Return: Integer - */ - Integer updateById(SysDept sysDept); /** * Describe: 根据 Id 删除部门 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java index df22ed9..7e0066a 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysDictData; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysDictDataMapper { + +public interface SysDictDataMapper extends BaseMapper { /** * 通过字典code获取字典数据 * @@ -28,12 +28,6 @@ public interface SysDictDataMapper { */ List selectList(SysDictData sysDictData); - /** - * Describe: 插入字典数据信息 - * Param: SysDictData - * Return: Integer - */ - Integer insert(SysDictData sysDictData); /** * Describe: 根据 Id 查询字典数据 @@ -42,13 +36,6 @@ public interface SysDictDataMapper { */ SysDictData selectById(String id); - /** - * Describe: 根据 Id 修改数据字典数据 - * Param: id - * Return: Boolean - */ - Integer updateById(SysDictData sysDictData); - /** * Describe: 根据 Id 删除字典数据 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java index 9c55489..77e349f 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysDictType; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,8 +10,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysDictTypeMapper { + +public interface SysDictTypeMapper extends BaseMapper { /** * Describe: 查询字典类型列表 @@ -27,20 +27,6 @@ public interface SysDictTypeMapper { */ SysDictType selectById(String id); - /** - * Describe: 插入字典类型 - * Param: SysDictType - * Return: Integer - */ - Integer insert(SysDictType sysDictType); - - /** - * Describe: 根据 Id 修改字典类型 - * Param: SysDictType - * Return: 执行结果 - */ - Integer updateById(SysDictType sysDictType); - /** * Describe: 根据 id 删除字典类型 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java index 7c6db55..3a102bb 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysFile; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysFileMapper { + +public interface SysFileMapper extends BaseMapper { /** * Describe: 插入文件信息 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java index 883365e..ce0e075 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.modules.sys.domain.SysLog; -import org.apache.ibatis.annotations.Mapper; import java.time.LocalDateTime; import java.util.List; @@ -12,8 +12,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysLogMapper { + +public interface SysLogMapper extends BaseMapper { /** * Describe: 插入日志信息 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java index 806462b..f786065 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysMail; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * Author: Heiky * CreateTime: 2021/1/13 14:51 */ -@Mapper -public interface SysMailMapper { + +public interface SysMailMapper extends BaseMapper { /** * 保存邮件 @@ -20,7 +20,7 @@ public interface SysMailMapper { * @param sysMail * @return integer */ - Integer insert(SysMail sysMail); + int insert(SysMail sysMail); /** * 根据条件查询邮件列表 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java index d28d1a9..463f4c0 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysNotice; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * @author jmys * @date 2021-03-13 */ -@Mapper -public interface SysNoticeMapper { + +public interface SysNoticeMapper extends BaseMapper { /** * 查询notice * diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysPowerMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysPowerMapper.java index 9d329d9..8bcd955 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysPowerMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysPowerMapper.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysMenu; import com.pearadmin.modules.sys.domain.SysPower; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,15 +12,15 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysPowerMapper { + +public interface SysPowerMapper extends BaseMapper { /** * Describe: 根据 SysPower 条件查询权限 * Param: SysPower * Return: SysPower */ - List selectList(SysPower sysPower); + List selectList1(SysPower sysPower); /** * Describe: 根据 SysPower 条件查询权限 @@ -34,7 +34,7 @@ public interface SysPowerMapper { * Param: SysPower * Return: SysPower */ - Integer insert(SysPower sysPower); + int insert(SysPower sysPower); /** * Describe: 根据 Id 查询权限 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java index e7b8c50..77a7be9 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysRole; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysRoleMapper { + +public interface SysRoleMapper extends BaseMapper { /** * Describe: 根据 username 查询用户权限 * Param: username @@ -25,14 +25,14 @@ public interface SysRoleMapper { * Param: SysRole * Return: List */ - List selectList(SysRole param); + List selectList1(SysRole param); /** * Describe: 添加角色数据 * Param: SysRole * Return: 执行结果 */ - Integer insert(SysRole sysRole); + int insert(SysRole sysRole); /** * Describe: 根据 Id 查询角色 @@ -46,7 +46,7 @@ public interface SysRoleMapper { * Param: SysRole * Return: Integer */ - Integer updateById(SysRole sysRole); + int updateById(SysRole sysRole); /** * Describe: 根据 Id 删除用户 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysRolePowerMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysRolePowerMapper.java index c144a86..2f0bad0 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysRolePowerMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysRolePowerMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysRolePower; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,8 +10,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysRolePowerMapper { + +public interface SysRolePowerMapper extends BaseMapper { List selectByRoleId(String roleId); diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysUserMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysUserMapper.java index 120e99a..5279260 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysUserMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysUserMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysUser; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +11,10 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysUserMapper { + +public interface SysUserMapper extends BaseMapper { + + int updateById1(SysUser user); /** * Describe: 根据 username 查询用户 @@ -42,20 +44,6 @@ public interface SysUserMapper { */ Integer count(SysUser sysUser); - /** - * Describe: 添加用户数据 - * Param: username - * Return: Integer - */ - Integer insert(SysUser sysUser); - - /** - * Describe: 根据 Id 修改用户 - * Param: username - * Return: Integer - */ - Integer updateById(SysUser sysUser); - /** * Describe: 根据 Id 删除用户 * Param: username diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysUserRoleMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysUserRoleMapper.java index 6b2ac5e..42f7ee5 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pearadmin.modules.sys.domain.SysUserRole; -import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -10,8 +10,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysUserRoleMapper { + +public interface SysUserRoleMapper extends BaseMapper { int batchInsert(List sysUserRoles); diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java index 1dba4a5..7bb19fc 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysConfig; @@ -12,7 +13,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ -public interface ISysConfigService { +public interface ISysConfigService extends IService { /** * Describe: 根据条件查询系统配置列表数据 @@ -47,14 +48,14 @@ public interface ISysConfigService { * Param: SysConfig * Return: List */ - Boolean save(SysConfig sysConfig); + boolean save(SysConfig sysConfig); /** * Describe: 修改 SysConfig 数据 * Param: SysConfig * Return: Boolean */ - Boolean updateById(SysConfig sysConfig); + boolean updateById(SysConfig sysConfig); /** * Describe: 删除 SysConfig 数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java index 6e88881..5b3b5e9 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDept; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysDeptService { +public interface ISysDeptService extends IService { /** * Describe: 查询部门数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java index d2ad832..427c42e 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDictData; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysDictDataService { +public interface ISysDictDataService extends IService { /** * Describe: 根据条件查询字典类型列表数据 @@ -47,7 +48,7 @@ public interface ISysDictDataService { * Param: SysDictData * Return: Boolean */ - Boolean save(SysDictData sysDictData); + boolean save(SysDictData sysDictData); /** * Describe: 根据 Id 查询字典类型 @@ -68,5 +69,5 @@ public interface ISysDictDataService { * Param: SysDictData * Return: Boolean */ - Boolean updateById(SysDictData sysDictData); + boolean updateById(SysDictData sysDictData); } diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java index 4396988..8b547f4 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDictType; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysDictTypeService { +public interface ISysDictTypeService extends IService { /** * Describe: 根据条件查询字典类型列表数据 @@ -39,14 +40,14 @@ public interface ISysDictTypeService { * Param: SysDictType * Return: List */ - Boolean save(SysDictType sysDictType); + boolean save(SysDictType sysDictType); /** * Describe: 修改 SysDictType 数据 * Param: SysDictType * Return: Boolean */ - Boolean updateById(SysDictType sysDictType); + boolean updateById(SysDictType sysDictType); /** * Describe: 删除 SysDictType 数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java index 0ff4ec9..d2f2b74 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pearadmin.modules.sys.domain.SysFile; import org.springframework.web.multipart.MultipartFile; @@ -10,7 +11,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysFileService { +public interface ISysFileService extends IService { /** * 文 件 上 传 服 务 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java index 1b8d5d6..8e533a7 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.modules.sys.domain.SysLog; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysLogService { +public interface ISysLogService extends IService { /** * Describe: 执 行 插 入 操 作 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java index 6a8f84e..1ae8fff 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysMail; @@ -12,14 +13,14 @@ import java.util.List; * Author: Heiky * CreateTime: 2021/1/13 15:21 */ -public interface ISysMailService { +public interface ISysMailService extends IService { /** * Describe: 邮件保存 * Param: sysMail * Return: 操作结果 */ - Integer save(SysMail sysMail); + boolean save(SysMail sysMail); /** * Describe: 根据条件查询邮件列表数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java index a8d5c68..3c206e4 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysNotice; @@ -12,7 +13,7 @@ import java.util.List; * @author jmys * @date 2021-03-13 */ -public interface ISysNoticeService { +public interface ISysNoticeService extends IService { /** * 查询notice * diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysPowerService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysPowerService.java index 051bdf2..dafda71 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysPowerService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysPowerService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.pearadmin.modules.sys.domain.SysPower; import java.util.List; @@ -9,7 +10,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysPowerService { +public interface ISysPowerService extends IService { /** * Describe: 根据条件查询权限列表数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java index dec5daf..e8025c2 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysPower; @@ -12,14 +13,14 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysRoleService { +public interface ISysRoleService extends IService { /** * Describe: 查询角色数据 * Param: queryRoleParam * Return: 操作结果 */ - List list(SysRole queryRoleParam); + List list1(SysRole queryRoleParam); /** * Describe: 分页查询角色数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java index 5ce22f1..c8eeb25 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysMenu; @@ -13,14 +14,14 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysUserService { +public interface ISysUserService extends IService { /** * Describe: 根据条件查询用户列表数据 * Param: username * Return: 返回用户列表数据 */ - List list(SysUser param); + List list1(SysUser param); /** * Describe: 根据条件查询用户列表数据 分页 diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java index 9fd7fb1..c1981d8 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; @@ -17,7 +18,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysConfigServiceImpl implements ISysConfigService { +public class SysConfigServiceImpl extends ServiceImpl implements ISysConfigService { /** * 系统配置数据库操作接口 @@ -53,7 +54,7 @@ public class SysConfigServiceImpl implements ISysConfigService { * Return: Boolean */ @Override - public Boolean save(SysConfig sysConfig) { + public boolean save(SysConfig sysConfig) { Integer result = sysConfigMapper.insert(sysConfig); return result > 0; } @@ -84,7 +85,7 @@ public class SysConfigServiceImpl implements ISysConfigService { * Return: Boolean */ @Override - public Boolean updateById(SysConfig sysConfig) { + public boolean updateById(SysConfig sysConfig) { int result = sysConfigMapper.updateById(sysConfig); return result > 0; } diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java index eea6a31..12e06c7 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; @@ -14,7 +15,7 @@ import javax.annotation.Resource; import java.util.List; @Service -public class SysDeptServiceImpl implements ISysDeptService { +public class SysDeptServiceImpl extends ServiceImpl implements ISysDeptService { @Resource private SysDeptMapper sysDeptMapper; diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java index f720678..4314af0 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.cache.CacheBuilder; @@ -24,7 +25,7 @@ import java.util.concurrent.TimeUnit; * CreateTime: 2019/10/23 */ @Service -public class SysDictDataServiceImpl implements ISysDictDataService { +public class SysDictDataServiceImpl extends ServiceImpl implements ISysDictDataService { public static LoadingCache> loadingCacheSysDictData = CacheBuilder.newBuilder().maximumSize(100).expireAfterWrite(600, TimeUnit.SECONDS).build(new CacheLoader>() { @Override @@ -69,7 +70,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { } @Override - public Boolean save(SysDictData sysDictData) { + public boolean save(SysDictData sysDictData) { Integer result = sysDictDataMapper.insert(sysDictData); if (result > 0) { refreshCacheTypeCode(sysDictData.getTypeCode()); @@ -85,7 +86,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { } @Override - public Boolean updateById(SysDictData sysDictData) { + public boolean updateById(SysDictData sysDictData) { int result = sysDictDataMapper.updateById(sysDictData); if (result > 0) { refreshCacheTypeCode(sysDictData.getTypeCode()); diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java index 5942e9f..f6e5065 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; @@ -19,7 +20,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysDictTypeServiceImpl implements ISysDictTypeService { +public class SysDictTypeServiceImpl extends ServiceImpl implements ISysDictTypeService { @Resource private SysDictTypeMapper sysDictTypeMapper; @@ -58,7 +59,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { * Return: Boolean */ @Override - public Boolean save(SysDictType sysDictType) { + public boolean save(SysDictType sysDictType) { Integer result = sysDictTypeMapper.insert(sysDictType); if (result > 0) { iSysDictDataService.refreshCacheTypeCode(sysDictType.getTypeCode()); @@ -84,7 +85,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { * Return: Boolean */ @Override - public Boolean updateById(SysDictType sysDictType) { + public boolean updateById(SysDictType sysDictType) { int result = sysDictTypeMapper.updateById(sysDictType); SysDictType dictType = sysDictTypeMapper.selectById(sysDictType.getId()); if (result > 0) { diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java index 11b7397..4184c8b 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java @@ -1,9 +1,10 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.config.proprety.TemplateProperty; -import com.pearadmin.common.tools.upload.FTPUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.ServletUtil; +import com.pearadmin.common.tools.upload.FTPUtil; import com.pearadmin.modules.sys.domain.SysFile; import com.pearadmin.modules.sys.mapper.SysFileMapper; import com.pearadmin.modules.sys.service.ISysFileService; @@ -20,7 +21,7 @@ import java.util.List; @Slf4j @Service("SysFileFTPServiceImpl") -public class SysFileFTPServiceImpl implements ISysFileService { +public class SysFileFTPServiceImpl extends ServiceImpl implements ISysFileService { /** * 引 入 服 务 diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java index 1beb457..01cd1c1 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java @@ -1,10 +1,11 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.config.proprety.TemplateProperty; import com.pearadmin.common.constant.SystemConstant; -import com.pearadmin.common.tools.upload.FileUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.ServletUtil; +import com.pearadmin.common.tools.upload.FileUtil; import com.pearadmin.modules.sys.domain.SysFile; import com.pearadmin.modules.sys.mapper.SysFileMapper; import com.pearadmin.modules.sys.service.ISysFileService; @@ -29,7 +30,7 @@ import java.util.List; */ @Slf4j @Service("SysFileServiceImpl") -public class SysFileServiceImpl implements ISysFileService { +public class SysFileServiceImpl extends ServiceImpl implements ISysFileService { /** * 引 入 服 务 diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java index 404b4b7..e97a849 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.common.plugin.logging.aop.enums.RequestMethod; import com.pearadmin.common.tools.SecurityUtil; @@ -19,7 +20,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysLogServiceImpl implements ISysLogService { +public class SysLogServiceImpl extends ServiceImpl implements ISysLogService { @Resource private SysLogMapper sysLogMapper; diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java index 475c00c..9b7d5bd 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.tools.SecurityUtil; @@ -22,7 +23,7 @@ import java.util.ArrayList; import java.util.List; @Service -public class SysMailServiceImpl implements ISysMailService { +public class SysMailServiceImpl extends ServiceImpl implements ISysMailService { @Resource private SysMailMapper sysMailMapper; @@ -32,13 +33,14 @@ public class SysMailServiceImpl implements ISysMailService { @Override @Transactional(rollbackFor = Exception.class) - public Integer save(SysMail sysMail) { + public boolean save(SysMail sysMail) { if (sendMail(sysMail)) { sysMail.setMailId(SequenceUtil.makeStringId()); sysMail.setCreateBy(((SysUser) SecurityUtil.currentUserObj()).getUsername()); - return sysMailMapper.insert(sysMail); + sysMailMapper.insert(sysMail); + return true; } else { - return 0; + return false; } } diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java index 665f58f..6714390 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; @@ -19,7 +20,7 @@ import java.util.List; * @date 2021-03-13 */ @Service -public class SysNoticeServiceImpl implements ISysNoticeService { +public class SysNoticeServiceImpl extends ServiceImpl implements ISysNoticeService { @Autowired private SysNoticeMapper sysNoticeMapper; diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysPowerServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysPowerServiceImpl.java index 1d686e0..fd67adb 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysPowerServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysPowerServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.modules.sys.domain.SysPower; import com.pearadmin.modules.sys.mapper.SysPowerMapper; import com.pearadmin.modules.sys.mapper.SysRolePowerMapper; @@ -17,7 +18,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysPowerServiceImpl implements ISysPowerService { +public class SysPowerServiceImpl extends ServiceImpl implements ISysPowerService { /** * 引入服务 @@ -38,7 +39,7 @@ public class SysPowerServiceImpl implements ISysPowerService { */ @Override public List list(SysPower sysPower) { - return sysPowerMapper.selectList(sysPower); + return sysPowerMapper.selectList1(sysPower); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java index ea9ef21..192cd5d 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.tools.SequenceUtil; @@ -26,7 +27,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysRoleServiceImpl implements ISysRoleService { +public class SysRoleServiceImpl extends ServiceImpl implements ISysRoleService { /** * 注入角色服务 @@ -59,8 +60,8 @@ public class SysRoleServiceImpl implements ISysRoleService { * Return: 操作结果 */ @Override - public List list(SysRole param) { - return sysRoleMapper.selectList(param); + public List list1(SysRole param) { + return sysRoleMapper.selectList1(param); } /** @@ -71,7 +72,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override public PageInfo page(SysRole param, PageDomain pageDomain) { PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysRoleMapper.selectList(param); + List list = sysRoleMapper.selectList1(param); return new PageInfo<>(list); } @@ -114,7 +115,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public List getRolePower(String roleId) { - List allPower = sysPowerMapper.selectList(null); + List allPower = sysPowerMapper.selectList1(null); List myPower = sysRolePowerMapper.selectByRoleId(roleId); allPower.forEach(sysPower -> myPower.forEach(sysRolePower -> { if (sysRolePower.getPowerId().equals(sysPower.getPowerId())) { diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java index 3fc8e31..9bb8d4d 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,19 +1,20 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.pearadmin.common.config.proprety.SecurityProperty; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.domain.request.PageDomain; +import com.pearadmin.modules.sys.domain.SysMenu; import com.pearadmin.modules.sys.domain.SysRole; import com.pearadmin.modules.sys.domain.SysUser; +import com.pearadmin.modules.sys.domain.SysUserRole; import com.pearadmin.modules.sys.mapper.SysPowerMapper; import com.pearadmin.modules.sys.mapper.SysRoleMapper; import com.pearadmin.modules.sys.mapper.SysUserMapper; import com.pearadmin.modules.sys.mapper.SysUserRoleMapper; import com.pearadmin.modules.sys.service.ISysUserService; -import com.pearadmin.modules.sys.domain.SysMenu; -import com.pearadmin.modules.sys.domain.SysUserRole; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +28,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysUserServiceImpl implements ISysUserService { +public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { /** * 注入用户服务 @@ -65,7 +66,7 @@ public class SysUserServiceImpl implements ISysUserService { * Return: 返回用户列表数据 */ @Override - public List list(SysUser param) { + public List list1(SysUser param) { return sysUserMapper.selectList(param); } @@ -140,7 +141,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public boolean update(SysUser sysUser) { - Integer result = sysUserMapper.updateById(sysUser); + Integer result = sysUserMapper.updateById1(sysUser); return result > 0; } @@ -171,7 +172,7 @@ public class SysUserServiceImpl implements ISysUserService { */ @Override public List getUserRole(String userId) { - List allRole = sysRoleMapper.selectList(null); + List allRole = sysRoleMapper.selectList1(null); List myRole = sysUserRoleMapper.selectByUserId(userId); allRole.forEach(sysRole -> { myRole.forEach(sysUserRole -> { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d96803a..7acfd61 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -102,10 +102,11 @@ logging: # Mybatis 配 置 mybatis-plus: # 配 置 扫 描 - mapper-locations: classpath*:**/xml/**.xml + mapper-locations: classpath*:mapper/*Mapper.xml # 别 名 扫 描 - type-aliases-package: com.pearadmin + type-aliases-package: com.pearadmin.modules.**.mapper ## 日志打印 configuration: ## 日志实现 - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + map-underscore-to-camel-case: true \ No newline at end of file diff --git a/src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableColumnMapper.xml b/src/main/resources/mapper/GenTableColumnMapper.xml similarity index 93% rename from src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableColumnMapper.xml rename to src/main/resources/mapper/GenTableColumnMapper.xml index 28a231e..dba2f42 100644 --- a/src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableColumnMapper.xml +++ b/src/main/resources/mapper/GenTableColumnMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -55,7 +55,8 @@ from gen_table_column - where table_id = #{tableId} order by sort @@ -75,7 +76,8 @@ order by ordinal_position - + insert into gen_table_column ( column_id, table_id, @@ -121,7 +123,7 @@ ) - + update gen_table_column column_comment = #{columnComment}, diff --git a/src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableMapper.xml b/src/main/resources/mapper/GenTableMapper.xml similarity index 95% rename from src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableMapper.xml rename to src/main/resources/mapper/GenTableMapper.xml index 22ac32e..8bdb08f 100644 --- a/src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableMapper.xml +++ b/src/main/resources/mapper/GenTableMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ - + @@ -83,7 +83,8 @@ from gen_table - @@ -95,7 +96,7 @@ - select table_name, table_comment, create_time, update_time from information_schema.tables where table_schema = (select database()) AND table_name NOT LIKE 'qrtz_%' AND table_name NOT LIKE 'gen_%' @@ -255,7 +256,8 @@ order by c.sort - + insert into gen_table ( table_id, table_name, @@ -291,7 +293,7 @@ ) - + update gen_table table_name = #{tableName}, diff --git a/src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleJobMapper.xml b/src/main/resources/mapper/ScheduleJobMapper.xml similarity index 92% rename from src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleJobMapper.xml rename to src/main/resources/mapper/ScheduleJobMapper.xml index 90b6ce5..2f86efd 100644 --- a/src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleJobMapper.xml +++ b/src/main/resources/mapper/ScheduleJobMapper.xml @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - select * from schedule_job @@ -32,7 +32,7 @@ - + insert into schedule_job @@ -89,7 +89,7 @@ - + update schedule_job diff --git a/src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleLogMapper.xml b/src/main/resources/mapper/ScheduleLogMapper.xml similarity index 90% rename from src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleLogMapper.xml rename to src/main/resources/mapper/ScheduleLogMapper.xml index 577388c..a299f95 100644 --- a/src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleLogMapper.xml +++ b/src/main/resources/mapper/ScheduleLogMapper.xml @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - select a.log_id,a.job_id,a.bean_name,a.params,a.error,a.status,a.create_time,a.times,b.job_name as jobName from schedule_log a left join schedule_job b on a.job_id = b.job_id @@ -28,7 +28,7 @@ - + insert into schedule_log diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysConfigMapper.xml b/src/main/resources/mapper/SysConfigMapper.xml similarity index 94% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysConfigMapper.xml rename to src/main/resources/mapper/SysConfigMapper.xml index a744cc5..30b9f9f 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysConfigMapper.xml +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + @@ -43,7 +43,7 @@ - + insert into sys_config @@ -88,7 +88,7 @@ - + update sys_config diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDeptMapper.xml b/src/main/resources/mapper/SysDeptMapper.xml similarity index 94% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDeptMapper.xml rename to src/main/resources/mapper/SysDeptMapper.xml index 7fe47fb..da8ef51 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDeptMapper.xml +++ b/src/main/resources/mapper/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + @@ -40,7 +40,7 @@ where parent_id = #{parentId} - + insert into sys_dept @@ -102,7 +102,7 @@ - + update sys_dept diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictDataMapper.xml b/src/main/resources/mapper/SysDictDataMapper.xml similarity index 92% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictDataMapper.xml rename to src/main/resources/mapper/SysDictDataMapper.xml index 9229d42..98a16b2 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictDataMapper.xml +++ b/src/main/resources/mapper/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - select * from sys_dict_data @@ -58,7 +58,7 @@ - + insert into sys_dict_data @@ -108,7 +108,7 @@ - + update sys_dict_data diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictTypeMapper.xml b/src/main/resources/mapper/SysDictTypeMapper.xml similarity index 91% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictTypeMapper.xml rename to src/main/resources/mapper/SysDictTypeMapper.xml index 9ece5b8..f76b5a2 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictTypeMapper.xml +++ b/src/main/resources/mapper/SysDictTypeMapper.xml @@ -3,7 +3,7 @@ - + @@ -17,7 +17,7 @@ - select * from sys_dict_type @@ -34,7 +34,7 @@ - + insert into sys_dict_type @@ -102,7 +102,7 @@ - + update sys_dict_type diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysFileMapper.xml b/src/main/resources/mapper/SysFileMapper.xml similarity index 100% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysFileMapper.xml rename to src/main/resources/mapper/SysFileMapper.xml diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml similarity index 84% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysLogMapper.xml rename to src/main/resources/mapper/SysLogMapper.xml index f7698a7..b151064 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysLogMapper.xml +++ b/src/main/resources/mapper/SysLogMapper.xml @@ -2,7 +2,7 @@ - select id as id, title as title, @@ -33,25 +33,25 @@ order by create_time desc - + select id, + title, + method, + business_type, + request_method, + operate_name, + operate_url, + operate_address, + request_param, + response_body, + success, + error_msg, + create_time, + description, + request_body, + logging_type, + browser, + system_os from sys_logging where logging_type = "LOGIN" and operate_name = #{operateName} @@ -59,7 +59,7 @@ limit 1,11 - + insert into sys_logging @@ -175,7 +175,7 @@ - select id as id, title as title, diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysMailMapper.xml b/src/main/resources/mapper/SysMailMapper.xml similarity index 100% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysMailMapper.xml rename to src/main/resources/mapper/SysMailMapper.xml diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysNoticeMapper.xml b/src/main/resources/mapper/SysNoticeMapper.xml similarity index 100% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysNoticeMapper.xml rename to src/main/resources/mapper/SysNoticeMapper.xml diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysPowerMapper.xml b/src/main/resources/mapper/SysPowerMapper.xml similarity index 94% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysPowerMapper.xml rename to src/main/resources/mapper/SysPowerMapper.xml index 1dbc52a..2319676 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysPowerMapper.xml +++ b/src/main/resources/mapper/SysPowerMapper.xml @@ -2,7 +2,7 @@ - + @@ -39,7 +39,7 @@ - select * from sys_power @@ -74,7 +74,7 @@ ORDER BY sp.sort ASC - + insert into sys_power @@ -143,7 +143,7 @@ - + update sys_power diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRoleMapper.xml b/src/main/resources/mapper/SysRoleMapper.xml similarity index 93% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRoleMapper.xml rename to src/main/resources/mapper/SysRoleMapper.xml index d43d751..be4ef96 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRoleMapper.xml +++ b/src/main/resources/mapper/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,7 @@ - select * from sys_role @@ -48,7 +48,7 @@ - + insert into sys_role @@ -93,7 +93,7 @@ - + update sys_role diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRolePowerMapper.xml b/src/main/resources/mapper/SysRolePowerMapper.xml similarity index 95% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRolePowerMapper.xml rename to src/main/resources/mapper/SysRolePowerMapper.xml index bbb0b61..d0a6117 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRolePowerMapper.xml +++ b/src/main/resources/mapper/SysRolePowerMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml similarity index 96% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserMapper.xml rename to src/main/resources/mapper/SysUserMapper.xml index 31bbf61..4f0a827 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -2,7 +2,7 @@ - + @@ -88,7 +88,7 @@ - + insert into sys_user @@ -175,7 +175,7 @@ - + update sys_user diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserRoleMapper.xml b/src/main/resources/mapper/SysUserRoleMapper.xml similarity index 95% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserRoleMapper.xml rename to src/main/resources/mapper/SysUserRoleMapper.xml index 0a9cc6a..211be45 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserRoleMapper.xml +++ b/src/main/resources/mapper/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + -- Gitee From 02cca1e0b7ae6d2c74b3020ea9f3c9c3ca2a6f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Wed, 7 Dec 2022 16:21:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=8D=A2=E4=B8=BAhutool-all=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E9=AA=8C=E8=AF=81=E7=A0=81=E5=B7=A5=E5=85=B7=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4easy-captcha=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ----- .../secure/support/SecureCaptchaSupport.java | 6 ++-- .../sys/controller/SysCaptchaController.java | 33 +++++++++---------- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index a4f69f3..24640ab 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,6 @@ 1.3.0 3.5.0 - - 1.6.2 6.0.0 @@ -174,12 +172,6 @@ mybatis-plus-generator ${generator.version} - - - com.github.whvcse - easy-captcha - ${captcha.version} - org.activiti diff --git a/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java b/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java index 8e5532a..fc2d53f 100644 --- a/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java +++ b/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.pearadmin.common.tools.ServletUtil; import com.pearadmin.common.tools.string.StringUtil; import com.pearadmin.common.web.domain.response.Result; -import com.wf.captcha.utils.CaptchaUtil; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; @@ -33,13 +32,16 @@ public class SecureCaptchaSupport extends OncePerRequestFilter implements Filter @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { if (method.equalsIgnoreCase(request.getMethod()) && defaultFilterProcessUrl.equals(request.getServletPath())) { + // 登陆界面输入的验证码 String captcha = ServletUtil.getRequest().getParameter("captcha"); response.setContentType("application/json;charset=UTF-8"); if (StringUtil.isEmpty(captcha)) { response.getWriter().write(JSON.toJSONString(Result.failure("验证码不能为空!"))); return; } - if (!CaptchaUtil.ver(ServletUtil.getRequest().getParameter("captcha"), ServletUtil.getRequest())) { + // 存在Session中的验证码code + String captchaVerify = request.getSession().getAttribute("captcha").toString(); + if (!captcha.trim().toLowerCase().equals(captchaVerify.trim().toLowerCase())) { response.getWriter().write(JSON.toJSONString(Result.failure("验证码错误!"))); return; } diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysCaptchaController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysCaptchaController.java index 7dccd5c..d170729 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysCaptchaController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysCaptchaController.java @@ -1,14 +1,15 @@ package com.pearadmin.modules.sys.controller; +import cn.hutool.captcha.CaptchaUtil; +import cn.hutool.captcha.LineCaptcha; import com.pearadmin.common.web.base.BaseController; -import com.pearadmin.common.web.domain.response.Result; -import com.wf.captcha.utils.CaptchaUtil; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; /** * Describe: 验证码控制器 @@ -27,22 +28,18 @@ public class SysCaptchaController extends BaseController { * @param response 响应报文 */ @RequestMapping("generate") - public void generate(HttpServletRequest request, HttpServletResponse response) throws Exception { - CaptchaUtil.out(request, response); - } + public void getCaptcha(HttpServletRequest request, HttpServletResponse response) throws IOException { + // LineCaptcha 线段干扰的验证码 + // CircleCaptcha 圆圈干扰验证码 + // ShearCaptcha 扭曲干扰验证码 - /** - * 异步验证 - * - * @param request 请求报文 - * @param captcha 验证码 - * @return 验证结果 - */ - @RequestMapping("verify") - public Result verify(HttpServletRequest request, String captcha) { - if (CaptchaUtil.ver(captcha, request)) { - return success("验证成功"); - } - return failure("验证失败"); + // 定义图形验证码的长和宽 + LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(260, 100); + // 生成code + lineCaptcha.createCode(); + String code = lineCaptcha.getCode(); + request.getSession().setAttribute("captcha", code); + lineCaptcha.verify(code); + lineCaptcha.write(response.getOutputStream()); } } -- Gitee From a055e4df684459805f4b0ce700e3dad63e4d3e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=93=B2=E8=B4=A4?= <1037512352@qq.com> Date: Fri, 9 Dec 2022 15:50:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B0=86=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=94=B9=E4=B8=BAMyBatisPlus=E7=9A=84=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 38 ++++++++++++------- .../secure/support/SecureCaptchaSupport.java | 2 +- .../modules/gen/controller/GenController.java | 15 +++----- .../modules/gen/mapper/GenTableMapper.java | 7 ++++ .../modules/gen/service/IGenTableService.java | 6 +++ .../gen/service/impl/GenTableServiceImpl.java | 15 ++++++++ .../job/controller/ScheduleJobController.java | 6 +-- .../job/controller/ScheduleLogController.java | 6 +-- .../modules/job/mapper/ScheduleJobMapper.java | 5 +++ .../modules/job/mapper/ScheduleLogMapper.java | 5 +++ .../job/service/IScheduleJobService.java | 4 +- .../job/service/IScheduleLogService.java | 4 +- .../service/impl/ScheduleJobServiceImpl.java | 11 +++--- .../service/impl/ScheduleLogServiceImpl.java | 11 +++--- .../sys/controller/SysConfigController.java | 6 +-- .../sys/controller/SysDictDataController.java | 6 +-- .../sys/controller/SysDictTypeController.java | 6 +-- .../sys/controller/SysFileController.java | 10 ++--- .../sys/controller/SysLogController.java | 16 ++++---- .../sys/controller/SysMailController.java | 6 +-- .../sys/controller/SysNoticeController.java | 6 +-- .../sys/controller/SysRoleController.java | 6 +-- .../sys/controller/SysUserController.java | 18 +-------- .../modules/sys/mapper/SysConfigMapper.java | 4 ++ .../modules/sys/mapper/SysDeptMapper.java | 4 ++ .../modules/sys/mapper/SysDictDataMapper.java | 4 ++ .../modules/sys/mapper/SysDictTypeMapper.java | 5 +++ .../modules/sys/mapper/SysFileMapper.java | 4 ++ .../modules/sys/mapper/SysLogMapper.java | 3 ++ .../modules/sys/mapper/SysMailMapper.java | 4 ++ .../modules/sys/mapper/SysNoticeMapper.java | 6 +++ .../modules/sys/mapper/SysRoleMapper.java | 5 +++ .../sys/service/ISysConfigService.java | 4 +- .../modules/sys/service/ISysDeptService.java | 4 +- .../sys/service/ISysDictDataService.java | 4 +- .../sys/service/ISysDictTypeService.java | 4 +- .../modules/sys/service/ISysFileService.java | 5 +++ .../modules/sys/service/ISysLogService.java | 3 ++ .../modules/sys/service/ISysMailService.java | 4 +- .../sys/service/ISysNoticeService.java | 4 +- .../modules/sys/service/ISysRoleService.java | 4 +- .../modules/sys/service/ISysUserService.java | 4 +- .../service/impl/SysConfigServiceImpl.java | 11 +++--- .../sys/service/impl/SysDeptServiceImpl.java | 11 +++--- .../service/impl/SysDictDataServiceImpl.java | 11 +++--- .../service/impl/SysDictTypeServiceImpl.java | 11 +++--- .../service/impl/SysFileFTPServiceImpl.java | 9 +++++ .../sys/service/impl/SysFileServiceImpl.java | 9 +++++ .../sys/service/impl/SysLogServiceImpl.java | 6 +++ .../sys/service/impl/SysMailServiceImpl.java | 11 +++--- .../service/impl/SysNoticeServiceImpl.java | 11 +++--- .../sys/service/impl/SysRoleServiceImpl.java | 11 +++--- .../sys/service/impl/SysUserServiceImpl.java | 24 +++++++++--- src/main/resources/mapper/GenTableMapper.xml | 29 +++++++++++++- .../resources/mapper/ScheduleJobMapper.xml | 8 ++++ .../resources/mapper/ScheduleLogMapper.xml | 15 +++++++- src/main/resources/mapper/SysConfigMapper.xml | 17 ++++++++- src/main/resources/mapper/SysDeptMapper.xml | 13 ++++++- .../resources/mapper/SysDictDataMapper.xml | 12 ++++++ .../resources/mapper/SysDictTypeMapper.xml | 8 ++++ src/main/resources/mapper/SysFileMapper.xml | 20 ++++++++++ src/main/resources/mapper/SysLogMapper.xml | 4 +- src/main/resources/mapper/SysMailMapper.xml | 21 +++++++++- src/main/resources/mapper/SysNoticeMapper.xml | 23 +++++++++++ src/main/resources/mapper/SysRoleMapper.xml | 16 +++++++- .../resources/mapper/SysUserRoleMapper.xml | 2 +- .../resources/templates/system/file/main.html | 4 +- 67 files changed, 442 insertions(+), 169 deletions(-) diff --git a/pom.xml b/pom.xml index 24640ab..b1d5e65 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ 1.8 - 1.1.22 + 8.0.19 - 3.4.1 + 3.5.1 2.9.2 @@ -37,10 +37,6 @@ 3.10 2.5 - - 1.3.0 - - 3.5.0 6.0.0 @@ -129,6 +125,12 @@ com.baomidou mybatis-plus-boot-starter ${mybatis.plus.version} + + + org.mybatis + mybatis + + @@ -154,12 +156,6 @@ commons-lang3 ${commons.lang3.version} - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.version} - commons-io @@ -170,7 +166,7 @@ com.baomidou mybatis-plus-generator - ${generator.version} + ${mybatis.plus.version} @@ -233,6 +229,22 @@ jackson-datatype-jsr310 ${jackson.version} + + org.mybatis + mybatis-typehandlers-jsr310 + 1.0.1 + + + org.mybatis + mybatis + + + + + org.mybatis + mybatis + 3.5.3 + org.jsoup diff --git a/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java b/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java index fc2d53f..5b0ec11 100644 --- a/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java +++ b/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java @@ -27,7 +27,7 @@ public class SecureCaptchaSupport extends OncePerRequestFilter implements Filter private String method = "POST"; /** - * 验 证 码 校 监 逻 辑 + * 验 证 码 校 监 逻 辑 6228 2131 7900 7564 475 */ @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { diff --git a/src/main/java/com/pearadmin/modules/gen/controller/GenController.java b/src/main/java/com/pearadmin/modules/gen/controller/GenController.java index 358bb6a..1e30269 100644 --- a/src/main/java/com/pearadmin/modules/gen/controller/GenController.java +++ b/src/main/java/com/pearadmin/modules/gen/controller/GenController.java @@ -1,8 +1,7 @@ package com.pearadmin.modules.gen.controller; import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.string.Convert; @@ -68,10 +67,8 @@ public class GenController extends BaseController { @GetMapping("/list") @ResponseBody public ResultTable genList(GenTable genTable, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List data = genTableService.selectGenTableList(genTable); - PageInfo pageInfo = new PageInfo<>(data); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = genTableService.selectGenTablePage(pageDomain, genTable); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** @@ -83,10 +80,8 @@ public class GenController extends BaseController { @GetMapping("/db/list") @ResponseBody public ResultTable dataList(GenTable genTable, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List data = genTableService.selectDbTableList(genTable); - PageInfo pageInfo = new PageInfo<>(data); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = genTableService.selectDbTablePage(pageDomain, genTable); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java b/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java index b24332a..0c55254 100644 --- a/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java +++ b/src/main/java/com/pearadmin/modules/gen/mapper/GenTableMapper.java @@ -1,7 +1,10 @@ package com.pearadmin.modules.gen.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.gen.domain.GenTable; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +23,8 @@ public interface GenTableMapper extends BaseMapper { */ List selectGenTableList(GenTable genTable); + IPage selectPages(IPage page, @Param(Constants.ENTITY) GenTable genTable); + /** * 查询据库列表 * @@ -28,6 +33,8 @@ public interface GenTableMapper extends BaseMapper { */ List selectDbTableList(GenTable genTable); + IPage selectDbTablePage(IPage page, @Param(Constants.ENTITY) GenTable genTable); + /** * 查询据库列表 * diff --git a/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java b/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java index 7f7afd8..cebae95 100644 --- a/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java +++ b/src/main/java/com/pearadmin/modules/gen/service/IGenTableService.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.gen.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.gen.domain.GenTable; import java.util.List; @@ -20,6 +22,8 @@ public interface IGenTableService extends IService { */ List selectGenTableList(GenTable genTable); + IPage selectGenTablePage(PageDomain pageDomain, GenTable genTable); + /** * 查询据库列表 * @@ -28,6 +32,8 @@ public interface IGenTableService extends IService { */ List selectDbTableList(GenTable genTable); + IPage selectDbTablePage(PageDomain pageDomain, GenTable genTable); + /** * 查询据库列表 * diff --git a/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java b/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java index 7934870..7dcd7ba 100644 --- a/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/gen/service/impl/GenTableServiceImpl.java @@ -2,6 +2,8 @@ package com.pearadmin.modules.gen.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.constant.CommonConstant; import com.pearadmin.common.constant.GenerateConstant; @@ -11,6 +13,7 @@ import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.string.CharsetKit; import com.pearadmin.common.tools.string.Convert; import com.pearadmin.common.tools.string.StringUtil; +import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.gen.domain.GenTable; import com.pearadmin.modules.gen.domain.GenTableColumn; import com.pearadmin.modules.gen.mapper.GenTableColumnMapper; @@ -94,6 +97,12 @@ public class GenTableServiceImpl extends ServiceImpl i return genTableMapper.selectGenTableList(genTable); } + @Override + public IPage selectGenTablePage(PageDomain pageDomain, GenTable genTable) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return genTableMapper.selectPages(page, genTable); + } + /** * 查询据库列表 * @@ -105,6 +114,12 @@ public class GenTableServiceImpl extends ServiceImpl i return genTableMapper.selectDbTableList(genTable); } + @Override + public IPage selectDbTablePage(PageDomain pageDomain, GenTable genTable) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return genTableMapper.selectDbTablePage(page, genTable); + } + /** * 查询据库列表 * diff --git a/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java b/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java index fedbe7f..280be85 100644 --- a/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java +++ b/src/main/java/com/pearadmin/modules/job/controller/ScheduleJobController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.job.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.base.BaseController; @@ -53,8 +53,8 @@ public class ScheduleJobController extends BaseController { @GetMapping("data") @PreAuthorize("hasPermission('/schdule/job/data','sch:job:data')") public ResultTable data(PageDomain pageDomain, ScheduleJob param) { - PageInfo pageInfo = scheduleJobService.page(param, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = scheduleJobService.page(param, pageDomain); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/job/controller/ScheduleLogController.java b/src/main/java/com/pearadmin/modules/job/controller/ScheduleLogController.java index d93c3cc..2e7f813 100644 --- a/src/main/java/com/pearadmin/modules/job/controller/ScheduleLogController.java +++ b/src/main/java/com/pearadmin/modules/job/controller/ScheduleLogController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.job.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.web.base.BaseController; import com.pearadmin.common.web.domain.request.PageDomain; @@ -51,7 +51,7 @@ public class ScheduleLogController extends BaseController { @GetMapping("data") @PreAuthorize("hasPermission('/schdule/log/data','sch:log:data')") public ResultTable data(ScheduleLog scheduleLogBean, PageDomain pageDomain) { - PageInfo pageInfo = scheduleLogService.page(scheduleLogBean, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = scheduleLogService.page(pageDomain, scheduleLogBean); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } } diff --git a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java index 1a391cc..f50cbba 100644 --- a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java +++ b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleJobMapper.java @@ -1,7 +1,10 @@ package com.pearadmin.modules.job.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.job.domain.ScheduleJob; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +23,8 @@ public interface ScheduleJobMapper extends BaseMapper { */ List selectList1(ScheduleJob param); + IPage selectPages(IPage page, @Param(Constants.ENTITY) ScheduleJob param); + /** * Describe: 根据 jobId 查询定时任务 * Param: jobId diff --git a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java index 1711605..f16dd68 100644 --- a/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java +++ b/src/main/java/com/pearadmin/modules/job/mapper/ScheduleLogMapper.java @@ -1,7 +1,10 @@ package com.pearadmin.modules.job.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.job.domain.ScheduleLog; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,4 +23,6 @@ public interface ScheduleLogMapper extends BaseMapper { * Return: Integer 影响条数 */ List selectList(ScheduleLog scheduleLogBean); + + IPage selectPage(IPage page, @Param(Constants.ENTITY) ScheduleLog scheduleLogBean); } \ No newline at end of file diff --git a/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java b/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java index 79b44aa..7b82b14 100644 --- a/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java +++ b/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.job.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleJob; @@ -68,7 +68,7 @@ public interface IScheduleJobService extends IService { * Param: ScheduleJob PageDomain * Return: pageInfo */ - PageInfo page(ScheduleJob param, PageDomain pageDomain); + IPage page(ScheduleJob param, PageDomain pageDomain); /** * Describe: 根据编号获取定时任务 diff --git a/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java b/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java index 38a8a67..ae6ec05 100644 --- a/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java +++ b/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.job.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleLog; @@ -34,6 +34,6 @@ public interface IScheduleLogService extends IService { * Param: ScheduleJob * Return: pageInfo */ - PageInfo page(ScheduleLog scheduleLogBean, PageDomain pageDomain); + IPage page(PageDomain pageDomain, ScheduleLog scheduleLogBean); } diff --git a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java index 3f2a066..d345425 100644 --- a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleJobServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.job.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleJob; import com.pearadmin.modules.job.handler.ScheduleHandler; @@ -49,10 +49,9 @@ public class ScheduleJobServiceImpl extends ServiceImpl page(ScheduleJob param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = scheduleJobMapper.selectList1(param); - return new PageInfo<>(list); + public IPage page(ScheduleJob param, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return scheduleJobMapper.selectPages(page, param); } /** diff --git a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java index 1273ced..c8e923c 100644 --- a/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/job/service/impl/ScheduleLogServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.job.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleLog; import com.pearadmin.modules.job.mapper.ScheduleLogMapper; @@ -56,9 +56,8 @@ public class ScheduleLogServiceImpl extends ServiceImpl page(ScheduleLog scheduleLogBean, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = scheduleLogMapper.selectList(scheduleLogBean); - return new PageInfo<>(list); + public IPage page(PageDomain pageDomain, ScheduleLog scheduleLogBean) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return scheduleLogMapper.selectPage(page, scheduleLogBean); } } diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysConfigController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysConfigController.java index 4fb1f69..b2f14c7 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysConfigController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysConfigController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.base.BaseController; @@ -57,8 +57,8 @@ public class SysConfigController extends BaseController { @GetMapping("data") @PreAuthorize("hasPermission('/system/config/data','sys:config:data')") public ResultTable data(SysConfig param, PageDomain pageDomain) { - PageInfo pageInfo = sysConfigService.page(param, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = sysConfigService.page(param, pageDomain); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java index 6595138..3001ade 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.CommonConstant; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.plugin.system.domain.SysBaseDict; @@ -61,8 +61,8 @@ public class SysDictDataController extends BaseController { @GetMapping("data") @PreAuthorize("hasPermission('/system/dictData/data','sys:dictData:data')") public ResultTable data(SysDictData sysDictData, PageDomain pageDomain) { - PageInfo pageInfo = sysDictDataService.page(sysDictData, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = sysDictDataService.page(sysDictData, pageDomain); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysDictTypeController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysDictTypeController.java index 9b696e5..b9c8e9e 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysDictTypeController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysDictTypeController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.base.BaseController; @@ -52,8 +52,8 @@ public class SysDictTypeController extends BaseController { @GetMapping("data") @PreAuthorize("hasPermission('/system/dictType/data','sys:dictType:data')") public ResultTable data(SysDictType sysDictType, PageDomain pageDomain) { - PageInfo pageInfo = sysDictTypeService.page(sysDictType, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = sysDictTypeService.page(sysDictType, pageDomain); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } @GetMapping("list") diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysFileController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysFileController.java index e21dbc8..3e7af55 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysFileController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysFileController.java @@ -1,7 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.config.proprety.TemplateProperty; import com.pearadmin.common.constant.CommonConstant; import com.pearadmin.common.constant.ControllerConstant; @@ -83,10 +82,9 @@ public class SysFileController extends BaseController { */ @GetMapping("data") @PreAuthorize("hasPermission('/system/file/data','sys:file:data')") - public ResultTable data(PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - PageInfo pageInfo = new PageInfo<>(getFileService().data()); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + public ResultTable data(PageDomain pageDomain, SysFile file) { + IPage pageInfo = getFileService().page(pageDomain, file); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysLogController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysLogController.java index d96757c..e029cd1 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysLogController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysLogController.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.common.web.base.BaseController; @@ -51,9 +51,9 @@ public class SysLogController extends BaseController { @GetMapping("operateLog") @PreAuthorize("hasPermission('/system/log/operateLog','sys:log:operateLog')") public ResultTable operateLog(PageDomain pageDomain, LocalDateTime startTime, LocalDateTime endTime) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - PageInfo pageInfo = new PageInfo<>(sysLogService.data(LoggingType.OPERATE, startTime, endTime)); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + IPage pageInfo = sysLogService.getPage(page, LoggingType.OPERATE, startTime, endTime); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** @@ -64,9 +64,9 @@ public class SysLogController extends BaseController { @GetMapping("loginLog") @PreAuthorize("hasPermission('/system/log/loginLog','sys:log:loginLog')") public ResultTable loginLog(PageDomain pageDomain, LocalDateTime startTime, LocalDateTime endTime) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - PageInfo pageInfo = new PageInfo<>(sysLogService.data(LoggingType.LOGIN, startTime, endTime)); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + IPage pageInfo = sysLogService.getPage(page, LoggingType.LOGIN, startTime, endTime); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysMailController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysMailController.java index f4afff5..ba50f05 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysMailController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysMailController.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.controller; import cn.hutool.core.collection.CollectionUtil; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.tools.string.StringUtil; import com.pearadmin.common.web.base.BaseController; @@ -57,8 +57,8 @@ public class SysMailController extends BaseController { @ApiOperation(value = "邮件列表数据") @PreAuthorize("hasPermission('/system/mail/data','sys:mail:data')") public ResultTable data(SysMail sysMail, PageDomain pageDomain) { - PageInfo page = sysMailService.page(sysMail, pageDomain); - return pageTable(page.getList(), page.getTotal()); + IPage page = sysMailService.page(sysMail, pageDomain); + return pageTable(page.getRecords(), page.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java index 1624fcf..a315ac6 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysNoticeController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.tools.SecurityUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.string.Convert; @@ -56,8 +56,8 @@ public class SysNoticeController extends BaseController { @GetMapping("/data") @PreAuthorize("hasPermission('/system/notice/data','system:notice:data')") public ResultTable list(@ModelAttribute SysNotice sysNotice, PageDomain pageDomain) { - PageInfo pageInfo = sysNoticeService.selectSysNoticePage(sysNotice, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = sysNoticeService.selectSysNoticePage(pageDomain, sysNotice); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysRoleController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysRoleController.java index 5fb4f73..0b5ee3d 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysRoleController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysRoleController.java @@ -1,6 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.github.pagehelper.PageInfo; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.base.BaseController; @@ -62,8 +62,8 @@ public class SysRoleController extends BaseController { @ApiOperation(value = "获取角色列表数据") @PreAuthorize("hasPermission('/system/role/data','sys:role:data')") public ResultTable data(PageDomain pageDomain, SysRole param) { - PageInfo pageInfo = sysRoleService.page(param, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageInfo = sysRoleService.page(param, pageDomain); + return pageTable(pageInfo.getRecords(), pageInfo.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java index 4aef927..baec729 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysUserController.java @@ -1,8 +1,6 @@ package com.pearadmin.modules.sys.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pearadmin.common.constant.ControllerConstant; import com.pearadmin.common.plugin.logging.aop.annotation.Logging; import com.pearadmin.common.plugin.logging.aop.enums.BusinessType; @@ -10,7 +8,6 @@ import com.pearadmin.common.plugin.submit.annotation.RepeatSubmit; import com.pearadmin.common.tools.SecurityUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.ServletUtil; -import com.pearadmin.common.tools.string.StringUtil; import com.pearadmin.common.web.base.BaseController; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.common.web.domain.response.Result; @@ -90,19 +87,8 @@ public class SysUserController extends BaseController { @PreAuthorize("hasPermission('/system/user/data','sys:user:data')") @Logging(title = "查询用户", describe = "查询用户", type = BusinessType.QUERY) public ResultTable data(PageDomain pageDomain, SysUser param) { - IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); - QueryWrapper wrapper = new QueryWrapper<>(); - if (StringUtil.isNotEmpty(param.getDeptId())) { - wrapper.eq("dept_id", param.getDeptId()); - } - if (StringUtil.isNotEmpty(param.getRealName())) { - wrapper.like("real_name", param.getRealName()); - } - if (StringUtil.isNotEmpty(param.getUsername())) { - wrapper.like("username", param.getUsername()); - } - IPage pageData = sysUserService.page(page, wrapper); - return pageTable(pageData.getRecords(), page.getTotal()); + IPage pageData = sysUserService.pageData(pageDomain, param); + return pageTable(pageData.getRecords(), pageData.getTotal()); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java index 38988cb..e253b91 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysConfigMapper.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysConfig; import org.apache.ibatis.annotations.Param; @@ -21,6 +23,8 @@ public interface SysConfigMapper extends BaseMapper { */ List selectList(SysConfig param); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysConfig param); + /** * Describe: 根据 Id 查询系统配置 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java index a71d166..96c7928 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysDeptMapper.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysDept; import org.apache.ibatis.annotations.Param; @@ -21,6 +23,8 @@ public interface SysDeptMapper extends BaseMapper { */ List selectList(SysDept param); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysDept param); + /** * Describe: 根据 Id 查询部门 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java index 7e0066a..6d5eec0 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictDataMapper.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysDictData; import org.apache.ibatis.annotations.Param; @@ -28,6 +30,8 @@ public interface SysDictDataMapper extends BaseMapper { */ List selectList(SysDictData sysDictData); + IPage selectPage(IPage page, @Param(Constants.ENTITY) SysDictData sysDictData); + /** * Describe: 根据 Id 查询字典数据 diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java index 77e349f..90ebfa7 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysDictTypeMapper.java @@ -1,7 +1,10 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysDictType; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -20,6 +23,8 @@ public interface SysDictTypeMapper extends BaseMapper { */ List selectList(SysDictType sysDictType); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysDictType sysDictType); + /** * Describe: 根据 id 查询字典类型 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java index 3a102bb..97a0482 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysFileMapper.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysFile; import org.apache.ibatis.annotations.Param; @@ -28,6 +30,8 @@ public interface SysFileMapper extends BaseMapper { */ List selectList(); + IPage selectPage(IPage page, @Param(Constants.ENTITY) SysFile sysFile); + /** * Describe: 根据 Id 查询文件信息 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java index ce0e075..e42423f 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysLogMapper.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.modules.sys.domain.SysLog; @@ -29,6 +30,8 @@ public interface SysLogMapper extends BaseMapper { */ List selectList(LoggingType loggingType, LocalDateTime startTime, LocalDateTime endTime); + IPage selectList(IPage page, LoggingType loggingType, LocalDateTime startTime, LocalDateTime endTime); + /** * Describe: 根据 id 查询日志信息 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java index f786065..9a5e572 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysMailMapper.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysMail; import org.apache.ibatis.annotations.Param; @@ -30,6 +32,8 @@ public interface SysMailMapper extends BaseMapper { */ List selectList(SysMail sysMail); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysMail sysMail); + /** * 根据id删除邮件 * diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java index 463f4c0..b644458 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysNoticeMapper.java @@ -1,7 +1,10 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysNotice; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,6 +32,9 @@ public interface SysNoticeMapper extends BaseMapper { */ List selectSysNoticeList(SysNotice sysNotice); + + IPage selectPage(IPage page, @Param(Constants.ENTITY) SysNotice sysNotice); + /** * 新增notice * diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java index 77a7be9..bbde85f 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java +++ b/src/main/java/com/pearadmin/modules/sys/mapper/SysRoleMapper.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.pearadmin.modules.sys.domain.SysRole; import org.apache.ibatis.annotations.Param; @@ -27,6 +29,9 @@ public interface SysRoleMapper extends BaseMapper { */ List selectList1(SysRole param); + + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysRole param); + /** * Describe: 添加角色数据 * Param: SysRole diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java index 7bb19fc..11268ec 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysConfig; @@ -27,7 +27,7 @@ public interface ISysConfigService extends IService { * Param: SysConfig * Return: PageInfo */ - PageInfo page(SysConfig param, PageDomain pageDomain); + IPage page(SysConfig param, PageDomain pageDomain); /** * Describe: 根据 Id 查询系统配置 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java index 5b3b5e9..e92fc11 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDept; @@ -27,7 +27,7 @@ public interface ISysDeptService extends IService { * Param: pageDomain * Return: 操作结果 */ - PageInfo page(SysDept param, PageDomain pageDomain); + IPage page(SysDept param, PageDomain pageDomain); /** * Describe: 保存部门数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java index 427c42e..718de76 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDictData; @@ -41,7 +41,7 @@ public interface ISysDictDataService extends IService { * Param: SysDictData * Return: PageInfo */ - PageInfo page(SysDictData sysDictData, PageDomain pageDomain); + IPage page(SysDictData sysDictData, PageDomain pageDomain); /** * Describe: 插入 SysDictData 数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java index 8b547f4..a4c9879 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDictType; @@ -26,7 +26,7 @@ public interface ISysDictTypeService extends IService { * Param: SysDictType * Return: PageInfo */ - PageInfo page(SysDictType sysDictType, PageDomain pageDomain); + IPage page(SysDictType sysDictType, PageDomain pageDomain); /** * Describe: 根据 Id 查询字典类型 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java index d2f2b74..cba4f7e 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysFileService.java @@ -1,6 +1,8 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysFile; import org.springframework.web.multipart.MultipartFile; @@ -11,6 +13,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ + public interface ISysFileService extends IService { /** @@ -28,6 +31,8 @@ public interface ISysFileService extends IService { */ List data(); + IPage page(PageDomain pageDomain, SysFile sysFile); + /** * 删 除 文 件 */ diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java index 8e533a7..c69ecaf 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysLogService.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.modules.sys.domain.SysLog; @@ -28,6 +29,8 @@ public interface ISysLogService extends IService { */ List data(LoggingType loggingType, LocalDateTime startTime, LocalDateTime endTime); + IPage getPage(IPage page, LoggingType loggingType, LocalDateTime startTime, LocalDateTime endTime); + /** * Describe: 根 据 id 查 询 日 志 * Param: id diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java index 1ae8fff..951dbc0 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysMail; @@ -34,7 +34,7 @@ public interface ISysMailService extends IService { * Param: sysMail * Return: 返回分页邮件列表数据 */ - PageInfo page(SysMail sysMail, PageDomain pageDomain); + IPage page(SysMail sysMail, PageDomain pageDomain); /** * Describe: 发送邮件 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java index 3c206e4..28a1464 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysNotice; @@ -30,7 +30,7 @@ public interface ISysNoticeService extends IService { * @param pageDomain * @return notice 分页集合 */ - PageInfo selectSysNoticePage(SysNotice sysNotice, PageDomain pageDomain); + IPage selectSysNoticePage(PageDomain pageDomain, SysNotice sysNotice); /** * 查询notice列表 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java index e8025c2..b20cf26 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysPower; import com.pearadmin.modules.sys.domain.SysRole; @@ -28,7 +28,7 @@ public interface ISysRoleService extends IService { * Param: pageDomain * Return: 操作结果 */ - PageInfo page(SysRole param, PageDomain pageDomain); + IPage page(SysRole param, PageDomain pageDomain); /** * Describe: 保存角色数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java index c8eeb25..ddb49c9 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java @@ -1,7 +1,7 @@ package com.pearadmin.modules.sys.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysMenu; import com.pearadmin.modules.sys.domain.SysRole; @@ -28,7 +28,7 @@ public interface ISysUserService extends IService { * Param: username * Return: 返回分页用户列表数据 */ - PageInfo page(SysUser param, PageDomain pageDomain); + IPage pageData(PageDomain pageDomain, SysUser param); /** * Describe: 根据 id 获取用户数据 diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java index c1981d8..e434019 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysConfigServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysConfig; import com.pearadmin.modules.sys.mapper.SysConfigMapper; @@ -42,10 +42,9 @@ public class SysConfigServiceImpl extends ServiceImpl */ @Override - public PageInfo page(SysConfig param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysConfigMapper.selectList(param); - return new PageInfo<>(list); + public IPage page(SysConfig param, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysConfigMapper.selectPages(page, param); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java index 12e06c7..c1d34e5 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDeptServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDept; import com.pearadmin.modules.sys.mapper.SysDeptMapper; @@ -39,10 +39,9 @@ public class SysDeptServiceImpl extends ServiceImpl impl * Return: 操作结果 */ @Override - public PageInfo page(SysDept param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysDeptMapper.selectList(param); - return new PageInfo<>(list); + public IPage page(SysDept param, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysDeptMapper.selectPages(page, param); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java index 4314af0..97c85f5 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictDataServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -63,10 +63,9 @@ public class SysDictDataServiceImpl extends ServiceImpl page(SysDictData sysDictData, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysDictDataMapper.selectList(sysDictData); - return new PageInfo<>(list); + public IPage page(SysDictData sysDictData, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysDictDataMapper.selectPage(page, sysDictData); } @Override diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java index f6e5065..8a68bb5 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysDictTypeServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDictType; import com.pearadmin.modules.sys.mapper.SysDictDataMapper; @@ -47,10 +47,9 @@ public class SysDictTypeServiceImpl extends ServiceImpl */ @Override - public PageInfo page(SysDictType sysDictType, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysDictTypeMapper.selectList(sysDictType); - return new PageInfo<>(list); + public IPage page(SysDictType sysDictType, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysDictTypeMapper.selectPages(page, sysDictType); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java index 4184c8b..6b564f5 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileFTPServiceImpl.java @@ -1,10 +1,13 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.config.proprety.TemplateProperty; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.ServletUtil; import com.pearadmin.common.tools.upload.FTPUtil; +import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysFile; import com.pearadmin.modules.sys.mapper.SysFileMapper; import com.pearadmin.modules.sys.service.ISysFileService; @@ -94,6 +97,12 @@ public class SysFileFTPServiceImpl extends ServiceImpl i return fileMapper.selectList(); } + @Override + public IPage page(PageDomain pageDomain, SysFile sysFile) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return fileMapper.selectPage(page, sysFile); + } + @Override public boolean remove(String id) { SysFile file = fileMapper.selectById(id); diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java index 01cd1c1..dacdeb7 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysFileServiceImpl.java @@ -1,11 +1,14 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.config.proprety.TemplateProperty; import com.pearadmin.common.constant.SystemConstant; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.tools.ServletUtil; import com.pearadmin.common.tools.upload.FileUtil; +import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysFile; import com.pearadmin.modules.sys.mapper.SysFileMapper; import com.pearadmin.modules.sys.service.ISysFileService; @@ -141,6 +144,12 @@ public class SysFileServiceImpl extends ServiceImpl impl return fileMapper.selectList(); } + @Override + public IPage page(PageDomain pageDomain, SysFile sysFile) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return fileMapper.selectPage(page, sysFile); + } + /** * Describe: 根据 Id 删除文件信息 diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java index e97a849..79b2323 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysLogServiceImpl.java @@ -1,5 +1,6 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.plugin.logging.aop.enums.LoggingType; import com.pearadmin.common.plugin.logging.aop.enums.RequestMethod; @@ -45,6 +46,11 @@ public class SysLogServiceImpl extends ServiceImpl impleme return sysLogMapper.selectList(loggingType, startTime, endTime); } + @Override + public IPage getPage(IPage page, LoggingType loggingType, LocalDateTime startTime, LocalDateTime endTime) { + return sysLogMapper.selectList(page, loggingType, startTime, endTime); + } + @Override public SysLog getById(String id) { return sysLogMapper.getById(id); diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java index 9b7d5bd..38b4545 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysMailServiceImpl.java @@ -5,9 +5,9 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.mail.MailAccount; import cn.hutool.extra.mail.MailUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.tools.SecurityUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.domain.request.PageDomain; @@ -50,10 +50,9 @@ public class SysMailServiceImpl extends ServiceImpl impl } @Override - public PageInfo page(SysMail sysMail, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List sysMails = sysMailMapper.selectList(sysMail); - return new PageInfo<>(sysMails); + public IPage page(SysMail sysMail, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysMailMapper.selectPages(page, sysMail); } @Override diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java index 6714390..b92c169 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysNoticeServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysNotice; import com.pearadmin.modules.sys.mapper.SysNoticeMapper; @@ -54,10 +54,9 @@ public class SysNoticeServiceImpl extends ServiceImpl selectSysNoticePage(SysNotice sysNotice, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List data = sysNoticeMapper.selectSysNoticeList(sysNotice); - return new PageInfo<>(data); + public IPage selectSysNoticePage(PageDomain pageDomain, SysNotice sysNotice) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysNoticeMapper.selectPage(page, sysNotice); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java index 192cd5d..7ecf2f8 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysRoleServiceImpl.java @@ -1,8 +1,8 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysPower; @@ -70,10 +70,9 @@ public class SysRoleServiceImpl extends ServiceImpl impl * Return: 操作结果 */ @Override - public PageInfo page(SysRole param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysRoleMapper.selectList1(param); - return new PageInfo<>(list); + public IPage page(SysRole param, PageDomain pageDomain) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + return sysRoleMapper.selectPages(page, param); } /** diff --git a/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java index 9bb8d4d..854895d 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/pearadmin/modules/sys/service/impl/SysUserServiceImpl.java @@ -1,10 +1,12 @@ package com.pearadmin.modules.sys.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.pearadmin.common.config.proprety.SecurityProperty; import com.pearadmin.common.tools.SequenceUtil; +import com.pearadmin.common.tools.string.StringUtil; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysMenu; import com.pearadmin.modules.sys.domain.SysRole; @@ -70,16 +72,26 @@ public class SysUserServiceImpl extends ServiceImpl impl return sysUserMapper.selectList(param); } + /** * Describe: 根据条件查询用户列表数据 分页 * Param: username * Return: 返回分页用户列表数据 */ @Override - public PageInfo page(SysUser param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List sysUsers = sysUserMapper.selectList(param); - return new PageInfo<>(sysUsers); + public IPage pageData(PageDomain pageDomain, SysUser param) { + IPage page = new Page<>(pageDomain.getPage(), pageDomain.getLimit()); + QueryWrapper wrapper = new QueryWrapper<>(); + if (StringUtil.isNotEmpty(param.getDeptId())) { + wrapper.eq("dept_id", param.getDeptId()); + } + if (StringUtil.isNotEmpty(param.getRealName())) { + wrapper.like("real_name", param.getRealName()); + } + if (StringUtil.isNotEmpty(param.getUsername())) { + wrapper.like("username", param.getUsername()); + } + return this.page(page, wrapper); } /** diff --git a/src/main/resources/mapper/GenTableMapper.xml b/src/main/resources/mapper/GenTableMapper.xml index 8bdb08f..8a2d2f1 100644 --- a/src/main/resources/mapper/GenTableMapper.xml +++ b/src/main/resources/mapper/GenTableMapper.xml @@ -83,8 +83,7 @@ from gen_table - @@ -96,6 +95,18 @@ + + + + + + + + insert into schedule_log diff --git a/src/main/resources/mapper/SysConfigMapper.xml b/src/main/resources/mapper/SysConfigMapper.xml index 30b9f9f..0ea760f 100644 --- a/src/main/resources/mapper/SysConfigMapper.xml +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -15,7 +15,8 @@ - select * from sys_config config_type = 'custom' @@ -28,6 +29,20 @@ + + + + + + + + insert into sys_dict_data diff --git a/src/main/resources/mapper/SysDictTypeMapper.xml b/src/main/resources/mapper/SysDictTypeMapper.xml index f76b5a2..c0ae9be 100644 --- a/src/main/resources/mapper/SysDictTypeMapper.xml +++ b/src/main/resources/mapper/SysDictTypeMapper.xml @@ -26,6 +26,14 @@ + + + + select * from sys_mail @@ -75,6 +75,25 @@ + + delete from sys_mail diff --git a/src/main/resources/mapper/SysNoticeMapper.xml b/src/main/resources/mapper/SysNoticeMapper.xml index cace976..c359f45 100644 --- a/src/main/resources/mapper/SysNoticeMapper.xml +++ b/src/main/resources/mapper/SysNoticeMapper.xml @@ -50,6 +50,29 @@ + + + + + +
- +