From 6dcac67442647903c71fa683b30d3cfdc408eed3 Mon Sep 17 00:00:00 2001 From: fengguangyu <841028466@qq.com> Date: Fri, 25 Jun 2021 19:29:55 +0800 Subject: [PATCH] no message --- .../dto/projectlibrary/ProjectLibraryDeptQry.java | 11 ++++++----- .../dto/projectlibrary/ProjectLibraryQry.java | 9 ++++++--- .../projectlibrary/ProjectLibraryQuerySvrImpl.java | 12 ++++++------ 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java index 2f344e6a..154e5a10 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryDeptQry.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; /** * 椤圭洰搴撻儴闂� qry @@ -19,12 +20,12 @@ public class ProjectLibraryDeptQry { @ApiModelProperty("椤圭洰鍚嶇О") private String projectName; - @ApiModelProperty("鍒嗛〉鐮�") - @DecimalMin("0") - private Integer pageNumber; + @NotNull(message = "椤电爜涓嶈兘涓虹┖") + @ApiModelProperty(value = "椤电爜", example = "1") + private Integer pageIndex; - @ApiModelProperty("鍒嗛〉澶у皬") - @DecimalMin("0") + @NotNull(message = "鍒嗛〉澶у皬涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍒嗛〉澶у皬", example = "10") private Integer pageSize; } diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java index 8aaa9f69..b42d6801 100644 --- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java +++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectlibrary/ProjectLibraryQry.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.validation.constraints.DecimalMin; +import javax.validation.constraints.NotNull; /** * 椤圭洰搴� qry @@ -33,10 +34,12 @@ public class ProjectLibraryQry { @ApiModelProperty("绫诲瀷鍒楄〃") private String typeList; - @ApiModelProperty("鍒嗛〉鐮�") - private Integer pageNumber; + @NotNull(message = "椤电爜涓嶈兘涓虹┖") + @ApiModelProperty(value = "椤电爜", example = "1") + private Integer pageIndex; - @ApiModelProperty("鍒嗛〉澶у皬") + @NotNull(message = "鍒嗛〉澶у皬涓嶈兘涓虹┖") + @ApiModelProperty(value = "鍒嗛〉澶у皬", example = "10") private Integer pageSize; @ApiModelProperty("椤圭洰搴撶被鍨�") diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java index 2a73799e..79633dd9 100644 --- a/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java +++ b/ServiceSite/src/main/java/com/seasky/projectplan/infrastructure/reader/projectlibrary/ProjectLibraryQuerySvrImpl.java @@ -43,10 +43,10 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { @Override public Pagination queryProjectLibraryPage(ProjectLibraryQry qry) { Page<ProjectLibraryOut> page; - if(ObjectUtils.isEmpty(qry.getPageNumber())||ObjectUtils.isEmpty(qry.getPageSize())){ + if(ObjectUtils.isEmpty(qry.getPageIndex())||ObjectUtils.isEmpty(qry.getPageSize())){ page = new Page<>(1,10); }else { - page = new Page<>(qry.getPageNumber(), qry.getPageSize()); + page = new Page<>(qry.getPageIndex(), qry.getPageSize()); } List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.queryList(page, ProjectLibraryQry.builder().build()).getRecords()); @@ -109,10 +109,10 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { @Override public Pagination<ProjectLibraryOut> queryProjectLibraryPageByCurrentUserDept(ProjectLibraryQry qry) { Page<ProjectLibraryOut> page; - if(ObjectUtils.isEmpty(qry.getPageNumber())||ObjectUtils.isEmpty(qry.getPageSize())){ + if(ObjectUtils.isEmpty(qry.getPageIndex())||ObjectUtils.isEmpty(qry.getPageSize())){ page = new Page<>(1,10); }else { - page = new Page<>(qry.getPageNumber(), qry.getPageSize()); + page = new Page<>(qry.getPageIndex(), qry.getPageSize()); } List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.queryList(page, qry).getRecords()); @@ -202,10 +202,10 @@ public class ProjectLibraryQuerySvrImpl implements ProjectLibraryQuerySvr { @Override public Pagination<ProjectLibraryOut> queryHistoryProjectLibraryPageByCurrentUserDept(ProjectLibraryQry qry) { Page<ProjectLibraryOut> page; - if(ObjectUtils.isEmpty(qry.getPageNumber())||ObjectUtils.isEmpty(qry.getPageSize())){ + if(ObjectUtils.isEmpty(qry.getPageIndex())||ObjectUtils.isEmpty(qry.getPageSize())){ page = new Page<>(1,10); }else { - page = new Page<>(qry.getPageNumber(), qry.getPageSize()); + page = new Page<>(qry.getPageIndex(), qry.getPageSize()); } List<ProjectLibraryOut> outList = ProjectLibraryReaderConvert.posToOutList(projectLibraryMapper.queryList(page, qry).getRecords()); for(ProjectLibraryOut p:outList){ -- GitLab