Browse Source

优化 pagination 构造模式

= 7 years ago
parent
commit
06cfb89c28

+ 18 - 8
mybatis-plus-generate/src/main/java/com/baomidou/mybatisplus/generator/config/builder/ConfigBuilder.java

@@ -15,7 +15,24 @@
  */
 package com.baomidou.mybatisplus.generator.config.builder;
 
-import com.baomidou.mybatisplus.generator.config.*;
+import java.io.File;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.baomidou.mybatisplus.generator.config.ConstVal;
+import com.baomidou.mybatisplus.generator.config.DataSourceConfig;
+import com.baomidou.mybatisplus.generator.config.GlobalConfig;
+import com.baomidou.mybatisplus.generator.config.PackageConfig;
+import com.baomidou.mybatisplus.generator.config.StrategyConfig;
+import com.baomidou.mybatisplus.generator.config.TemplateConfig;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableFill;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
@@ -24,13 +41,6 @@ import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
 import com.baomidou.mybatisplus.generator.config.rules.QuerySQL;
 import com.baomidou.mybatisplus.toolkit.StringUtils;
 
-import java.io.File;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-
 /**
  * <p>
  * 配置汇总 传递给文件生成工具

+ 8 - 4
mybatis-plus-support/src/main/java/com/baomidou/mybatisplus/plugins/pagination/Pagination.java

@@ -260,16 +260,18 @@ public class Pagination extends RowBounds implements Serializable {
         return columns;
     }
 
-    public void setAscs(List<String> ascs) {
+    public Pagination setAscs(List<String> ascs) {
         this.ascs = ascs;
+        return this;
     }
 
     public List<String> getDescs() {
         return orders(!isAsc, descs);
     }
 
-    public void setDescs(List<String> descs) {
+    public Pagination setDescs(List<String> descs) {
         this.descs = descs;
+        return this;
     }
 
     /**
@@ -295,8 +297,9 @@ public class Pagination extends RowBounds implements Serializable {
         return offset;
     }
 
-    public void setOffset(int offset) {
+    public Pagination setOffset(int offset) {
         this.offset = offset;
+        return this;
     }
 
     @Override
@@ -304,8 +307,9 @@ public class Pagination extends RowBounds implements Serializable {
         return limit;
     }
 
-    public void setLimit(int limit) {
+    public Pagination setLimit(int limit) {
         this.limit = limit;
+        return this;
     }
 
     @Override