From a442c90950fbf2bee2a5b1f4d3a9e27dea59022f Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 11 Feb 2022 14:23:07 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E3=80=90statistics?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E5=8F=AA=E6=9F=A5=E8=AF=A2=E6=9C=AC?= =?UTF-8?q?=E4=BA=BA=E7=9A=84=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/modular/home/controller/HomePageController.java | 5 ++--- .../system/modular/home/service/HomePageService.java | 3 +-- .../modular/home/service/Impl/HomePageServiceImpl.java | 7 ++++++- 3 files changed, 9 insertions(+), 6 deletions(-) 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 eb0c2d3e7..436628375 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.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.api.pojo.record.LogRecordDTO; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; @@ -36,8 +35,8 @@ public class HomePageController { * @date 2022/1/25 14:52 */ @GetResource(name = "查询动态列表", path = "/homePage/getRecentLogs", requiredPermission = false) - public ResponseData> getRecentLogs(LogManagerRequest logManagerRequest) { - return new SuccessResponseData<>(homePageService.getRecentLogs(logManagerRequest)); + public ResponseData> getRecentLogs() { + return new SuccessResponseData<>(homePageService.getRecentLogs()); } /** 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 3946f4805..34c85bb43 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.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; import cn.stylefeng.roses.kernel.system.api.pojo.resource.ResourceRequest; @@ -25,7 +24,7 @@ public interface HomePageService extends IService { * @author xixiaowei * @date 2022/1/25 14:48 */ - List getRecentLogs(LogManagerRequest logManagerRequest); + List getRecentLogs(); /** * 获取在线用户列表 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 643e42844..7dae48603 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,7 +68,12 @@ public class HomePageServiceImpl extends ServiceImpl getRecentLogs(LogManagerRequest logManagerRequest) { + public List getRecentLogs() { + + // 只查询当前用户的 + LogManagerRequest logManagerRequest = new LogManagerRequest(); + logManagerRequest.setUserId(LoginContext.me().getLoginUser().getUserId()); + PageResult page = logManagerApi.findPage(logManagerRequest); return page.getRows(); }