wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:feature-REQ/2129 修改pageNumber

Browse Source
This commit is contained in:
lilong 2024-04-02 15:40:53 +08:00
parent 1ee94f0874
commit 88d028251d
11 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
im-center-api/src/main/java/cn/axzo/im/center/api/feign/AccountRegisterApi.java
View File

@ -134,7 +134,7 @@ public interface AccountRegisterApi {
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
class PageAccountRegisterParam extends ListAccountRegisterParam { class PageAccountRegisterParam extends ListAccountRegisterParam {
Integer pageNumber; Integer page;
Integer pageSize; Integer pageSize;

2
im-center-api/src/main/java/cn/axzo/im/center/api/feign/MessageHistoryApi.java
View File

@ -54,7 +54,7 @@ public interface MessageHistoryApi {
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
class PageMessageHistoryParam extends ListMessageHistoryParam { class PageMessageHistoryParam extends ListMessageHistoryParam {
Integer pageNumber; Integer page;
Integer pageSize; Integer pageSize;

2
im-center-server/src/main/java/cn/axzo/im/job/CreateMessageHistoryJob.java
View File

@ -49,7 +49,7 @@ public class CreateMessageHistoryJob extends IJobHandler {
.ids(createMessageHistoryParam.getIds()) .ids(createMessageHistoryParam.getIds())
.planStartTimeLE(now) .planStartTimeLE(now)
.status(MessageTask.Status.PENDING) .status(MessageTask.Status.PENDING)
.pageNumber(pageNumber++) .page(pageNumber++)
.pageSize(DEFAULT_PAGE_SIZE) .pageSize(DEFAULT_PAGE_SIZE)
.build(); .build();

2
im-center-server/src/main/java/cn/axzo/im/job/SendMessageJob.java
View File

@ -47,7 +47,7 @@ public class SendMessageJob extends IJobHandler {
MessageHistoryService.PageMessageHistoryParam req = MessageHistoryService.PageMessageHistoryParam.builder() MessageHistoryService.PageMessageHistoryParam req = MessageHistoryService.PageMessageHistoryParam.builder()
.ids(sendMessageParam.getIds()) .ids(sendMessageParam.getIds())
.statues(Sets.newHashSet(MessageHistory.Status.PENDING.name())) .statues(Sets.newHashSet(MessageHistory.Status.PENDING.name()))
.pageNumber(pageNumber++) .page(pageNumber++)
.pageSize(DEFAULT_PAGE_SIZE) .pageSize(DEFAULT_PAGE_SIZE)
.build(); .build();

2
im-center-server/src/main/java/cn/axzo/im/job/UpdateImAccountOuIdJob.java
View File

@ -63,7 +63,7 @@ public class UpdateImAccountOuIdJob extends IJobHandler {
.ids(updateImAccountOuIdParam.getIds()) .ids(updateImAccountOuIdParam.getIds())
.appType(AppTypeEnum.CMP.getCode()) .appType(AppTypeEnum.CMP.getCode())
.accountType(AccountTypeEnum.USER.getCode()) .accountType(AccountTypeEnum.USER.getCode())
.pageNumber(pageNumber++) .page(pageNumber++)
.pageSize(DEFAULT_PAGE_SIZE) .pageSize(DEFAULT_PAGE_SIZE)
.build(); .build();

2
im-center-server/src/main/java/cn/axzo/im/service/AccountRegisterService.java
View File

@ -81,7 +81,7 @@ public interface AccountRegisterService extends IService<AccountRegister> {
@AllArgsConstructor @AllArgsConstructor
class PageAccountRegisterParam extends ListAccountRegisterParam implements IPageParam { class PageAccountRegisterParam extends ListAccountRegisterParam implements IPageParam {
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
Integer pageNumber; Integer page;
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
Integer pageSize; Integer pageSize;

2
im-center-server/src/main/java/cn/axzo/im/service/MessageHistoryService.java
View File

@ -67,7 +67,7 @@ public interface MessageHistoryService extends IService<MessageHistory> {
@AllArgsConstructor @AllArgsConstructor
class PageMessageHistoryParam extends ListMessageHistoryParam implements IPageParam { class PageMessageHistoryParam extends ListMessageHistoryParam implements IPageParam {
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
Integer pageNumber; Integer page;
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
Integer pageSize; Integer pageSize;

2
im-center-server/src/main/java/cn/axzo/im/service/MessageTaskService.java
View File

@ -71,7 +71,7 @@ public interface MessageTaskService extends IService<MessageTask> {
@AllArgsConstructor @AllArgsConstructor
class PageMessageTaskParam extends ListMessageTaskParam implements IPageParam { class PageMessageTaskParam extends ListMessageTaskParam implements IPageParam {
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
Integer pageNumber; Integer page;
@CriteriaField(ignore = true) @CriteriaField(ignore = true)
Integer pageSize; Integer pageSize;

2
im-center-server/src/main/java/cn/axzo/im/service/impl/AccountRegisterServiceImpl.java
View File

@ -65,7 +65,7 @@ public class AccountRegisterServiceImpl extends ServiceImpl<AccountRegisterMappe
return PageConverter.drainAll(pageNumber -> { return PageConverter.drainAll(pageNumber -> {
PageAccountRegisterParam pageParam = PageAccountRegisterParam.builder().build(); PageAccountRegisterParam pageParam = PageAccountRegisterParam.builder().build();
BeanUtils.copyProperties(param, pageParam); BeanUtils.copyProperties(param, pageParam);
pageParam.setPageNumber(pageNumber); pageParam.setPage(pageNumber);
pageParam.setPageSize(500); pageParam.setPageSize(500);
return page(pageParam); return page(pageParam);
}); });

2
im-center-server/src/main/java/cn/axzo/im/service/impl/MessageHistoryServiceImpl.java
View File

@ -109,7 +109,7 @@ public class MessageHistoryServiceImpl extends ServiceImpl<MessageHistoryMapper,
return PageConverter.drainAll(pageNumber -> { return PageConverter.drainAll(pageNumber -> {
PageMessageHistoryParam pageParam = PageMessageHistoryParam.builder().build(); PageMessageHistoryParam pageParam = PageMessageHistoryParam.builder().build();
BeanUtils.copyProperties(param, pageParam); BeanUtils.copyProperties(param, pageParam);
pageParam.setPageNumber(pageNumber); pageParam.setPage(pageNumber);
pageParam.setPageSize(500); pageParam.setPageSize(500);
return page(pageParam); return page(pageParam);
}); });

2
im-center-server/src/main/java/cn/axzo/im/service/impl/MessageTaskServiceImpl.java
View File

@ -124,7 +124,7 @@ public class MessageTaskServiceImpl extends ServiceImpl<MessageTaskMapper, Messa
Page<AccountRegisterService.AccountRegisterDTO> page = accountRegisterService.page(AccountRegisterService.PageAccountRegisterParam.builder() Page<AccountRegisterService.AccountRegisterDTO> page = accountRegisterService.page(AccountRegisterService.PageAccountRegisterParam.builder()
.accountType(AccountTypeEnum.USER.getCode()) .accountType(AccountTypeEnum.USER.getCode())
.appTypes(bizData.getAppTypes().stream().map(AppTypeEnum::getCode).collect(Collectors.toSet())) .appTypes(bizData.getAppTypes().stream().map(AppTypeEnum::getCode).collect(Collectors.toSet()))
.pageNumber(pageNumber++) .page(pageNumber++)
.pageSize(DEFAULT_PAGE_SIZE) .pageSize(DEFAULT_PAGE_SIZE)
.build()); .build());
if (!CollectionUtils.isEmpty(page.getRecords())) { if (!CollectionUtils.isEmpty(page.getRecords())) {