【7.1.6】【statistics】更新最近动态

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")
+    @GetResource(name = "查询动态列表", path = "/homePage/getRecentLogs", requiredPermission = false)
-    public ResponseData<List<LogRecordDTO>> getDynamicList(LogManagerRequest logManagerRequest) {
+    public ResponseData<List<LogRecordDTO>> getRecentLogs(LogManagerRequest logManagerRequest) {
-        return new SuccessResponseData<>(homePageService.getDynamicList(logManagerRequest));
+        return new SuccessResponseData<>(homePageService.getRecentLogs(logManagerRequest));
-    }
-
-    /**
-     * 查询动态列表(分页)
-     *
-     * @author xixiaowei
-     * @date 2022/1/25 10:00
-     */
-    @GetResource(name = "查询动态列表(分页)", path = "/homePage/getDynamicPage")
-    public ResponseData<PageResult<LogRecordDTO>> getDynamicPage(LogManagerRequest logManagerRequest) {
-        return new SuccessResponseData<>(homePageService.getDynamicPage(logManagerRequest));
     }
 
     /**

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<InterfaceStatistics> {
      * @author xixiaowei
      * @date 2022/1/25 14:48
      */
-    List<LogRecordDTO> getDynamicList(LogManagerRequest logManagerRequest);
+    List<LogRecordDTO> getRecentLogs(LogManagerRequest logManagerRequest);
-
-    /**
-     * 查询动态列表(分页)
-     *
-     * @author xixiaowei
-     * @date 2022/1/25 9:43
-     */
-    PageResult<LogRecordDTO> getDynamicPage(LogManagerRequest logManagerRequest);
 
     /**
      * 获取在线用户列表

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<InterfaceStatisticsMapper,
     private SysStatisticsCountService sysStatisticsCountService;
 
     @Override
-    public List<LogRecordDTO> getDynamicList(LogManagerRequest logManagerRequest) {
+    public List<LogRecordDTO> getRecentLogs(LogManagerRequest logManagerRequest) {
-        List<LogRecordDTO> logRecordDTOS = logManagerApi.findList(logManagerRequest);
+        PageResult<LogRecordDTO> page = logManagerApi.findPage(logManagerRequest);
-
+        return page.getRows();
-        // 当查询数据大于20条
-        if (logRecordDTOS.size() > 20) {
-            return logRecordDTOS.subList(0, 19);
-        }
-
-        // 查询数据不大于20条
-        return logRecordDTOS;
-    }
-
-    @Override
-    public PageResult<LogRecordDTO> getDynamicPage(LogManagerRequest logManagerRequest) {
-        return logManagerApi.findPage(logManagerRequest);
     }
 
     @Override