diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java index cc0602b3e..eb0c2d3e7 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java @@ -1,6 +1,5 @@ package cn.stylefeng.roses.kernel.system.modular.home.controller; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; @@ -36,20 +35,9 @@ public class HomePageController { * @author xixiaowei * @date 2022/1/25 14:52 */ - @GetResource(name = "查询动态列表", path = "/homePage/getDynamicList") - public ResponseData> getDynamicList(LogManagerRequest logManagerRequest) { - return new SuccessResponseData<>(homePageService.getDynamicList(logManagerRequest)); - } - - /** - * 查询动态列表(分页) - * - * @author xixiaowei - * @date 2022/1/25 10:00 - */ - @GetResource(name = "查询动态列表(分页)", path = "/homePage/getDynamicPage") - public ResponseData> getDynamicPage(LogManagerRequest logManagerRequest) { - return new SuccessResponseData<>(homePageService.getDynamicPage(logManagerRequest)); + @GetResource(name = "查询动态列表", path = "/homePage/getRecentLogs", requiredPermission = false) + public ResponseData> getRecentLogs(LogManagerRequest logManagerRequest) { + return new SuccessResponseData<>(homePageService.getRecentLogs(logManagerRequest)); } /** diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java index 8f813a666..3946f4805 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java @@ -1,6 +1,5 @@ package cn.stylefeng.roses.kernel.system.modular.home.service; -import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.system.api.pojo.home.HomeCompanyInfo; @@ -26,15 +25,7 @@ public interface HomePageService extends IService { * @author xixiaowei * @date 2022/1/25 14:48 */ - List getDynamicList(LogManagerRequest logManagerRequest); - - /** - * 查询动态列表(分页) - * - * @author xixiaowei - * @date 2022/1/25 9:43 - */ - PageResult getDynamicPage(LogManagerRequest logManagerRequest); + List getRecentLogs(LogManagerRequest logManagerRequest); /** * 获取在线用户列表 diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java index 6fd9c63c1..643e42844 100644 --- a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java +++ b/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/Impl/HomePageServiceImpl.java @@ -68,21 +68,9 @@ public class HomePageServiceImpl extends ServiceImpl getDynamicList(LogManagerRequest logManagerRequest) { - List logRecordDTOS = logManagerApi.findList(logManagerRequest); - - // 当查询数据大于20条 - if (logRecordDTOS.size() > 20) { - return logRecordDTOS.subList(0, 19); - } - - // 查询数据不大于20条 - return logRecordDTOS; - } - - @Override - public PageResult getDynamicPage(LogManagerRequest logManagerRequest) { - return logManagerApi.findPage(logManagerRequest); + public List getRecentLogs(LogManagerRequest logManagerRequest) { + PageResult page = logManagerApi.findPage(logManagerRequest); + return page.getRows(); } @Override