diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/src/main/java/com/wabestway/recall/web/OrderController.java index 41f5dda..621191f 100644 --- a/src/main/java/com/wabestway/recall/web/OrderController.java +++ b/src/main/java/com/wabestway/recall/web/OrderController.java @@ -35,18 +35,14 @@ public class OrderController { public Mono list(@RequestBody Order order) { OrderList resList = new OrderList(); List list = new ArrayList<>(); - PageRequest pageRequest = PageRequest.of(order.getPage(), order.getPageSize()); + Sort s = Sort.by("createAt"); + PageRequest pageRequest = PageRequest.of(order.getPage(), order.getPageSize(), s); ExampleMatcher matcher = ExampleMatcher.matching() .withIgnoreNullValues().withIgnorePaths("createAt", "last"); - Example ep = Example.of(order, matcher); - Sort s = Sort.by("createAt"); - Flux flux = orderRepository.findAll(ep, s); - flux.count().subscribe(c -> resList.setTotal(c)); - flux.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).subscribe(f -> { - list.add(f); - }); + flux.count().subscribe(resList::setTotal);//c -> resList.setTotal(c) + flux.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).subscribe(list::add); resList.setList(list); // Mono> listMono = flux.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).collectList(); // return listMono.flatMap(list -> {