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(); }