优化代码

mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/apt/AptAbstractWrapper.java

@@ -147,22 +147,23 @@ public abstract class AptAbstractWrapper<T, Children extends AptAbstractWrapper<
      */
     public Children pageByMain() {
         this.pageByMain = true;
-        this.pageInfo = new PageInfo();
         return typedThis;
     }
 
     /**
      * 根据主表分页
      */
-    public Children pageByMain(MFunction<PageInfo.PageInfoBuilder> function) {
+    public Children pageByMain(MFunction<PageInfo> function) {
         this.pageByMain = true;
-        PageInfo.PageInfoBuilder apply = function.apply(PageInfo.builder());
+        function.apply(getPageInfo());
-        this.pageInfo = apply.build();
         return typedThis;
     }
 
     public PageInfo getPageInfo() {
-        return pageInfo == null ? new PageInfo() : pageInfo;
+        if (pageInfo == null) {
+            pageInfo = new PageInfo();
+        }
+        return pageInfo;
     }
 
     /**

mybatis-plus-join-core/src/main/java/com/github/yulichang/extension/kt/KtAbstractLambdaWrapper.java

@@ -182,22 +182,23 @@ public abstract class KtAbstractLambdaWrapper<T, Children extends KtAbstractLamb
      */
     public Children pageByMain() {
         this.pageByMain = true;
-        this.pageInfo = new PageInfo();
         return typedThis;
     }
 
     /**
      * 根据主表分页
      */
-    public Children pageByMain(MFunction<PageInfo.PageInfoBuilder> function) {
+    public Children pageByMain(MFunction<PageInfo> function) {
         this.pageByMain = true;
-        PageInfo.PageInfoBuilder apply = function.apply(PageInfo.builder());
+        function.apply(getPageInfo());
-        this.pageInfo = apply.build();
         return typedThis;
     }
 
     public PageInfo getPageInfo() {
-        return pageInfo == null ? new PageInfo() : pageInfo;
+        if (pageInfo == null) {
+            pageInfo = new PageInfo();
+        }
+        return pageInfo;
     }
 
     /**

mybatis-plus-join-core/src/main/java/com/github/yulichang/toolkit/InterceptorList.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.github.yulichang.adapter.AdapterHelper;
+import com.github.yulichang.config.ConfigProperties;
 import com.github.yulichang.interceptor.MPJInterceptor;
 import com.github.yulichang.interceptor.pagination.PageInnerInterceptor;
 import org.apache.ibatis.logging.Log;

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/JoinAbstractLambdaWrapper.java

@@ -182,22 +182,23 @@ public abstract class JoinAbstractLambdaWrapper<T, Children extends JoinAbstract
      */
     public Children pageByMain() {
         this.pageByMain = true;
-        this.pageInfo = new PageInfo();
         return typedThis;
     }
 
     /**
      * 根据主表分页
      */
-    public Children pageByMain(MFunction<PageInfo.PageInfoBuilder> function) {
+    public Children pageByMain(MFunction<PageInfo> function) {
         this.pageByMain = true;
-        PageInfo.PageInfoBuilder apply = function.apply(PageInfo.builder());
+        function.apply(getPageInfo());
-        this.pageInfo = apply.build();
         return typedThis;
     }
 
     public PageInfo getPageInfo() {
-        return pageInfo == null ? new PageInfo() : pageInfo;
+        if (pageInfo == null) {
+            pageInfo = new PageInfo();
+        }
+        return pageInfo;
     }
 
     /**

mybatis-plus-join-core/src/main/java/com/github/yulichang/wrapper/segments/PageInfo.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 
@@ -12,6 +13,7 @@ import java.io.Serializable;
  * @since 1.5.0
  */
 @Data
+@Accessors(chain = true)
 @NoArgsConstructor
 @AllArgsConstructor
 public class PageInfo implements Serializable {
@@ -19,32 +21,4 @@ public class PageInfo implements Serializable {
     private IPage<?> innerPage;
 
     private String countSelectSql;
-
-    public static PageInfoBuilder builder() {
-        return new PageInfoBuilder();
-    }
-
-
-    @SuppressWarnings("unused")
-    public static class PageInfoBuilder {
-        private IPage<?> innerPage;
-        private String countSelectSql;
-
-        PageInfoBuilder() {
-        }
-
-        public PageInfoBuilder innerPage(IPage<?> innerPage) {
-            this.innerPage = innerPage;
-            return this;
-        }
-
-        public PageInfoBuilder countSelectSql(String countSelectSql) {
-            this.countSelectSql = countSelectSql;
-            return this;
-        }
-
-        public PageInfo build() {
-            return new PageInfo(this.innerPage, this.countSelectSql);
-        }
-    }
 }

mybatis-plus-join-test/test-join/src/test/java/com/github/yulichang/test/join/unit/PageByMainTest.java

@@ -75,7 +75,7 @@ public class PageByMainTest {
                 .orderByDesc(UserDO::getId)
                 .groupBy(UserDO::getId)
                 .logicDelToOn()
-                .pageByMain(f -> f.countSelectSql("1"));
+                .pageByMain(f -> f.setCountSelectSql("1"));
 
         Page<UserDTO> page = wrapper.page(new Page<>(1, 8), UserDTO.class);
         page.getRecords().forEach(System.out::println);