From 75e9aad73f07263789335a803e067b33c743f80d Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 21 Aug 2025 20:16:08 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/StockServiceImpl.java |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/StockServiceImpl.java b/src/main/java/com/nq/service/impl/StockServiceImpl.java
index a5cc2db..ab57529 100644
--- a/src/main/java/com/nq/service/impl/StockServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockServiceImpl.java
@@ -169,21 +169,45 @@
         return ServerResponse.createBySuccess(pageInfo);
     }
 
+//    @Override
+//    public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
+//        List<Stock> stockList = new ArrayList<>();
+//        PageHelper.startPage(pageNum, pageSize);
+//        stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+//        List<StockListVO> stockListVOS = Lists.newArrayList();
+//        if (stockList.size() > 0){
+//            stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
+//        }
+//        RPageInfo pageInfo = new RPageInfo();
+//        pageInfo.setList(stockListVOS);
+//        pageInfo.setStockType(stockType);
+//        pageInfo.setTotal(stockListVOS.size());
+//
+//        return ServerResponse.createBySuccess(pageInfo);
+//    }
+
     @Override
     public ServerResponse getStockByType(int pageNum, int pageSize, String orderBy, String keyWords, String stockType, HttpServletRequest request) {
-        List<Stock> stockList = new ArrayList<>();
+        // 启动分页
         PageHelper.startPage(pageNum, pageSize);
-        stockList.addAll(stockMapper.findStockByType(orderBy,stockType,keyWords));
+
+        // 查询数据(此时返回的已经是分页后的数据)
+        List<Stock> stockList = stockMapper.findStockByType(orderBy, stockType, keyWords);
+
+        // 获取分页信息
+        PageInfo<Stock> pageInfo = new PageInfo<>(stockList);
+
         List<StockListVO> stockListVOS = Lists.newArrayList();
-        if (stockList.size() > 0){
+        if (stockList.size() > 0) {
             stockListVOS.addAll(Objects.requireNonNull(StockApi.getStockReailTimes(stockList)));
         }
-        RPageInfo pageInfo = new RPageInfo();
-        pageInfo.setList(stockListVOS);
-        pageInfo.setStockType(stockType);
-        pageInfo.setTotal(stockListVOS.size());
 
-        return ServerResponse.createBySuccess(pageInfo);
+        RPageInfo rPageInfo = new RPageInfo();
+        rPageInfo.setList(stockListVOS);
+        rPageInfo.setStockType(stockType);
+        rPageInfo.setTotal(pageInfo.getTotal());  // 使用 PageInfo 中的总条数
+
+        return ServerResponse.createBySuccess(rPageInfo);
     }
 
     @Override

--
Gitblit v1.9.3