From ae677c1b66c1d69ce6d966a6e627092a6d02fc40 Mon Sep 17 00:00:00 2001
From: BrandWang <rj090123@163.com>
Date: Mon, 27 Mar 2023 16:18:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E5=8F=AF?=
 =?UTF-8?q?=E5=9B=9E=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改分页查询
---
 .../wabestway/recall/web/OrderController.java   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/src/main/java/com/wabestway/recall/web/OrderController.java
index 3c8819f..628d35a 100644
--- a/src/main/java/com/wabestway/recall/web/OrderController.java
+++ b/src/main/java/com/wabestway/recall/web/OrderController.java
@@ -39,19 +39,14 @@ public class OrderController {
 
         Example<Order> ep = Example.of(order, matcher);
         Sort s = Sort.by("createAt");
-        Mono<Page<Order>> pres = orderRepository.findAll(ep, pageRequest);
-        return pres.flatMap(p -> {
-            resList.setTotal(p.getTotalElements());
-            resList.setList(p.getContent());
+
+        Flux<Order> flux = orderRepository.findAll(ep, s);
+        flux.count().subscribe(c -> resList.setTotal(c));
+        Mono<List<Order>> listMono = flux.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).collectList();
+        return listMono.flatMap(list -> {
+            resList.setList(list);
             return Mono.just(ResObj.ok(resList));
         });
-//        Flux<Order> flux = orderRepository.findAll(ep, s).skip(pageRequest.getOffset()).limitRate(pageRequest.getPageSize());
-//
-//        Mono<List<Order>> listMono = flux.collectList();
-//        return listMono.flatMap(list -> {
-//            resList.setList(list);
-//            return Mono.just(ResObj.ok(resList));
-//        });
     }
 
     @PostMapping("/info/{orderId}")