diff --git a/pom.xml b/pom.xml index 58c53b4199d41d7465d7d90927c1f67d84ca58b6..b1d5e65b546e723889c364dd033c1d7fa2c26a72 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,11 @@ 1.8 - 1.1.22 + 8.0.19 - 3.4.3.4 + 3.5.1 2.9.2 @@ -37,14 +37,6 @@ 3.10 2.5 - - 1.3.0 - - 3.5.0 - - 2.3.30 - - 1.6.2 6.0.0 @@ -133,6 +125,12 @@ com.baomidou mybatis-plus-boot-starter ${mybatis.plus.version} + + + org.mybatis + mybatis + + @@ -158,12 +156,6 @@ commons-lang3 ${commons.lang3.version} - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.version} - commons-io @@ -174,19 +166,7 @@ com.baomidou mybatis-plus-generator - ${generator.version} - - - - org.freemarker - freemarker - ${freemarker.version} - - - - com.github.whvcse - easy-captcha - ${captcha.version} + ${mybatis.plus.version} @@ -249,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/EntranceApplication.java b/src/main/java/com/pearadmin/EntranceApplication.java index 7584d20d23afc14b43b6f30c96ddb457dcc499bf..492670a617891553efc302e5ec9b870b83b96a16 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 0000000000000000000000000000000000000000..e0067a8eb44763ecaf095a77174b6c387d8bead2 --- /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 03ab5fad4f4b35c8ed0e92f009e4d396884dd7ea..11fb1c1d396c58d84fae30ccb693286b1809a39b 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 63dd7e3323341c5da1bef791d1751dd9b6ffe2d5..48ff31450f399fe30960b31cd704f5d0d4aa6344 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 84f255faa537518f059d74d4126070cff51e34fc..722b1d3f1044b47e7dadf9f5e7b3e96e062a043b 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 b05f44d346a9071e1cc059d1632109a35dd757f4..5e03583f0ece1e7a2ac07f58c219740dc609f0fc 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/secure/support/SecureCaptchaSupport.java b/src/main/java/com/pearadmin/common/secure/support/SecureCaptchaSupport.java index 8e5532acadfe515e061fa2796b6ef83b3a5c2f7e..5b0ec1196812efc84bd029f331d0e29b35c9612a 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; @@ -28,18 +27,21 @@ 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 { 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/common/tools/SequenceUtil.java b/src/main/java/com/pearadmin/common/tools/SequenceUtil.java index 50dad1527f792ba7ec4e7a3944eb4c873372d366..d8a42729c41924ad0dbd3944dc3cb9f37514d1e0 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 0fb9cd0e523b4efe872cf7d26ad2716e0664719b..c45d38a310394b9b517989e8fc61fc92d10f9793 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 38d39dd32c2edfcdcdea1cb8358723562e989200..9a512337c0c0502fc93f106e53b6fbeaa3d62401 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 334f5e42e1feb9bfca2dce5be92cf0ddc6c7ee5b..92c4ddf21a5223d375af38198c50279cc11657e5 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 ee21e55d80b0154043c129fc0ed4ed28d8195720..cd9c9803c77ac534ab8496c72393acc4b44222f9 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 1460a5eb8447079b2d2fe78b57315710bec9e407..fd026f8aa405de5df320cbdb51696e2df5b8b887 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/controller/GenController.java b/src/main/java/com/pearadmin/modules/gen/controller/GenController.java index 358bb6aa2239beb4d0bae327caefb4d544a22d49..1e3026972ec159c19879e113f546454abbb7793c 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/domain/GenTable.java b/src/main/java/com/pearadmin/modules/gen/domain/GenTable.java index 9c8fa9118ca7287307ed105b7f99ace5c7510191..8809f3fcc730243325b15aae35313d8d80477d8c 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 a7d3a3e24c7f42784ce907078f8f93f40d834328..8000c2362ea9b04b0dc67630cbf84f0638cac3f1 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 f364a6f1b36fa3cd9a7dd0a082af5578394d3ce3..902df013e89c7ee49f33d92a745916b2230faa81 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 471ce166bf86f0062ff2faca956f3a29fb582675..0c55254ae4e4a7274451ae8dd77a49998f88d35b 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.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,8 +13,8 @@ import java.util.List; * Author: 就眠仪式 * CreateTime: 2019/10/23 */ -@Mapper -public interface GenTableMapper { + +public interface GenTableMapper extends BaseMapper { /** * 查询业务列表 * @@ -20,6 +23,8 @@ public interface GenTableMapper { */ List selectGenTableList(GenTable genTable); + IPage selectPages(IPage page, @Param(Constants.ENTITY) GenTable genTable); + /** * 查询据库列表 * @@ -28,6 +33,8 @@ public interface GenTableMapper { */ List selectDbTableList(GenTable genTable); + IPage selectDbTablePage(IPage page, @Param(Constants.ENTITY) GenTable genTable); + /** * 查询据库列表 * 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 f3bbb01de183039b026d860cc2251cf7a9cb1cad..34f82748a0a21bdc69a139b647d380e4f91c18b0 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 0917d011ed8d9861db3a6358e6e44bd8b03828be..cebae951935ed1de686e087f23fe020b640e42ef 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,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; @@ -10,7 +13,7 @@ import java.util.Map; * Author: 就眠仪式 * CreateTime: 2019/10/23 */ -public interface IGenTableService { +public interface IGenTableService extends IService { /** * 查询业务列表 * @@ -19,6 +22,8 @@ public interface IGenTableService { */ List selectGenTableList(GenTable genTable); + IPage selectGenTablePage(PageDomain pageDomain, GenTable genTable); + /** * 查询据库列表 * @@ -27,6 +32,8 @@ public interface IGenTableService { */ List selectDbTableList(GenTable genTable); + IPage selectDbTablePage(PageDomain pageDomain, GenTable genTable); + /** * 查询据库列表 * 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 c46f50e5f0f74f9ee7e71da9840d01171802652e..ad44f720185f31479b4e64aedf70ef30a77593f2 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 73899045007921c63a5890ea1d0b9db21ac38cad..7dcd7ba63a52a5847f426407f0cde4b80ba9b464 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,9 @@ 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; import com.pearadmin.common.constant.SystemConstant; @@ -10,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; @@ -45,7 +49,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 @@ -93,6 +97,12 @@ public class GenTableServiceImpl implements IGenTableService { 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); + } + /** * 查询据库列表 * @@ -104,6 +114,12 @@ public class GenTableServiceImpl implements IGenTableService { 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/gen/tools/VelocityUtils.java b/src/main/java/com/pearadmin/modules/gen/tools/VelocityUtils.java index cd7a484221affdd8bdaba20ceb521076b99ce07c..51c03193c1f703299434c654104277bb54572c7d 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 85535241afd408e52c2432d3fb3b9d506306d21e..280be85c040f217c46e7e39db3899f54791ac977 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; @@ -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; @@ -52,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 d93c3cca41435539a1c1105477fd241758abf5ee..2e7f813c601076ceedc1cff086ffa8b488243e56 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/handler/ScheduleStarted.java b/src/main/java/com/pearadmin/modules/job/handler/ScheduleStarted.java index 39023663b2f981e50675d30aa6abf0af1cd42428..255cff6314f83b6bfef79ceab6c604ceb4f8653c 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 f47926ef0c1dc53e20d55a54e4754ecc46bb4abe..f50cbbadc6c6c11cbe2c044f2d4c35189ce65bff 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.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,22 +13,17 @@ 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); + + IPage selectPages(IPage page, @Param(Constants.ENTITY) ScheduleJob param); /** * Describe: 根据 jobId 查询定时任务 @@ -34,13 +32,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 ab2aaa6d35901feb04e6088b038b71b852603cf4..f16dd68f0c3bd6925a415877fd3e0c4ab8014d4d 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.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,15 +13,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: 根据条件查询定时任务日志列表 @@ -26,4 +23,6 @@ public interface ScheduleLogMapper { * 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 2b62d087ef2b697b84ee423b2789f0f32f48f467..7b82b14c20add407b0f6fb418f9f04f1544031af 100644 --- a/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java +++ b/src/main/java/com/pearadmin/modules/job/service/IScheduleJobService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.job.service; -import com.github.pagehelper.PageInfo; +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.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: 修改定时任务 @@ -67,7 +68,7 @@ public interface IScheduleJobService { * 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 bdc12d56c3a441067162d234ba74072080bd1158..ae6ec05635b5097b88f3d54c37d48d0c94c51206 100644 --- a/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java +++ b/src/main/java/com/pearadmin/modules/job/service/IScheduleLogService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.job.service; -import com.github.pagehelper.PageInfo; +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.job.domain.ScheduleLog; @@ -12,7 +13,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ -public interface IScheduleLogService { +public interface IScheduleLogService extends IService { /** * Describe: 定时任务日志入库 @@ -33,6 +34,6 @@ public interface IScheduleLogService { * 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 b61f462ee729983d71b2b251971bda021446fffd..d34542559bd227229ef49dec488ae51ef55d13a0 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.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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 { /** * 引 入 服 务 @@ -48,10 +49,9 @@ public class ScheduleJobServiceImpl implements IScheduleJobService { * Return: pageInfo */ @Override - public PageInfo page(ScheduleJob param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = scheduleJobMapper.selectList(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); } /** @@ -61,7 +61,7 @@ public class ScheduleJobServiceImpl implements IScheduleJobService { */ @Override public List list(ScheduleJob param) { - return scheduleJobMapper.selectList(param); + return scheduleJobMapper.selectList1(param); } /** @@ -71,7 +71,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 8a085568e4302a670d0d881ed53610e6bd3b895c..c8e923c5a6c33b6f84be76fb62f32798c36fb52f 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,7 +1,8 @@ package com.pearadmin.modules.job.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.job.domain.ScheduleLog; import com.pearadmin.modules.job.mapper.ScheduleLogMapper; @@ -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; @@ -55,9 +56,8 @@ public class ScheduleLogServiceImpl implements IScheduleLogService { * Return: pageInfo */ @Override - public PageInfo 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/pro/controller/ProEditorController.java b/src/main/java/com/pearadmin/modules/pro/controller/ProEditorController.java index 1e99d5900509961276bdcecbe00ddc50b8cf2979..5e95dda1cd71dd6403776bf3a698a7acc58aaeb2 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 c0dd6884d80ef493ccf5499ce4864887e5a9635e..55b57e52ce23b639e7285b08551fea4f5b32f591 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/SysCaptchaController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysCaptchaController.java index 7dccd5c6ebb30500eeed7f14e2955b91f5382c75..d170729536230e7b392095b4f279ee8aa3bc3c82 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()); } } 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 4fb1f691f95404614a60f5aa6da52421466f00cb..b2f14c7133cc0f50b0369f916d83e17fe777d933 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 69981fc6d33398a0c3a13922ffc8e18a33ca9911..3001adecb230b48ad1eb84a66f43770c76658211 100644 --- a/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java +++ b/src/main/java/com/pearadmin/modules/sys/controller/SysDictDataController.java @@ -1,12 +1,12 @@ 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; 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; @@ -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 9b696e5ef826204354948c11b05a181bb4e16158..b9c8e9e0930437645c68e0bc44cd8c2176866034 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 e21dbc8cd96fba5a758d6cd5190754e48b9b05bf..3e7af555bd43cf5efd74d728293dd6d61ade86e5 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 d96757c97fbe044814ee90a59185b0a7b308c631..e029cd1144d24988d2979aa04da1895f2bd1539c 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 f4afff5123c4a184185597a1ef838ae8ab4f7098..ba50f05040c3ddf8c0775b5c23325d5b0bf6cf55 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 f468c0cd4139b2a50af7d8f01b170b5ed834f7c4..a315ac6fe1af1a836cbe6c56d428c8ac728d284e 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()); } /** @@ -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/SysRoleController.java b/src/main/java/com/pearadmin/modules/sys/controller/SysRoleController.java index 5fb4f73fde2a81cadbf38da75c7ec70e7307404e..0b5ee3db33677f1e7174b09ce03faf4a615341aa 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 bed7dab282c26935856262dd6eeff7810be6b13e..baec72978c64e5aa16c70892fc93f22968fb0541 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,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.plugin.logging.aop.annotation.Logging; import com.pearadmin.common.plugin.logging.aop.enums.BusinessType; @@ -87,8 +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) { - PageInfo pageInfo = sysUserService.page(param, pageDomain); - return pageTable(pageInfo.getList(), pageInfo.getTotal()); + IPage pageData = sysUserService.pageData(pageDomain, param); + return pageTable(pageData.getRecords(), pageData.getTotal()); } /** @@ -100,7 +100,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 4a0346e6699cb54e2b3de0f7aea83520a2843422..3f400a1e13e81665f26296e067c737cf32c90756 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 831b2dfa075d915c87d430cfe04fbe0e9f027bc4..3ce6850946e2a37b730291a8aea84e4a2cf5fc15 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 6f5edef0fd406018fbde32e389ebc26562d9d54f..e253b914b10980becbb9b5d455a84a2215ff53ea 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,9 @@ 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.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysConfigMapper { + +public interface SysConfigMapper extends BaseMapper { /** * Describe: 查询系统配置信息 @@ -21,12 +23,7 @@ public interface SysConfigMapper { */ List selectList(SysConfig param); - /** - * Describe: 添加系统配置 - * Param: SysConfig - * Return: 执行结果 - */ - Integer insert(SysConfig sysConfig); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysConfig param); /** * Describe: 根据 Id 查询系统配置 @@ -42,13 +39,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 83e4cd36dc6c533b1cd1ba8432b839f406c0992b..96c7928c132881afb2d8aded3e5fd6bee4f67825 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,9 @@ 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.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysDeptMapper { + +public interface SysDeptMapper extends BaseMapper { /** * Describe: 查询部门列表 @@ -21,12 +23,8 @@ public interface SysDeptMapper { */ List selectList(SysDept param); - /** - * Describe: 添加部门数据 - * Param: SysDept - * Return: 执行结果 - */ - Integer insert(SysDept sysDept); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysDept param); + /** * Describe: 根据 Id 查询部门 @@ -35,12 +33,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 df22ed9fd38586144e46288ed487435d639eece5..6d5eec0a9a6395c5344ce48c2b7bbf8bf6adf337 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,9 @@ 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.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysDictDataMapper { + +public interface SysDictDataMapper extends BaseMapper { /** * 通过字典code获取字典数据 * @@ -28,12 +30,8 @@ public interface SysDictDataMapper { */ List selectList(SysDictData sysDictData); - /** - * Describe: 插入字典数据信息 - * Param: SysDictData - * Return: Integer - */ - Integer insert(SysDictData sysDictData); + IPage selectPage(IPage page, @Param(Constants.ENTITY) SysDictData sysDictData); + /** * Describe: 根据 Id 查询字典数据 @@ -42,13 +40,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 9c55489b2995e5c788fd1db9bdccf8fe18a54f09..90ebfa7b9c696bcf192fe62a3ae053d2e4023844 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.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,8 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysDictTypeMapper { + +public interface SysDictTypeMapper extends BaseMapper { /** * Describe: 查询字典类型列表 @@ -20,6 +23,8 @@ public interface SysDictTypeMapper { */ List selectList(SysDictType sysDictType); + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysDictType sysDictType); + /** * Describe: 根据 id 查询字典类型 * Param: id @@ -27,20 +32,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 7c6db5500779312091be78babd77ccc5bb6f2186..97a0482698b95962f2a9083bc829211c699344fd 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,9 @@ 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.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysFileMapper { + +public interface SysFileMapper extends BaseMapper { /** * Describe: 插入文件信息 @@ -28,6 +30,8 @@ public interface SysFileMapper { */ 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 883365e58be31f99029601b07353a94dbf91d54d..e42423f7ecae213dbbcd935ba855300b68d5f717 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,9 @@ 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; -import org.apache.ibatis.annotations.Mapper; import java.time.LocalDateTime; import java.util.List; @@ -12,8 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -@Mapper -public interface SysLogMapper { + +public interface SysLogMapper extends BaseMapper { /** * Describe: 插入日志信息 @@ -29,6 +30,8 @@ public interface SysLogMapper { */ 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 806462b5b81fafff92d567a061c059bf608f7b3b..9a5e5727d246a48651933b62f21ae04a5370ef3f 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,9 @@ 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.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +13,8 @@ import java.util.List; * Author: Heiky * CreateTime: 2021/1/13 14:51 */ -@Mapper -public interface SysMailMapper { + +public interface SysMailMapper extends BaseMapper { /** * 保存邮件 @@ -20,7 +22,7 @@ public interface SysMailMapper { * @param sysMail * @return integer */ - Integer insert(SysMail sysMail); + int insert(SysMail sysMail); /** * 根据条件查询邮件列表 @@ -30,6 +32,8 @@ public interface SysMailMapper { */ 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 d28d1a95ba6eba1fec3ac17ea0fa7e38f912e31e..b64445850ac97ad3d104f4da0c63c9695268df63 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.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +14,8 @@ import java.util.List; * @author jmys * @date 2021-03-13 */ -@Mapper -public interface SysNoticeMapper { + +public interface SysNoticeMapper extends BaseMapper { /** * 查询notice * @@ -29,6 +32,9 @@ public interface SysNoticeMapper { */ 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/SysPowerMapper.java b/src/main/java/com/pearadmin/modules/sys/mapper/SysPowerMapper.java index 9d329d91c1521d69c7935f0656e6984022aa35a7..8bcd9556b32de7aabc821b768769c4831cbc9bc3 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 e7b8c5062850a2dd41fbe7403b846961fe2052b5..bbde85f4a4ca1d9afba808e9f06c09ad86ffc8d5 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,9 @@ 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.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -11,8 +13,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 +27,17 @@ public interface SysRoleMapper { * Param: SysRole * Return: List */ - List selectList(SysRole param); + List selectList1(SysRole param); + + + IPage selectPages(IPage page, @Param(Constants.ENTITY) SysRole param); /** * Describe: 添加角色数据 * Param: SysRole * Return: 执行结果 */ - Integer insert(SysRole sysRole); + int insert(SysRole sysRole); /** * Describe: 根据 Id 查询角色 @@ -46,7 +51,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 c144a86893bde52ac64bd4efe4663e80a5c7881f..2f0bad0809eed2c78ad892c881723bb1f09bd9be 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 120e99aa8d6352eab7963257eb4cdfacac494445..527926047f6062b678f4520ef364e283d3ae0c9c 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 6b2ac5e4bca6470d9b232fc606efee5c43d3b3ba..42f7ee50c25f9e705632255993bbad5ee6ea08fb 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 1dba4a57ce0ec7f73b5bb788228ab1ce7d24454b..11268ec480cce09271b7c3344e2d89780eafbec3 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysConfigService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysConfig; @@ -12,7 +13,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ -public interface ISysConfigService { +public interface ISysConfigService extends IService { /** * Describe: 根据条件查询系统配置列表数据 @@ -26,7 +27,7 @@ public interface ISysConfigService { * Param: SysConfig * Return: PageInfo */ - PageInfo page(SysConfig param, PageDomain pageDomain); + IPage page(SysConfig param, PageDomain pageDomain); /** * Describe: 根据 Id 查询系统配置 @@ -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 6e888818ddf84ee04b450424f756bbd85abd7f1f..e92fc11bcca1397acb29fa7efe6f04b0ec06f6d7 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDeptService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysDept; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysDeptService { +public interface ISysDeptService extends IService { /** * Describe: 查询部门数据 @@ -26,7 +27,7 @@ public interface ISysDeptService { * 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 d2ad832a59dfddb23db033ee4c9e5cc9ab003af4..718de761bbcde9f6ef9f074e32dcdc2785c48bfc 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDictDataService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysDictData; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysDictDataService { +public interface ISysDictDataService extends IService { /** * Describe: 根据条件查询字典类型列表数据 @@ -40,14 +41,14 @@ public interface ISysDictDataService { * Param: SysDictData * Return: PageInfo */ - PageInfo page(SysDictData sysDictData, PageDomain pageDomain); + IPage page(SysDictData sysDictData, PageDomain pageDomain); /** * Describe: 插入 SysDictData 数据 * 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 43969884f54c096e7ec6419e06bffe274f4ec5c1..a4c987953c701ea2148846797fb8c37b72f5b987 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysDictTypeService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysDictType; @@ -11,7 +12,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysDictTypeService { +public interface ISysDictTypeService extends IService { /** * Describe: 根据条件查询字典类型列表数据 @@ -25,7 +26,7 @@ public interface ISysDictTypeService { * Param: SysDictType * Return: PageInfo */ - PageInfo page(SysDictType sysDictType, PageDomain pageDomain); + IPage page(SysDictType sysDictType, PageDomain pageDomain); /** * Describe: 根据 Id 查询字典类型 @@ -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 0ff4ec938198d929cba419e38d3c83714b586f57..cba4f7e5a95069fefca0b4b4e356c9136ba168c7 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,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; @@ -10,7 +13,8 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysFileService { + +public interface ISysFileService extends IService { /** * 文 件 上 传 服 务 @@ -27,6 +31,8 @@ public interface ISysFileService { */ 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 1b8d5d664c8b1a48c095ce5b08464be8403e4884..c69ecaf14a4ca686561ea3167e3c20c0acd8f07c 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,7 @@ 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; @@ -11,7 +13,7 @@ import java.util.List; * Author: 就 眠 仪 式 * CreateTime: 2019/10/23 */ -public interface ISysLogService { +public interface ISysLogService extends IService { /** * Describe: 执 行 插 入 操 作 @@ -27,6 +29,8 @@ public interface ISysLogService { */ 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 6a8f84ed93a5f467278c9541ad89cad0fc7bb956..951dbc0aeec3d0bb1928379bde007237631a60c0 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysMailService.java @@ -1,7 +1,8 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.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: 根据条件查询邮件列表数据 @@ -33,7 +34,7 @@ public interface ISysMailService { * 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 a8d5c6894aed6dbd77b6de4eae292ecd360e9366..28a1464bf07609485dbe8b7c8b51b45d9f0aeed5 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysNoticeService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysNotice; @@ -12,7 +13,7 @@ import java.util.List; * @author jmys * @date 2021-03-13 */ -public interface ISysNoticeService { +public interface ISysNoticeService extends IService { /** * 查询notice * @@ -29,7 +30,7 @@ public interface ISysNoticeService { * @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/ISysPowerService.java b/src/main/java/com/pearadmin/modules/sys/service/ISysPowerService.java index 051bdf22fb4861fdc220829965df345dfac948a0..dafda71365db1b952bff5a04f3dc3c5013935916 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 dec5dafbd46d631089a196e475a1d70deef5a3c3..b20cf262a8cae07956e89a886ea5a9795e45b132 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysRoleService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysPower; import com.pearadmin.modules.sys.domain.SysRole; @@ -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: 分页查询角色数据 @@ -27,7 +28,7 @@ public interface ISysRoleService { * 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 5ce22f1d5a69dd299b0be23a4ce00c193aa30fc6..ddb49c923453f8194e108b365dc3758714f94a29 100644 --- a/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java +++ b/src/main/java/com/pearadmin/modules/sys/service/ISysUserService.java @@ -1,6 +1,7 @@ package com.pearadmin.modules.sys.service; -import com.github.pagehelper.PageInfo; +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.SysMenu; import com.pearadmin.modules.sys.domain.SysRole; @@ -13,21 +14,21 @@ 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: 根据条件查询用户列表数据 分页 * 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 9fd7fb137c0b6000da69af557c8c0464bed182fd..e434019b38c534a4bf5cdf2b58cdb2f28463b24d 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,7 +1,8 @@ package com.pearadmin.modules.sys.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysConfig; import com.pearadmin.modules.sys.mapper.SysConfigMapper; @@ -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 { /** * 系统配置数据库操作接口 @@ -41,10 +42,9 @@ public class SysConfigServiceImpl implements ISysConfigService { * Return: PageInfo */ @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); } /** @@ -53,7 +53,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 +84,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 eea6a31567ef16c1321062c8d8728423810e331d..c1d34e5ae864ea821adb1ef006d752aa8ec2466c 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,7 +1,8 @@ package com.pearadmin.modules.sys.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDept; import com.pearadmin.modules.sys.mapper.SysDeptMapper; @@ -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; @@ -38,10 +39,9 @@ public class SysDeptServiceImpl implements ISysDeptService { * 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 f720678d84eca44dd0b0f3761ad857a7a1a7e3ac..97c85f5f3bcd3859c2fc60ed73369572247bedd9 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,7 +1,8 @@ package com.pearadmin.modules.sys.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -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 @@ -62,14 +63,13 @@ public class SysDictDataServiceImpl implements ISysDictDataService { } @Override - public PageInfo 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 - public Boolean save(SysDictData sysDictData) { + public boolean save(SysDictData sysDictData) { Integer result = sysDictDataMapper.insert(sysDictData); if (result > 0) { refreshCacheTypeCode(sysDictData.getTypeCode()); @@ -85,7 +85,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 5942e9ffad78404280e40bf6c2466325047caec1..8a68bb5a51c37fdd39767c70ecad10a6bfad6826 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,7 +1,8 @@ package com.pearadmin.modules.sys.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysDictType; import com.pearadmin.modules.sys.mapper.SysDictDataMapper; @@ -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; @@ -46,10 +47,9 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService { * Return: PageInfo */ @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); } /** @@ -58,7 +58,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 +84,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 11b7397b7dfbfcbe0d7b6f20483dea352e395cca..6b564f5489f0f6462fe3db07fa3fb79c4ed2e17e 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,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.upload.FTPUtil; 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; @@ -20,7 +24,7 @@ import java.util.List; @Slf4j @Service("SysFileFTPServiceImpl") -public class SysFileFTPServiceImpl implements ISysFileService { +public class SysFileFTPServiceImpl extends ServiceImpl implements ISysFileService { /** * 引 入 服 务 @@ -93,6 +97,12 @@ public class SysFileFTPServiceImpl implements ISysFileService { 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 1beb457e9fefb82b5c8dca5976a2e9f3226b43ff..dacdeb7551863d5bbfd7ca65a2583cf04d85fcec 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,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.upload.FileUtil; 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; @@ -29,7 +33,7 @@ import java.util.List; */ @Slf4j @Service("SysFileServiceImpl") -public class SysFileServiceImpl implements ISysFileService { +public class SysFileServiceImpl extends ServiceImpl implements ISysFileService { /** * 引 入 服 务 @@ -140,6 +144,12 @@ public class SysFileServiceImpl implements ISysFileService { 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 404b4b73e6c5e4651b2f6dc947c1e46b70680ee6..79b2323dc36ca53c94f6c781e26fc9c8dc9145f2 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,7 @@ 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; import com.pearadmin.common.tools.SecurityUtil; @@ -19,7 +21,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; @@ -44,6 +46,11 @@ public class SysLogServiceImpl implements ISysLogService { 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 475c00c061fe8c900c95bfedee1a74faa54d0c43..38b4545e7c74484a0fe48521f3a59b4eb8bfe67d 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,8 +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.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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.tools.SecurityUtil; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.domain.request.PageDomain; @@ -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; } } @@ -48,10 +50,9 @@ public class SysMailServiceImpl implements ISysMailService { } @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 665f58f627a922b640ab1ecc0ad92d9b23bab70f..b92c169c8cc0d6b91def69baff088749f9417c1d 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,7 +1,8 @@ package com.pearadmin.modules.sys.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysNotice; import com.pearadmin.modules.sys.mapper.SysNoticeMapper; @@ -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; @@ -53,10 +54,9 @@ public class SysNoticeServiceImpl implements ISysNoticeService { * @return notice 分页集合 */ @Override - public PageInfo 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/SysPowerServiceImpl.java b/src/main/java/com/pearadmin/modules/sys/service/impl/SysPowerServiceImpl.java index 1d686e0d36373c067370bf136ceb5454e2bb29d8..fd67adbf8029ef000d383031e34c33a45716f7b0 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 ea9ef2182cce12ce3a2c1163bf5f05ab91f00c2b..7ecf2f88b406329facd8c6fcf4ae3e5ee02772e6 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,7 +1,8 @@ package com.pearadmin.modules.sys.service.impl; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pearadmin.common.tools.SequenceUtil; import com.pearadmin.common.web.domain.request.PageDomain; import com.pearadmin.modules.sys.domain.SysPower; @@ -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); } /** @@ -69,10 +70,9 @@ public class SysRoleServiceImpl implements ISysRoleService { * Return: 操作结果 */ @Override - public PageInfo page(SysRole param, PageDomain pageDomain) { - PageHelper.startPage(pageDomain.getPage(), pageDomain.getLimit()); - List list = sysRoleMapper.selectList(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); } /** @@ -114,7 +114,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 3fc8e3184adbb43a3159e20e44190c8c1bd9789b..854895d1491d24c102a112cd97c00980b3ce99d7 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,22 @@ package com.pearadmin.modules.sys.service.impl; -import com.github.pagehelper.PageHelper; -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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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; 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 +30,7 @@ import java.util.List; * CreateTime: 2019/10/23 */ @Service -public class SysUserServiceImpl implements ISysUserService { +public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { /** * 注入用户服务 @@ -65,20 +68,30 @@ public class SysUserServiceImpl implements ISysUserService { * Return: 返回用户列表数据 */ @Override - public List list(SysUser param) { + public List list1(SysUser param) { 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); } /** @@ -140,7 +153,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 +184,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 d96803a08244fc0598607b85391df86bd66b0cf1..7acfd61f0e2c1199d5770b594f6932ff2ce51e7f 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 28a231e110c3212a111b30c41d8632d9a361526b..dba2f42bb8ba7bd3dbd427e521c199a6ecd0686f 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 88% rename from src/main/java/com/pearadmin/modules/gen/mapper/xml/GenTableMapper.xml rename to src/main/resources/mapper/GenTableMapper.xml index 22ac32e4df110fb725d6b43227ea9ef9a379b6d8..8a2d2f15e4806e0d56a2ba1c2eac596a8a526cb1 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,7 @@ from gen_table - @@ -95,7 +95,19 @@ - + + + + AND lower(table_name) like lower(concat('%', #{et.tableName}, '%')) + + + AND lower(table_comment) like lower(concat('%', #{et.tableComment}, '%')) + + + + + + + - + insert into gen_table ( table_id, table_name, @@ -291,7 +318,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 86% rename from src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleJobMapper.xml rename to src/main/resources/mapper/ScheduleJobMapper.xml index 90b6ce577e63cd09c523df8f0e948b58bd823f2d..bcd97c83f09cff7bba293b8a7cda6c25bfeffce3 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 @@ -24,6 +24,14 @@ + - + insert into schedule_job @@ -89,7 +97,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 79% rename from src/main/java/com/pearadmin/modules/job/mapper/xml/ScheduleLogMapper.xml rename to src/main/resources/mapper/ScheduleLogMapper.xml index 577388c1e416ae4bca77a5b14079ab1c0fc616be..a8ea4743455ad6bb47922e6097fbd08ff5e6a9a5 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 @@ -27,8 +27,21 @@ order by create_time desc + + - + 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 84% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysConfigMapper.xml rename to src/main/resources/mapper/SysConfigMapper.xml index a744cc54434a935cc5e70b9f299ff3d50bd1a3f9..0ea760f167ae0d243ae707cad3aede8bc3502b15 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysConfigMapper.xml +++ b/src/main/resources/mapper/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + @@ -15,7 +15,8 @@ - select * from sys_config config_type = 'custom' @@ -28,6 +29,20 @@ + + - + insert into sys_config @@ -88,7 +103,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 88% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDeptMapper.xml rename to src/main/resources/mapper/SysDeptMapper.xml index 7fe47fb64bace14cb096b5fdc3f3d7f0b48a7008..393c9eb15f8051cea3828a84f030038c9e7bc815 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDeptMapper.xml +++ b/src/main/resources/mapper/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + @@ -19,7 +19,8 @@ - select * from sys_dept @@ -28,6 +29,16 @@ + + - + insert into sys_dept @@ -102,7 +113,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 87% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictDataMapper.xml rename to src/main/resources/mapper/SysDictDataMapper.xml index 9229d42ef351e56ced89aee2406de1edb2fa9887..e9a7270f7cdc47917ffead34347dfe9c42579188 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 @@ -26,6 +26,17 @@ order by data_value asc + + - + + insert into sys_dict_data @@ -108,7 +120,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 85% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysDictTypeMapper.xml rename to src/main/resources/mapper/SysDictTypeMapper.xml index 9ece5b8e6272759b642d7138bb15c7619c0f046c..c0ae9be6afe61dfe48f7e72f652d10287d0fd1d3 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 @@ -26,6 +26,14 @@ + - + insert into sys_dict_type @@ -102,7 +110,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 80% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysFileMapper.xml rename to src/main/resources/mapper/SysFileMapper.xml index 5eafa0829abddded85dceccfe13fa7efdbd43457..0c29a63f36c6d14460ae7dfe02db04c0a1eb685a 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysFileMapper.xml +++ b/src/main/resources/mapper/SysFileMapper.xml @@ -16,6 +16,26 @@ 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 +61,7 @@ limit 1,11 - + insert into sys_logging @@ -175,7 +177,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 82% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysMailMapper.xml rename to src/main/resources/mapper/SysMailMapper.xml index 4bc0f59c3ca4392f2d21265f43cba690522bc922..6f4c4f30f35ea2dd60dbff32a79dfa5c6c68742b 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysMailMapper.xml +++ b/src/main/resources/mapper/SysMailMapper.xml @@ -56,7 +56,7 @@ - + + delete from sys_mail diff --git a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysNoticeMapper.xml b/src/main/resources/mapper/SysNoticeMapper.xml similarity index 84% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysNoticeMapper.xml rename to src/main/resources/mapper/SysNoticeMapper.xml index cace976ad33f6cc4819663a5096efd381811f841..c359f45ed811bfb220aa0d4ece08c067b1dde485 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysNoticeMapper.xml +++ b/src/main/resources/mapper/SysNoticeMapper.xml @@ -50,6 +50,29 @@ + + - 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 85% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysRoleMapper.xml rename to src/main/resources/mapper/SysRoleMapper.xml index d43d7518d82bd4302f6bfbbd50e4674d786f7d8b..2454eb6f5797768d95910c4e1ee01312b2039f74 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,8 @@ - select * from sys_role @@ -27,6 +28,19 @@ + + - + insert into sys_role @@ -93,7 +107,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 bbb0b614ba38ce77c1ebe622b7bf0c2489bd8212..d0a6117967fa64fbb05b829cb92521588c3a668b 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 31bbf6150a7c5204f430ad626e3ea5b4f6cd8a37..4f0a8273cac0de3b400f66ba62bad94370e0b7bb 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 91% rename from src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserRoleMapper.xml rename to src/main/resources/mapper/SysUserRoleMapper.xml index 0a9cc6a2808b92f6d2d2b5c830a5224bf59d39ce..39cb2b61f271be275aa4dad9c3a10da8e0b35ff8 100644 --- a/src/main/java/com/pearadmin/modules/sys/mapper/xml/SysUserRoleMapper.xml +++ b/src/main/resources/mapper/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + @@ -27,7 +27,7 @@ delete from sys_user_role where user_id in - + #{userId} diff --git a/src/main/resources/templates/system/file/main.html b/src/main/resources/templates/system/file/main.html index 8f739a4d5ed565c2010ec66924def250ea57b770..dbc01f985edaaacfdcf66fc1a702013002d0a941 100644 --- a/src/main/resources/templates/system/file/main.html +++ b/src/main/resources/templates/system/file/main.html @@ -10,11 +10,11 @@
- +
- +