diff --git a/src/main/java/com/wabestway/recall/model/OrderList.java b/src/main/java/com/wabestway/recall/model/OrderList.java new file mode 100644 index 0000000..76e53cf --- /dev/null +++ b/src/main/java/com/wabestway/recall/model/OrderList.java @@ -0,0 +1,13 @@ +package com.wabestway.recall.model; + +import lombok.Data; + +import java.util.List; + +@Data +public class OrderList { + private int page; + private int pageSize; + private int total; + private List list; +} diff --git a/src/main/java/com/wabestway/recall/web/OrderController.java b/src/main/java/com/wabestway/recall/web/OrderController.java index 798c25e..cbe6fbe 100644 --- a/src/main/java/com/wabestway/recall/web/OrderController.java +++ b/src/main/java/com/wabestway/recall/web/OrderController.java @@ -1,6 +1,7 @@ package com.wabestway.recall.web; import com.wabestway.recall.model.Order; +import com.wabestway.recall.model.OrderList; import com.wabestway.recall.model.Record; import com.wabestway.recall.model.ResObj; import com.wabestway.recall.repository.OrderRepository; @@ -30,7 +31,7 @@ public class OrderController { } @PostMapping("/list") - public Flux list(@RequestBody Order order) { + public Mono list(@RequestBody Order order) { PageRequest pageRequest = PageRequest.of(0, 1); ExampleMatcher matcher = ExampleMatcher.matching() .withIgnoreNullValues().withIgnorePaths("createAt", "last"); @@ -39,7 +40,11 @@ public class OrderController { Sort s = Sort.by("createAt"); // Mono> listMono = flux.collectList(); // listMono.subscribe(list -> System.out.println(list)); - return orderRepository.findAll(ep, s).skip(pageRequest.getOffset()).limitRate(pageRequest.getPageSize()); + Flux flux = orderRepository.findAll(ep, s).skip(pageRequest.getOffset()).limitRate(pageRequest.getPageSize()); + OrderList resList = new OrderList(); + Mono> listMono = flux.collectList(); + listMono.subscribe(list -> resList.setList(list)); + return Mono.just(ResObj.ok(resList)); } @PostMapping("/info/{orderId}")