Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9c8900b

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
add pagination to library query
1 parent352e746 commit9c8900b

File tree

8 files changed

+36
-18
lines changed

8 files changed

+36
-18
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
importjava.util.List;
44

5+
importorg.lowcoder.api.framework.view.PageResponseView;
56
importorg.lowcoder.api.framework.view.ResponseView;
67
importorg.lowcoder.api.query.view.LibraryQueryAggregateView;
78
importorg.lowcoder.api.query.view.LibraryQueryPublishRequest;
@@ -19,8 +20,11 @@
1920
importorg.springframework.web.bind.annotation.RequestParam;
2021
importorg.springframework.web.bind.annotation.RestController;
2122

23+
importreactor.core.publisher.Flux;
2224
importreactor.core.publisher.Mono;
2325

26+
importstaticorg.lowcoder.api.util.Pagination.fluxToPageResponseView;
27+
2428
@RestController
2529
publicclassLibraryQueryControllerimplementsLibraryQueryEndpoints
2630
{
@@ -41,9 +45,12 @@ public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList(@Request
4145
}
4246

4347
@Override
44-
publicMono<ResponseView<List<LibraryQueryView>>>list(@RequestParam(required =false,defaultValue ="")Stringname) {
45-
returnlibraryQueryApiService.listLibraryQueries(name)
46-
.map(ResponseView::success);
48+
publicMono<PageResponseView<?>>list(@RequestParam(required =false,defaultValue ="")Stringname,
49+
@RequestParam(required =false,defaultValue ="0")intpageNum,
50+
@RequestParam(required =false,defaultValue ="100")intpageSize) {
51+
varflux =libraryQueryApiService.listLibraryQueries(name)
52+
.flatMapMany(Flux::fromIterable);
53+
returnfluxToPageResponseView(pageNum,pageSize,flux);
4754
}
4855

4956
@Override

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
importjava.util.List;
66

7+
importorg.lowcoder.api.framework.view.PageResponseView;
78
importorg.lowcoder.api.framework.view.ResponseView;
89
importorg.lowcoder.api.query.view.LibraryQueryAggregateView;
910
importorg.lowcoder.api.query.view.LibraryQueryPublishRequest;
@@ -38,7 +39,9 @@ public interface LibraryQueryEndpoints
3839
description ="Retrieve a list of Library Queries for a specific Organization within Lowcoder."
3940
)
4041
@GetMapping("/listByOrg")
41-
publicMono<ResponseView<List<LibraryQueryView>>>list(@RequestParam(required =false,defaultValue ="")Stringname);
42+
publicMono<PageResponseView<?>>list(@RequestParam(required =false,defaultValue ="")Stringname,
43+
@RequestParam(required =false,defaultValue ="0")intpageNum,
44+
@RequestParam(required =false,defaultValue ="100")intpageSize);
4245

4346
@Operation(
4447
tags =TAG_LIBRARY_QUERY_MANAGEMENT,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
importjava.util.List;
44
importjava.util.Map;
55

6+
importorg.lowcoder.api.framework.view.PageResponseView;
67
importorg.lowcoder.api.framework.view.ResponseView;
78
importorg.lowcoder.api.query.view.LibraryQueryRecordMetaView;
89
importorg.lowcoder.domain.query.model.LibraryQueryCombineId;
@@ -11,8 +12,11 @@
1112
importorg.springframework.web.bind.annotation.RestController;
1213

1314
importlombok.RequiredArgsConstructor;
15+
importreactor.core.publisher.Flux;
1416
importreactor.core.publisher.Mono;
1517

18+
importstaticorg.lowcoder.api.util.Pagination.fluxToPageResponseView;
19+
1620
@RequiredArgsConstructor
1721
@RestController
1822
publicclassLibraryQueryRecordControllerimplementsLibraryQueryRecordEndpoints
@@ -25,9 +29,10 @@ public Mono<Void> delete(@PathVariable String libraryQueryRecordId) {
2529
}
2630

2731
@Override
28-
publicMono<ResponseView<List<LibraryQueryRecordMetaView>>>getByLibraryQueryId(@RequestParam(name ="libraryQueryId")StringlibraryQueryId) {
29-
returnlibraryQueryRecordApiService.getByLibraryQueryId(libraryQueryId)
30-
.map(ResponseView::success);
32+
publicMono<PageResponseView<?>>getByLibraryQueryId(@RequestParam(name ="libraryQueryId")StringlibraryQueryId,
33+
@RequestParam(required =false,defaultValue ="0")intpageNum,
34+
@RequestParam(required =false,defaultValue ="100")intpageSize) {
35+
returnfluxToPageResponseView(pageNum,pageSize,libraryQueryRecordApiService.getByLibraryQueryId(libraryQueryId).flatMapMany(Flux::fromIterable));
3136
}
3237

3338
@Override

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordEndpoints.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
importjava.util.List;
66
importjava.util.Map;
77

8+
importorg.lowcoder.api.framework.view.PageResponseView;
89
importorg.lowcoder.api.framework.view.ResponseView;
910
importorg.lowcoder.api.query.view.LibraryQueryRecordMetaView;
1011
importorg.springframework.web.bind.annotation.DeleteMapping;
@@ -39,7 +40,9 @@ public interface LibraryQueryRecordEndpoints
3940
description ="Retrieve a specific Library Query Record within Lowcoder using the associated library query ID."
4041
)
4142
@GetMapping("/listByLibraryQueryId")
42-
publicMono<ResponseView<List<LibraryQueryRecordMetaView>>>getByLibraryQueryId(@RequestParam(name ="libraryQueryId")StringlibraryQueryId);
43+
publicMono<PageResponseView<?>>getByLibraryQueryId(@RequestParam(name ="libraryQueryId")StringlibraryQueryId,
44+
@RequestParam(required =false,defaultValue ="0")intpageNum,
45+
@RequestParam(required =false,defaultValue ="100")intpageSize);
4346

4447
@Operation(
4548
tags =TAG_LIBRARY_QUERY_RECORDS,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,10 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
119119

120120
@Override
121121
publicMono<ResponseView<GroupMemberAggregateView>>getGroupMembers(@PathVariableStringgroupId,
122-
@RequestParam(name ="page",required =false,defaultValue ="0")intpage,
123-
@RequestParam(name ="count",required =false,defaultValue ="100")intcount) {
122+
@RequestParam(required =false,defaultValue ="0")intpageNum,
123+
@RequestParam(required =false,defaultValue ="100")intpageSize) {
124124
StringobjectId =gidService.convertGroupIdToObjectId(groupId);
125-
returngroupApiService.getGroupMembers(objectId,page,count)
125+
returngroupApiService.getGroupMembers(objectId,pageNum,pageSize)
126126
.map(ResponseView::success);
127127
}
128128

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupEndpoints.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
7474
)
7575
@GetMapping("/{groupId}/members")
7676
publicMono<ResponseView<GroupMemberAggregateView>>getGroupMembers(@PathVariableStringgroupId,
77-
@RequestParam(name ="page",required =false,defaultValue ="0")intpage,
78-
@RequestParam(name ="count",required =false,defaultValue ="100")intcount);
77+
@RequestParam(required =false,defaultValue ="0")intpageNum,
78+
@RequestParam(required =false,defaultValue ="100")intpageSize);
7979

8080
@Operation(
8181
tags =TAG_GROUP_MEMBERS,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ public Mono<ResponseView<Boolean>> deleteLogo(@PathVariable String orgId) {
9090

9191
@Override
9292
publicMono<ResponseView<OrgMemberListView>>getOrgMembers(@PathVariableStringorgId,
93-
@RequestParam(name ="page",required =false,defaultValue ="0")intpage,
94-
@RequestParam(name ="count",required =false,defaultValue ="1000")intcount) {
93+
@RequestParam(required =false,defaultValue ="0")intpageNum,
94+
@RequestParam(required =false,defaultValue ="1000")intpageSize) {
9595
Stringid =gidService.convertOrganizationIdToObjectId(orgId);
96-
returnorgApiService.getOrganizationMembers(id,page,count)
96+
returnorgApiService.getOrganizationMembers(id,pageNum,pageSize)
9797
.map(ResponseView::success);
9898
}
9999

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public Mono<ResponseView<Boolean>> uploadLogo(@PathVariable String orgId,
9595
)
9696
@GetMapping("/{orgId}/members")
9797
publicMono<ResponseView<OrgMemberListView>>getOrgMembers(@PathVariableStringorgId,
98-
@RequestParam(name ="page",required =false,defaultValue ="0")intpage,
99-
@RequestParam(name ="count",required =false,defaultValue ="1000")intcount);
98+
@RequestParam(required =false,defaultValue ="0")intpageNum,
99+
@RequestParam(required =false,defaultValue ="1000")intpageSize);
100100

101101
@Operation(
102102
tags =TAG_ORGANIZATION_MEMBERS,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp