diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java index bb4594e97..17e8b8745 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/register/RegistryController.java @@ -96,8 +96,8 @@ public class RegistryController extends AbstractQueueController { @ResponseBody public CommonGetAllResponse getByFilter(@RequestParam(name = "designation", required = false) Optional> designations, @RequestParam(name = "status", required = false) Optional status, - @RequestParam(name = "pageSize") Integer pageSize, - @RequestParam(name = "pageIndex") Integer pageIndex) { + @RequestParam(name = "pageSize", required = false) Optional pageSize, + @RequestParam(name = "pageIndex", required = false) Optional pageIndex) { if (designations.isEmpty() && status.isEmpty()) { throw new ResponseStatusException(HttpStatus.NOT_ACCEPTABLE, "Request should have at least one of the parameters: designation, status"); } @@ -115,11 +115,13 @@ public class RegistryController extends AbstractQueueController { .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_ACCEPTABLE, "Unknown registry status: " + s)) .getKey()))); - Collection> all = stateLoader.getAllMetaTransformWithPagination(IMDGDistributedNames.Map_Registry, + Collection> all = pageSize.isPresent() ? + stateLoader.getAllMetaTransformWithPagination(IMDGDistributedNames.Map_Registry, Registry.class, predicateBuilder.and(filters.toArray(ImdgPredicate[]::new)), - pageSize, - pageIndex); + pageSize.get(), + pageIndex.orElse(1)) : + stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_Registry, Registry.class, predicateBuilder.and(filters.toArray(ImdgPredicate[]::new))); sw.stop(); log.info("Info select and format {} data took {} ms", all.size(), sw.getLastTaskTimeMillis());