1

src/main/java/com/fdkankan/tk/controller/DataCountController.java

@@ -85,8 +85,8 @@ public class DataCountController extends BaseController {
                                    @RequestParam(required = false) String endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
-
-        return ResultData.ok(dataCountService.roomDataList(getToken(),roomTitle,startTime,endTime,pageNum,pageSize));
+        Page<RoomListDataVo> page = dataCountService.roomDataList(getToken(), roomTitle, startTime, endTime, pageNum, pageSize);
+        return ResultData.ok(PageInfo.PageInfo(page));
     }
 
     /**
@@ -98,12 +98,12 @@ public class DataCountController extends BaseController {
                        HttpServletRequest request,
                        HttpServletResponse response) throws Exception {
 
-        PageInfo<RoomListDataVo> pageInfo = dataCountService.roomDataList(getToken(), roomTitle, startTime, endTime, 1, 9999);
+        Page<RoomListDataVo> page = dataCountService.roomDataList(getToken(), roomTitle, startTime, endTime, 1, 9999);
 
         ExcelWriter excelWriter = null;
         try {
             excelWriter = EasyExcel.write(response.getOutputStream(),RoomListDataVo.class).build();
-            excelService.commonExport(request,response,"房间数据", (List<?>) pageInfo.getList(),excelWriter);
+            excelService.commonExport(request,response,"房间数据",  page.getRecords(),excelWriter);
 
         }catch (Exception e){
             e.printStackTrace();
@@ -124,8 +124,8 @@ public class DataCountController extends BaseController {
                                    @RequestParam(required = false) String endTime,
                                    @RequestParam(required = false,defaultValue = "1") Integer pageNum,
                                    @RequestParam(required = false,defaultValue = "10") Integer pageSize){
-
-        return ResultData.ok(dataCountService.roomMsgList(getToken(),roomTitle,startTime,endTime,pageNum,pageSize));
+        Page<UserMsgVo> page = dataCountService.roomMsgList(getToken(), roomTitle, startTime, endTime, pageNum, pageSize);
+        return ResultData.ok(PageInfo.PageInfo(page));
     }
 
 
@@ -138,12 +138,12 @@ public class DataCountController extends BaseController {
                             HttpServletRequest request,
                             HttpServletResponse response) throws Exception {
 
-        PageInfo<UserMsgVo> pageInfo = dataCountService.roomMsgList(getToken(), roomTitle, startTime, endTime, 1, 9999);
+        Page<UserMsgVo> pageInfo = dataCountService.roomMsgList(getToken(), roomTitle, startTime, endTime, 1, 9999);
 
         ExcelWriter excelWriter = null;
         try {
             excelWriter = EasyExcel.write(response.getOutputStream(),UserMsgVo.class).build();
-            excelService.commonExport(request,response,"房间留言", (List<?>) pageInfo.getList(),excelWriter);
+            excelService.commonExport(request,response,"房间留言", pageInfo.getRecords(),excelWriter);
 
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/fdkankan/tk/service/DataCountService.java

@@ -1,8 +1,5 @@
 package com.fdkankan.tk.service;
 import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.tk.common.PageInfo;
 import com.fdkankan.tk.common.util.JwtUtil;
@@ -10,16 +7,12 @@ import com.fdkankan.tk.entity.*;
 import com.fdkankan.tk.response.*;
 import com.fdkankan.tk.util.DataCountUtil;
 import com.fdkankan.tk.util.Dateutils;
-import com.google.common.collect.Lists;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -176,7 +169,7 @@ public class DataCountService {
         return dataCounts;
     }
 
-    public PageInfo<RoomListDataVo> roomDataList(String token,String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
+    public Page<RoomListDataVo> roomDataList(String token, String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
         startTime = Dateutils.formatStartTime(startTime);
         endTime = Dateutils.formatEndTime(endTime);
 
@@ -258,10 +251,10 @@ public class DataCountService {
         Page<RoomListDataVo> pageVo = new Page<>(pageNum,pageSize);
         pageVo.setRecords(voList);
         pageVo.setTotal(page.getTotal());
-        return PageInfo.PageInfo(pageVo);
+        return pageVo;
     }
 
-    public PageInfo<UserMsgVo> roomMsgList(String token ,String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
+    public Page<UserMsgVo> roomMsgList(String token ,String roomTitle, String startTime, String endTime, Integer pageNum, Integer pageSize) {
         List<Room> roomList = roomService.getRoomByToken(token);
         List<String> roomIdsDb = roomList.stream().map(Room::getRoomId).collect(Collectors.toList());
         List<String> roomIds = roomIdsDb;
@@ -274,7 +267,7 @@ public class DataCountService {
             }
         }
         if(roomIds.isEmpty()){
-            return  PageInfo.PageInfo(new Page<>(pageNum,pageSize));
+            return  new Page<>(pageNum,pageSize);
         }
 
         startTime = Dateutils.formatStartTime(startTime);
@@ -322,7 +315,7 @@ public class DataCountService {
             record.setTextCount(Long.valueOf(danmakus.size()));
             record.setTexts(collect);
         }
-        return PageInfo.PageInfo(page);
+        return page;
     }