Browse Source

调整优化

hubin 7 years ago
parent
commit
ff6da2f777

+ 4 - 4
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/IPage.java

@@ -111,7 +111,7 @@ public interface IPage<T> {
      * 设置分页记录列表
      * </p>
      */
-    void setRecords(List<T> records);
+    IPage<T> setRecords(List<T> records);
 
     /**
      * <p>
@@ -133,7 +133,7 @@ public interface IPage<T> {
      * 当 total 为 null 或者大于 0 分页插件不在查询总数
      * </p>
      */
-    void setTotal(long total);
+    IPage<T> setTotal(long total);
 
     /**
      * <p>
@@ -149,7 +149,7 @@ public interface IPage<T> {
      * 设置当前分页总页数
      * </p>
      */
-    void setSize(long size);
+    IPage<T> setSize(long size);
 
     /**
      * <p>
@@ -165,5 +165,5 @@ public interface IPage<T> {
      * 设置当前页
      * </p>
      */
-    void setCurrent(long current);
+    IPage<T> setCurrent(long current);
 }

+ 1 - 3
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/override/PageMapperMethod.java

@@ -95,9 +95,7 @@ public class PageMapperMethod {
                     if (IPage.class.isAssignableFrom(method.getReturnType()) && args != null
                         && IPage.class.isAssignableFrom(args[0].getClass())) {
                         List<Object> o = (List<Object>) executeForMany2(sqlSession, args);
-                        IPage page = (IPage) args[0];
-                        page.setRecords(o);
-                        result = page;
+                        result = ((IPage) args[0]).setRecords(o);
                     } else {
                         result = sqlSession.selectOne(command.getName(), param);
                     }

+ 20 - 11
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/Page.java

@@ -100,7 +100,7 @@ public class Page<T> implements IPage<T>, Serializable {
      *
      * @return true / false
      */
-    public boolean isHasPrevious() {
+    public boolean hasPrevious() {
         return this.current > 1;
     }
 
@@ -111,7 +111,7 @@ public class Page<T> implements IPage<T>, Serializable {
      *
      * @return true / false
      */
-    public boolean isHasNext() {
+    public boolean hasNext() {
         return this.current < this.getPages();
     }
 
@@ -121,8 +121,9 @@ public class Page<T> implements IPage<T>, Serializable {
     }
 
     @Override
-    public void setRecords(List<T> records) {
+    public IPage<T> setRecords(List<T> records) {
         this.records = records;
+        return this;
     }
 
     @Override
@@ -131,8 +132,9 @@ public class Page<T> implements IPage<T>, Serializable {
     }
 
     @Override
-    public void setTotal(long total) {
+    public IPage<T> setTotal(long total) {
         this.total = total;
+        return this;
     }
 
     @Override
@@ -141,8 +143,9 @@ public class Page<T> implements IPage<T>, Serializable {
     }
 
     @Override
-    public void setSize(long size) {
+    public IPage<T> setSize(long size) {
         this.size = size;
+        return this;
     }
 
     @Override
@@ -151,8 +154,9 @@ public class Page<T> implements IPage<T>, Serializable {
     }
 
     @Override
-    public void setCurrent(long current) {
+    public IPage<T> setCurrent(long current) {
         this.current = current;
+        return this;
     }
 
     @Override
@@ -160,14 +164,16 @@ public class Page<T> implements IPage<T>, Serializable {
         return ascs;
     }
 
-    public void setAscs(List<String> ascs) {
+    public IPage<T> setAscs(List<String> ascs) {
         if (CollectionUtils.isNotEmpty(ascs)) {
             this.ascs = (String[]) ascs.toArray();
         }
+        return this;
     }
 
-    public void setAscs(String... ascs) {
+    public IPage<T> setAscs(String... ascs) {
         this.ascs = ascs;
+        return this;
     }
 
     @Override
@@ -175,14 +181,16 @@ public class Page<T> implements IPage<T>, Serializable {
         return descs;
     }
 
-    public void setDescs(List<String> descs) {
+    public IPage<T> setDescs(List<String> descs) {
         if (CollectionUtils.isNotEmpty(descs)) {
             this.descs = (String[]) descs.toArray();
         }
+        return this;
     }
 
-    public void setDescs(String... descs) {
+    public IPage<T> setDescs(String... descs) {
         this.descs = descs;
+        return this;
     }
 
     @Override
@@ -190,7 +198,8 @@ public class Page<T> implements IPage<T>, Serializable {
         return optimizeCountSql;
     }
 
-    public void setOptimizeCountSql(boolean optimizeCountSql) {
+    public IPage<T> setOptimizeCountSql(boolean optimizeCountSql) {
         this.optimizeCountSql = optimizeCountSql;
+        return this;
     }
 }