diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java index 8031e41..3d92235 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java @@ -134,7 +134,7 @@ public interface AccountRegisterApi { @NoArgsConstructor @AllArgsConstructor class PageAccountRegisterParam extends ListAccountRegisterParam { - Integer pageNumber; + Integer page; Integer pageSize; diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java index 76cd52b..14c705f 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java @@ -54,7 +54,7 @@ public interface MessageHistoryApi { @NoArgsConstructor @AllArgsConstructor class PageMessageHistoryParam extends ListMessageHistoryParam { - Integer pageNumber; + Integer page; Integer pageSize; diff --git a/im-center-server/src/main/java/cn/axzo/im/job/CreateMessageHistoryJob.java b/im-center-server/src/main/java/cn/axzo/im/job/CreateMessageHistoryJob.java index 43823e0..87ba4ae 100644 --- a/im-center-server/src/main/java/cn/axzo/im/job/CreateMessageHistoryJob.java +++ b/im-center-server/src/main/java/cn/axzo/im/job/CreateMessageHistoryJob.java @@ -49,7 +49,7 @@ public class CreateMessageHistoryJob extends IJobHandler { .ids(createMessageHistoryParam.getIds()) .planStartTimeLE(now) .status(MessageTask.Status.PENDING) - .pageNumber(pageNumber++) + .page(pageNumber++) .pageSize(DEFAULT_PAGE_SIZE) .build(); diff --git a/im-center-server/src/main/java/cn/axzo/im/job/SendMessageJob.java b/im-center-server/src/main/java/cn/axzo/im/job/SendMessageJob.java index db5db6e..74b81a1 100644 --- a/im-center-server/src/main/java/cn/axzo/im/job/SendMessageJob.java +++ b/im-center-server/src/main/java/cn/axzo/im/job/SendMessageJob.java @@ -47,7 +47,7 @@ public class SendMessageJob extends IJobHandler { MessageHistoryService.PageMessageHistoryParam req = MessageHistoryService.PageMessageHistoryParam.builder() .ids(sendMessageParam.getIds()) .statues(Sets.newHashSet(MessageHistory.Status.PENDING.name())) - .pageNumber(pageNumber++) + .page(pageNumber++) .pageSize(DEFAULT_PAGE_SIZE) .build(); diff --git a/im-center-server/src/main/java/cn/axzo/im/job/UpdateImAccountOuIdJob.java b/im-center-server/src/main/java/cn/axzo/im/job/UpdateImAccountOuIdJob.java index 5003c39..082c437 100644 --- a/im-center-server/src/main/java/cn/axzo/im/job/UpdateImAccountOuIdJob.java +++ b/im-center-server/src/main/java/cn/axzo/im/job/UpdateImAccountOuIdJob.java @@ -63,7 +63,7 @@ public class UpdateImAccountOuIdJob extends IJobHandler { .ids(updateImAccountOuIdParam.getIds()) .appType(AppTypeEnum.CMP.getCode()) .accountType(AccountTypeEnum.USER.getCode()) - .pageNumber(pageNumber++) + .page(pageNumber++) .pageSize(DEFAULT_PAGE_SIZE) .build(); diff --git a/im-center-server/src/main/java/cn/axzo/im/service/AccountRegisterService.java b/im-center-server/src/main/java/cn/axzo/im/service/AccountRegisterService.java index 452ad12..ae21f23 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/AccountRegisterService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/AccountRegisterService.java @@ -81,7 +81,7 @@ public interface AccountRegisterService extends IService { @AllArgsConstructor class PageAccountRegisterParam extends ListAccountRegisterParam implements IPageParam { @CriteriaField(ignore = true) - Integer pageNumber; + Integer page; @CriteriaField(ignore = true) Integer pageSize; diff --git a/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java b/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java index bc36782..5f9f7d8 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java @@ -67,7 +67,7 @@ public interface MessageHistoryService extends IService { @AllArgsConstructor class PageMessageHistoryParam extends ListMessageHistoryParam implements IPageParam { @CriteriaField(ignore = true) - Integer pageNumber; + Integer page; @CriteriaField(ignore = true) Integer pageSize; diff --git a/im-center-server/src/main/java/cn/axzo/im/service/MessageTaskService.java b/im-center-server/src/main/java/cn/axzo/im/service/MessageTaskService.java index f7521c9..a55fb71 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/MessageTaskService.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/MessageTaskService.java @@ -71,7 +71,7 @@ public interface MessageTaskService extends IService { @AllArgsConstructor class PageMessageTaskParam extends ListMessageTaskParam implements IPageParam { @CriteriaField(ignore = true) - Integer pageNumber; + Integer page; @CriteriaField(ignore = true) Integer pageSize; diff --git a/im-center-server/src/main/java/cn/axzo/im/service/impl/AccountRegisterServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/impl/AccountRegisterServiceImpl.java index 919f73f..eff3e39 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/impl/AccountRegisterServiceImpl.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/impl/AccountRegisterServiceImpl.java @@ -65,7 +65,7 @@ public class AccountRegisterServiceImpl extends ServiceImpl { PageAccountRegisterParam pageParam = PageAccountRegisterParam.builder().build(); BeanUtils.copyProperties(param, pageParam); - pageParam.setPageNumber(pageNumber); + pageParam.setPage(pageNumber); pageParam.setPageSize(500); return page(pageParam); }); diff --git a/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java index 24fe6cb..414b9b9 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java @@ -109,7 +109,7 @@ public class MessageHistoryServiceImpl extends ServiceImpl { PageMessageHistoryParam pageParam = PageMessageHistoryParam.builder().build(); BeanUtils.copyProperties(param, pageParam); - pageParam.setPageNumber(pageNumber); + pageParam.setPage(pageNumber); pageParam.setPageSize(500); return page(pageParam); }); diff --git a/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java b/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java index d72afc5..6a3cf20 100644 --- a/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java +++ b/im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java @@ -124,7 +124,7 @@ public class MessageTaskServiceImpl extends ServiceImpl page = accountRegisterService.page(AccountRegisterService.PageAccountRegisterParam.builder() .accountType(AccountTypeEnum.USER.getCode()) .appTypes(bizData.getAppTypes().stream().map(AppTypeEnum::getCode).collect(Collectors.toSet())) - .pageNumber(pageNumber++) + .page(pageNumber++) .pageSize(DEFAULT_PAGE_SIZE) .build()); if (!CollectionUtils.isEmpty(page.getRecords())) {