From 905b30f531be71118bb079e95deb2681d1189625 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Wed, 13 Jan 2021 13:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/db/DbLogManagerServiceImpl.java | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java index 87679d3cf..6c1041e09 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java @@ -3,6 +3,7 @@ package cn.stylefeng.roses.kernel.log.db; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.log.api.LogManagerApi; @@ -18,9 +19,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; -import static cn.stylefeng.roses.kernel.log.api.constants.LogConstants.DEFAULT_BEGIN_PAGE_NO; -import static cn.stylefeng.roses.kernel.log.api.constants.LogConstants.DEFAULT_PAGE_SIZE; - /** * 日志管理，数据库实现 * @@ -48,17 +46,14 @@ public class DbLogManagerServiceImpl implements LogManagerApi { return new PageResult<>(); } - // 创建默认的请求方法 - createDefaultLogManagerParam(logManagerParam); - LambdaQueryWrapper sysLogLambdaQueryWrapper = new LambdaQueryWrapper<>(); // 创建查询条件 createQueryCondition(logManagerParam, sysLogLambdaQueryWrapper); // 查询分页结果 - Page sysLogPage = new Page<>(logManagerParam.getPageNo(), logManagerParam.getPageSize()); - Page page = sysLogService.page(sysLogPage, sysLogLambdaQueryWrapper); + Page objectPage = PageFactory.defaultPage(); + Page page = sysLogService.page(objectPage, sysLogLambdaQueryWrapper); PageResult pageResult = PageResultFactory.createPageResult(page); PageResult logRecordDtoPageResult = new PageResult<>(); @@ -160,25 +155,4 @@ public class DbLogManagerServiceImpl implements LogManagerApi { sysLogLambdaQueryWrapper.orderByDesc(SysLog::getCreateTime); } - /** - * 创建默认的请求方法 - * - * @param logManagerParam 日志管理的查询参数 - * @author luojie - * @date 2020/11/3 11:20 - */ - private void createDefaultLogManagerParam(LogManagerParam logManagerParam) { - - // 默认从第一页开始 - if (logManagerParam.getPageNo() == null) { - logManagerParam.setPageNo(DEFAULT_BEGIN_PAGE_NO); - } - - // 默认每页10条 - if (logManagerParam.getPageSize() == null) { - logManagerParam.setPageSize(DEFAULT_PAGE_SIZE); - } - - } - }