From d7df6ff222c5be9d5ae0472c5b86aed397bb90f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sat, 22 Oct 2022 17:09:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0oracle=E7=8E=AF=E5=A2=83=E4=B8=8B=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97=E5=8F=8A=E7=AB=99=E5=86=85?= =?UTF-8?q?=E4=BF=A1=E9=97=AE=E9=A2=98=20#I5WOWD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dev/modular/log/provider/DevLogApiProvider.java | 13 +++++++++---- .../message/service/impl/DevMessageServiceImpl.java | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/provider/DevLogApiProvider.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/provider/DevLogApiProvider.java index 82bb0fad..611ddd9d 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/provider/DevLogApiProvider.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/provider/DevLogApiProvider.java @@ -17,6 +17,7 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import vip.xiaonuo.auth.core.util.StpLoginUserUtil; +import vip.xiaonuo.common.page.CommonPageRequest; import vip.xiaonuo.dev.api.DevLogApi; import vip.xiaonuo.dev.modular.log.entity.DevLog; import vip.xiaonuo.dev.modular.log.enums.DevLogCategoryEnum; @@ -51,15 +52,19 @@ public class DevLogApiProvider implements DevLogApi { @Override public List currentUserVisLogList() { - return devLogService.list(new LambdaQueryWrapper().eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName()) + return devLogService.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper() + .eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName()) .in(DevLog::getCategory, DevLogCategoryEnum.LOGIN.getValue(), DevLogCategoryEnum.LOGOUT.getValue()) - .last("limit 0, 10").orderByDesc(DevLog::getCreateTime)).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); + .orderByDesc(DevLog::getCreateTime)) + .getRecords().stream().map(JSONUtil::parseObj).collect(Collectors.toList()); } @Override public List currentUserOpLogList() { - return devLogService.list(new LambdaQueryWrapper().eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName()) + return devLogService.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper() + .eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName()) .in(DevLog::getCategory, DevLogCategoryEnum.OPERATE.getValue(), DevLogCategoryEnum.EXCEPTION.getValue()) - .last("limit 0, 10").orderByDesc(DevLog::getCreateTime)).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); + .orderByDesc(DevLog::getCreateTime)) + .getRecords().stream().map(JSONUtil::parseObj).collect(Collectors.toList()); } } diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java index 7173d1c5..dd3698a6 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java @@ -145,8 +145,7 @@ public class DevMessageServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(DevMessage::getId, messageIdList).orderByDesc(DevMessage::getCreateTime); - lambdaQueryWrapper.last("limit 0, " + devMessageListParam.getLimit()); - return this.list(lambdaQueryWrapper); + return this.page(CommonPageRequest.defaultPage(),lambdaQueryWrapper).getRecords(); } return CollectionUtil.newArrayList(); }