diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/src/main/java/com/wabestway/recall/web/OrderController.java index 628d35a..41f5dda 100644 --- a/src/main/java/com/wabestway/recall/web/OrderController.java +++ b/src/main/java/com/wabestway/recall/web/OrderController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.ArrayList; import java.util.List; @@ -33,6 +34,7 @@ public class OrderController { @PostMapping("/list") public Mono list(@RequestBody Order order) { OrderList resList = new OrderList(); + List list = new ArrayList<>(); PageRequest pageRequest = PageRequest.of(order.getPage(), order.getPageSize()); ExampleMatcher matcher = ExampleMatcher.matching() .withIgnoreNullValues().withIgnorePaths("createAt", "last"); @@ -42,11 +44,16 @@ public class OrderController { 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.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).subscribe(f -> { + list.add(f); }); + resList.setList(list); +// Mono> listMono = flux.skip(pageRequest.getOffset()).limitRequest(pageRequest.getPageSize()).collectList(); +// return listMono.flatMap(list -> { +// resList.setList(list); +// return Mono.just(ResObj.ok(resList)); +// }); + return Mono.just(ResObj.ok(resList)); } @PostMapping("/info/{orderId}")