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

Commit352e746

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
add pagination to datasource
1 parent82c64d7 commit352e746

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
importorg.apache.commons.collections4.CollectionUtils;
88
importorg.apache.commons.lang3.BooleanUtils;
99
importorg.apache.commons.lang3.StringUtils;
10+
importorg.lowcoder.api.framework.view.PageResponseView;
1011
importorg.lowcoder.api.framework.view.ResponseView;
1112
importorg.lowcoder.api.permission.view.CommonPermissionView;
1213
importorg.lowcoder.api.util.BusinessEventPublisher;
@@ -29,6 +30,7 @@
2930
importjava.util.List;
3031
importjava.util.Locale;
3132

33+
importstaticorg.lowcoder.api.util.Pagination.fluxToPageResponseView;
3234
importstaticorg.lowcoder.plugin.api.event.LowcoderEvent.EventType.*;
3335
importstaticorg.lowcoder.sdk.exception.BizError.INVALID_PARAMETER;
3436
importstaticorg.lowcoder.sdk.util.ExceptionUtils.ofError;
@@ -116,11 +118,11 @@ public Mono<ResponseView<DatasourceStructure>> getStructure(@PathVariable String
116118
* name, type... and the plugin definition of it, excluding the detail configs such as the connection uri, password...
117119
*/
118120
@Override
119-
publicMono<ResponseView<List<Datasource>>>listJsDatasourcePlugins(@RequestParam("appId")StringapplicationId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype) {
121+
publicMono<PageResponseView<?>>listJsDatasourcePlugins(@RequestParam("appId")StringapplicationId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype,
122+
@RequestParam(required =false,defaultValue ="0")intpageNum,
123+
@RequestParam(required =false,defaultValue ="0")intpageSize) {
120124
StringobjectId =gidService.convertApplicationIdToObjectId(applicationId);
121-
returndatasourceApiService.listJsDatasourcePlugins(objectId,name,type)
122-
.collectList()
123-
.map(ResponseView::success);
125+
returnfluxToPageResponseView(pageNum,pageSize,datasourceApiService.listJsDatasourcePlugins(objectId,name,type));
124126
}
125127

126128
/**
@@ -139,26 +141,26 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
139141

140142
@SneakyThrows
141143
@Override
142-
publicMono<ResponseView<List<DatasourceView>>>listOrgDataSources(@RequestParam(name ="orgId")StringorgId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype) {
144+
publicMono<PageResponseView<?>>listOrgDataSources(@RequestParam(name ="orgId")StringorgId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype,
145+
@RequestParam(required =false,defaultValue ="0")intpageNum,
146+
@RequestParam(required =false,defaultValue ="0")intpageSize) {
143147
if (StringUtils.isBlank(orgId)) {
144148
returnofError(BizError.INVALID_PARAMETER,"ORG_ID_EMPTY");
145149
}
146150
StringobjectId =gidService.convertOrganizationIdToObjectId(orgId);
147-
returndatasourceApiService.listOrgDataSources(objectId,name,type)
148-
.collectList()
149-
.map(ResponseView::success);
151+
returnfluxToPageResponseView(pageNum,pageSize,datasourceApiService.listOrgDataSources(objectId,name,type));
150152
}
151153

152154
@Override
153-
publicMono<ResponseView<List<DatasourceView>>>listAppDataSources(@RequestParam(name ="appId")StringapplicationId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype) {
155+
publicMono<PageResponseView<?>>listAppDataSources(@RequestParam(name ="appId")StringapplicationId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype,
156+
@RequestParam(required =false,defaultValue ="0")intpageNum,
157+
@RequestParam(required =false,defaultValue ="0")intpageSize) {
154158
if (StringUtils.isBlank(applicationId)) {
155159
returnofError(BizError.INVALID_PARAMETER,"INVALID_APP_ID");
156160
}
157161
StringobjectId =gidService.convertApplicationIdToObjectId(applicationId);
158162

159-
returndatasourceApiService.listAppDataSources(objectId,name,type)
160-
.collectList()
161-
.map(ResponseView::success);
163+
returnfluxToPageResponseView(pageNum,pageSize,datasourceApiService.listAppDataSources(objectId,name,type));
162164
}
163165

164166
@Override

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
importio.swagger.v3.oas.annotations.Operation;
55
importjakarta.annotation.Nullable;
66
importjakarta.validation.Valid;
7+
importorg.lowcoder.api.framework.view.PageResponseView;
78
importorg.lowcoder.api.framework.view.ResponseView;
89
importorg.lowcoder.api.permission.view.CommonPermissionView;
910
importorg.lowcoder.domain.datasource.model.Datasource;
@@ -99,7 +100,9 @@ public Mono<ResponseView<DatasourceStructure>> getStructure(@PathVariable String
99100
description ="Retrieve a list of node service plugins available within Lowcoder."
100101
)
101102
@GetMapping("/jsDatasourcePlugins")
102-
publicMono<ResponseView<List<Datasource>>>listJsDatasourcePlugins(@RequestParam("appId")StringapplicationId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype);
103+
publicMono<PageResponseView<?>>listJsDatasourcePlugins(@RequestParam("appId")StringapplicationId,@RequestParam(required =false)Stringname,@RequestParam(required =false)Stringtype,
104+
@RequestParam(required =false,defaultValue ="0")intpageNum,
105+
@RequestParam(required =false,defaultValue ="0")intpageSize);
103106

104107
/**
105108
* Proxy the request to the node service, besides, add the "extra" information from the data source config stored in the mongodb if exists to
@@ -123,7 +126,9 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
123126
)
124127
@JsonView(JsonViews.Public.class)
125128
@GetMapping("/listByOrg")
126-
publicMono<ResponseView<List<DatasourceView>>>listOrgDataSources(@RequestParam(name ="orgId")StringorgId,@RequestParamStringname,@RequestParamStringtype);
129+
publicMono<PageResponseView<?>>listOrgDataSources(@RequestParam(name ="orgId")StringorgId,@RequestParamStringname,@RequestParamStringtype,
130+
@RequestParam(required =false,defaultValue ="0")intpageNum,
131+
@RequestParam(required =false,defaultValue ="0")intpageSize);
127132

128133
@Operation(
129134
tags =TAG_DATASOURCE_MANAGEMENT,
@@ -134,7 +139,9 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
134139
@Deprecated
135140
@JsonView(JsonViews.Public.class)
136141
@GetMapping("/listByApp")
137-
publicMono<ResponseView<List<DatasourceView>>>listAppDataSources(@RequestParam(name ="appId")StringapplicationId,@RequestParamStringname,@RequestParamStringtype);
142+
publicMono<PageResponseView<?>>listAppDataSources(@RequestParam(name ="appId")StringapplicationId,@RequestParamStringname,@RequestParamStringtype,
143+
@RequestParam(required =false,defaultValue ="0")intpageNum,
144+
@RequestParam(required =false,defaultValue ="0")intpageSize);
138145

139146
@Operation(
140147
tags =TAG_DATASOURCE_PERMISSIONS,

0 commit comments

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