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 ep = Example.of(order, matcher); Sort s = Sort.by("createAt"); - Mono> pres = orderRepository.findAll(ep, pageRequest); - return pres.flatMap(p -> { - resList.setTotal(p.getTotalElements()); - resList.setList(p.getContent()); + + Flux flux = orderRepository.findAll(ep, s); + flux.count().subscribe(c -> resList.setTotal(c)); + Mono> listMono = flux.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).collectList(); + return listMono.flatMap(list -> { + resList.setList(list); return Mono.just(ResObj.ok(resList)); }); -// Flux flux = orderRepository.findAll(ep, s).skip(pageRequest.getOffset()).limitRate(pageRequest.getPageSize()); -// -// Mono> listMono = flux.collectList(); -// return listMono.flatMap(list -> { -// resList.setList(list); -// return Mono.just(ResObj.ok(resList)); -// }); } @PostMapping("/info/{orderId}")