change default page num to 1

dragonpoo · ludomikula · commit 837fa891c9ab · 2024-11-26T19:32:06.000+01:00
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceController.java
@@ -119,7 +119,7 @@ public Mono<ResponseView<DatasourceStructure>> getStructure(@PathVariable String
      */
     @Override
     public Mono<PageResponseView<?>> listJsDatasourcePlugins(@RequestParam("appId") String applicationId, @RequestParam(required = false) String name, @RequestParam(required = false) String type,
-                                                             @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                             @RequestParam(required = false, defaultValue = "1s") int pageNum,
                                                              @RequestParam(required = false, defaultValue = "0") int pageSize) {
         String objectId = gidService.convertApplicationIdToObjectId(applicationId);
         return fluxToPageResponseView(pageNum, pageSize, datasourceApiService.listJsDatasourcePlugins(objectId, name, type));
@@ -142,7 +142,7 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
     @SneakyThrows
     @Override
     public Mono<PageResponseView<?>> listOrgDataSources(@RequestParam(name = "orgId") String orgId, @RequestParam(required = false) String name, @RequestParam(required = false) String type,
-                                                        @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                        @RequestParam(required = false, defaultValue = "1") int pageNum,
                                                         @RequestParam(required = false, defaultValue = "0") int pageSize) {
         if (StringUtils.isBlank(orgId)) {
             return ofError(BizError.INVALID_PARAMETER, "ORG_ID_EMPTY");
@@ -153,7 +153,7 @@ public Mono<PageResponseView<?>> listOrgDataSources(@RequestParam(name = "orgId"
 
     @Override
     public Mono<PageResponseView<?>> listAppDataSources(@RequestParam(name = "appId") String applicationId, @RequestParam(required = false) String name, @RequestParam(required = false) String type,
-                                                        @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                        @RequestParam(required = false, defaultValue = "1") int pageNum,
                                                         @RequestParam(required = false, defaultValue = "0") int pageSize) {
         if (StringUtils.isBlank(applicationId)) {
             return ofError(BizError.INVALID_PARAMETER, "INVALID_APP_ID");
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/DatasourceEndpoints.java
@@ -101,7 +101,7 @@ public Mono<ResponseView<DatasourceStructure>> getStructure(@PathVariable String
 	)
     @GetMapping("/jsDatasourcePlugins")
     public Mono<PageResponseView<?>> listJsDatasourcePlugins(@RequestParam("appId") String applicationId, @RequestParam(required = false) String name, @RequestParam(required = false) String type,
-															 @RequestParam(required = false, defaultValue = "0") int pageNum,
+															 @RequestParam(required = false, defaultValue = "1") int pageNum,
 															 @RequestParam(required = false, defaultValue = "0") int pageSize);
 
     /**
@@ -127,7 +127,7 @@ public Mono<ResponseView<List<Object>>> getPluginDynamicConfig(
     @JsonView(JsonViews.Public.class)
     @GetMapping("/listByOrg")
     public Mono<PageResponseView<?>> listOrgDataSources(@RequestParam(name = "orgId") String orgId, @RequestParam String name, @RequestParam String type,
-                                                        @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                        @RequestParam(required = false, defaultValue = "1") int pageNum,
                                                         @RequestParam(required = false, defaultValue = "0") int pageSize);
 
 	@Operation(
@@ -140,7 +140,7 @@ public Mono<PageResponseView<?>> listOrgDataSources(@RequestParam(name = "orgId"
     @JsonView(JsonViews.Public.class)
     @GetMapping("/listByApp")
     public Mono<PageResponseView<?>> listAppDataSources(@RequestParam(name = "appId") String applicationId, @RequestParam String name, @RequestParam String type,
-														@RequestParam(required = false, defaultValue = "0") int pageNum,
+														@RequestParam(required = false, defaultValue = "1") int pageNum,
 														@RequestParam(required = false, defaultValue = "0") int pageSize);
 
 	@Operation(
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryController.java
@@ -46,7 +46,7 @@ public Mono<ResponseView<List<LibraryQueryAggregateView>>> dropDownList(@Request
 
     @Override
     public Mono<PageResponseView<?>> list(@RequestParam(required = false, defaultValue = "") String name,
-                                                               @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                               @RequestParam(required = false, defaultValue = "1") int pageNum,
                                                                @RequestParam(required = false, defaultValue = "100") int pageSize) {
         var flux = libraryQueryApiService.listLibraryQueries(name)
                 .flatMapMany(Flux::fromIterable);
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryEndpoints.java
@@ -40,7 +40,7 @@ public interface LibraryQueryEndpoints
 	)
     @GetMapping("/listByOrg")
     public Mono<PageResponseView<?>> list(@RequestParam(required = false, defaultValue = "") String name,
-															   @RequestParam(required = false, defaultValue = "0") int pageNum,
+															   @RequestParam(required = false, defaultValue = "1") int pageNum,
 															   @RequestParam(required = false, defaultValue = "100") int pageSize);
 
 	@Operation(
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordController.java
@@ -30,7 +30,7 @@ public Mono<Void> delete(@PathVariable String libraryQueryRecordId) {
 
     @Override
     public Mono<PageResponseView<?>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId,
-                                                         @RequestParam(required = false, defaultValue = "0") int pageNum,
+                                                         @RequestParam(required = false, defaultValue = "1") int pageNum,
                                                          @RequestParam(required = false, defaultValue = "100") int pageSize) {
         return fluxToPageResponseView(pageNum, pageSize, libraryQueryRecordApiService.getByLibraryQueryId(libraryQueryId).flatMapMany(Flux::fromIterable));
     }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/query/LibraryQueryRecordEndpoints.java
@@ -41,7 +41,7 @@ public interface LibraryQueryRecordEndpoints
 	)
     @GetMapping("/listByLibraryQueryId")
     public Mono<PageResponseView<?>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId,
-														 @RequestParam(required = false, defaultValue = "0") int pageNum,
+														 @RequestParam(required = false, defaultValue = "1") int pageNum,
 														 @RequestParam(required = false, defaultValue = "100") int pageSize);
 
 	@Operation(
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupController.java
@@ -119,7 +119,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
 
     @Override
     public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,
-            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "100") int pageSize) {
         String objectId = gidService.convertGroupIdToObjectId(groupId);
         return groupApiService.getGroupMembers(objectId, pageNum, pageSize)
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/GroupEndpoints.java
@@ -74,7 +74,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r
 	)
     @GetMapping("/{groupId}/members")
     public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,
-            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "100") int pageSize);
 
 	@Operation(
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -90,7 +90,7 @@ public Mono<ResponseView<Boolean>> deleteLogo(@PathVariable String orgId) {
 
     @Override
     public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String orgId,
-            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "1000") int pageSize) {
         String id = gidService.convertOrganizationIdToObjectId(orgId);
         return orgApiService.getOrganizationMembers(id, pageNum, pageSize)
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationEndpoints.java
@@ -95,7 +95,7 @@ public Mono<ResponseView<Boolean>> uploadLogo(@PathVariable String orgId,
 	)
     @GetMapping("/{orgId}/members")
     public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String orgId,
-            @RequestParam(required = false, defaultValue = "0") int pageNum,
+            @RequestParam(required = false, defaultValue = "1") int pageNum,
             @RequestParam(required = false, defaultValue = "1000") int pageSize);
 
 	@Operation(

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public interface LibraryQueryEndpoints`
`40`	`40`	`)`
`41`	`41`	`@GetMapping("/listByOrg")`
`42`	`42`	`public Mono<PageResponseView<?>> list(@RequestParam(required = false, defaultValue = "") String name,`
`43`		`- @RequestParam(required = false, defaultValue = "0") int pageNum,`
	`43`	`+ @RequestParam(required = false, defaultValue = "1") int pageNum,`
`44`	`44`	`@RequestParam(required = false, defaultValue = "100") int pageSize);`
`45`	`45`
`46`	`46`	`@Operation(`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public Mono<Void> delete(@PathVariable String libraryQueryRecordId) {`
`30`	`30`
`31`	`31`	`@Override`
`32`	`32`	`public Mono<PageResponseView<?>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId,`
`33`		`- @RequestParam(required = false, defaultValue = "0") int pageNum,`
	`33`	`+ @RequestParam(required = false, defaultValue = "1") int pageNum,`
`34`	`34`	`@RequestParam(required = false, defaultValue = "100") int pageSize) {`
`35`	`35`	`return fluxToPageResponseView(pageNum, pageSize, libraryQueryRecordApiService.getByLibraryQueryId(libraryQueryId).flatMapMany(Flux::fromIterable));`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public interface LibraryQueryRecordEndpoints`
`41`	`41`	`)`
`42`	`42`	`@GetMapping("/listByLibraryQueryId")`
`43`	`43`	`public Mono<PageResponseView<?>> getByLibraryQueryId(@RequestParam(name = "libraryQueryId") String libraryQueryId,`
`44`		`- @RequestParam(required = false, defaultValue = "0") int pageNum,`
	`44`	`+ @RequestParam(required = false, defaultValue = "1") int pageNum,`
`45`	`45`	`@RequestParam(required = false, defaultValue = "100") int pageSize);`
`46`	`46`
`47`	`47`	`@Operation(`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public Mono<GroupListResponseView<List<GroupView>>> getOrgGroups(@RequestParam(r`
`74`	`74`	`)`
`75`	`75`	`@GetMapping("/{groupId}/members")`
`76`	`76`	`public Mono<ResponseView<GroupMemberAggregateView>> getGroupMembers(@PathVariable String groupId,`
`77`		`- @RequestParam(required = false, defaultValue = "0") int pageNum,`
	`77`	`+ @RequestParam(required = false, defaultValue = "1") int pageNum,`
`78`	`78`	`@RequestParam(required = false, defaultValue = "100") int pageSize);`
`79`	`79`
`80`	`80`	`@Operation(`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public Mono<ResponseView<Boolean>> uploadLogo(@PathVariable String orgId,`
`95`	`95`	`)`
`96`	`96`	`@GetMapping("/{orgId}/members")`
`97`	`97`	`public Mono<ResponseView<OrgMemberListView>> getOrgMembers(@PathVariable String orgId,`
`98`		`- @RequestParam(required = false, defaultValue = "0") int pageNum,`
	`98`	`+ @RequestParam(required = false, defaultValue = "1") int pageNum,`
`99`	`99`	`@RequestParam(required = false, defaultValue = "1000") int pageSize);`
`100`	`100`
`101`	`101`	`@Operation(`