Merge branch 'master' of https://github.com/fxbin/bubble

fxbin · Aug 24, 2023 · f9703d3 · f9703d3
2 parents 3074ac1 + 4b631ac
commit f9703d3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageResult.java b/bubble-core/src/main/java/cn/fxbin/bubble/core/model/PageResult.java
@@ -2,9 +2,13 @@
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.function.Function;
+
+import static java.util.stream.Collectors.toList;
 
 /**
  * PageResult
@@ -13,6 +17,7 @@
  * @version v1.0
  * @since 2020/9/21 15:12
  */
+@Getter
 @ApiModel("分页结果")
 public class PageResult<T> implements Serializable {
 
@@ -31,46 +36,26 @@ public class PageResult<T> implements Serializable {
     @ApiModelProperty(value = "每页条数", required = true)
     private Long pageSize;
 
-    public List<T> getList() {
-        return list;
-    }
-
     public PageResult<T> setList(List<T> list) {
         this.list = list;
         return this;
     }
 
-    public Long getTotal() {
-        return total;
-    }
-
     public PageResult<T> setTotal(Long total) {
         this.total = total;
         return this;
     }
 
-    public Long getTotalPage() {
-        return totalPage;
-    }
-
     public PageResult<T> setTotalPage(Long totalPage) {
         this.totalPage = totalPage;
         return this;
     }
 
-    public Long getPageNo() {
-        return pageNo;
-    }
-
     public PageResult<T> setPageNo(Long pageNo) {
         this.pageNo = pageNo;
         return this;
     }
 
-    public Long getPageSize() {
-        return pageSize;
-    }
-
     public PageResult<T> setPageSize(Long pageSize) {
         this.pageSize = pageSize;
         return this;
@@ -97,4 +82,11 @@ public PageResult<T> compute(Long pageSize, Long pageNo, Long total) {
         }
         return this;
     }
+
+    @SuppressWarnings("unchecked")
+    public <R> PageResult<R> convert(Function<? super T, ? extends R> mapper) {
+        List<R> collect = this.getList().stream().map(mapper).collect(toList());
+        return ((PageResult<R>)this).setList(collect);
+    }
+
 }
diff --git a/bubble-parent/pom.xml b/bubble-parent/pom.xml
@@ -21,7 +21,6 @@
                     <artifactId>spring-boot-maven-plugin</artifactId>
                     <version>${spring-boot.version}</version>
                     <configuration>
-                        <fork>true</fork>
                         <addResources>true</addResources>
                         <layers>
                             <enabled>true</enabled>