优化 yanghu pull reuqest T-SQL

mybatis-plus/src/main/java/com/baomidou/framework/service/impl/ServiceImpl.java

@@ -121,8 +121,11 @@ public class ServiceImpl<M extends BaseMapper<T, I>, T, I> implements IService<T
     }
 
     public Page<T> selectPage(Page<T> page, EntityWrapper<T> entityWrapper) {
-        page.setRecords(baseMapper.selectPage(page, entityWrapper));
-        return page;
+		if (null != entityWrapper) {
+			entityWrapper.orderBy(page.getOrderByField(), page.isAsc());
+		}
+		page.setRecords(baseMapper.selectPage(page, entityWrapper));
+		return page;
     }
 
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/EntityWrapper.java

@@ -15,302 +15,447 @@
  */
 package com.baomidou.mybatisplus.mapper;
 
-import com.baomidou.mybatisplus.toolkit.StringUtils;
-
 import java.text.MessageFormat;
 
+import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
+
 /**
  * <p>
- * Entity 对象封装操作类
+ * Entity 对象封装操作类，定义T-SQL语法
  * </p>
  *
- * @author hubin
+ * @author hubin , yanghu , Dyang
  * @Date 2016-03-15
  */
 public class EntityWrapper<T> {
 
-    /**
-     * 定义T-SQL SELECT中的WHERE关键字
-     */
-    private final String WHERE_WORD = " WHERE ";
-    /**
-     * 定义T-SQL SELECT中的AND关键字
-     */
-    private final String AND_WORD = " AND ";
-    /**
-     * 定义T-SQL SELECT中的OR关键字
-     */
-    private final String OR_WORD = " OR ";
-    /**
-     * 定义T-SQL SELECT中的GROUP BY关键字
-     */
-    private final String GROUPBY_WORD = " GROUP BY ";
-    /**
-     * 定义T-SQL SELECT中的HAVING关键字
-     */
-    private final String HAVING_WORD = " HAVING ";
-    /**
-     * 定义T-SQL SELECT中的ORDER BY关键字
-     */
-    private final String ORDERBY_WORD = " ORDER BY ";
-    /**
-     * 定义T-SQL SELECT中的ORDER BY语句中排序的 DESC关键字
-     */
-    private final String DESC_WORD = " DESC ";
-    /**
-     * 定义T-SQL SELECT中的ORDER BY语句中排序的 ASC关键字
-     */
-    private final String ASC_WORD = " ASC ";
-
-    /**
-     * 数据库表映射实体类
-     */
-    private T entity = null;
-
-    /**
-     * SQL 查询字段内容，例如：id,name,age
-     */
-    private String sqlSelect = null;
-
-    /**
-     * 查询条件
-     */
-    protected StringBuffer queryFilter = new StringBuffer();
-
-    public EntityWrapper() {
-        // to do nothing
-    }
-
-    public EntityWrapper(T entity) {
-        this.entity = entity;
-    }
-
-    public EntityWrapper(T entity, String sqlSelect) {
-        this.entity = entity;
-        this.sqlSelect = sqlSelect;
-    }
-
-    public T getEntity() {
-        return entity;
-    }
-
-    public void setEntity(T entity) {
-        this.entity = entity;
-    }
-
-    public String getSqlSelect() {
-        if (StringUtils.isEmpty(sqlSelect)) {
-            return null;
-        }
-        return stripSqlInjection(sqlSelect);
-    }
-
-    public void setSqlSelect(String sqlSelect) {
-        if (StringUtils.isNotEmpty(sqlSelect)) {
-            this.sqlSelect = sqlSelect;
-        }
-    }
-
-    /**
-     * SQL 片段
-     */
-    public String getSqlSegment() {
-        /*
-         * 无条件
+	/**
+	 * WHERE关键字
+	 */
+	protected final String WHERE = " WHERE ";
+
+	/**
+	 * AND关键字
+	 */
+	protected final String AND = " AND ";
+
+	/**
+	 * OR关键字
+	 */
+	protected final String OR = " OR ";
+
+	/**
+	 * GROUP BY关键字
+	 */
+	protected final String GROUPBY = " GROUP BY ";
+
+	/**
+	 * HAVING关键字
+	 */
+	protected final String HAVING = " HAVING ";
+
+	/**
+	 * ORDER BY关键字
+	 */
+	protected final String ORDERBY = " ORDER BY ";
+
+	/**
+	 * ORDER BY语句中排序的 DESC关键字
+	 */
+	protected final String DESC = " DESC ";
+
+	/**
+	 * ORDER BY语句中排序的 ASC关键字
+	 */
+	protected final String ASC = " ASC ";
+
+	/**
+	 * 是否使用了 T-SQL 语法
+	 */
+	protected boolean tsql = false;
+
+	/**
+	 * 数据库表映射实体类
+	 */
+	protected T entity = null;
+
+	/**
+	 * SQL 查询字段内容，例如：id,name,age
+	 */
+	protected String sqlSelect = null;
+
+	/**
+	 * 查询条件
+	 */
+	protected StringBuffer queryFilter = new StringBuffer();
+
+	public EntityWrapper() {
+		// to do nothing
+	}
+
+	public EntityWrapper(T entity) {
+		this.entity = entity;
+	}
+
+	public EntityWrapper(T entity, String sqlSelect) {
+		this.entity = entity;
+		this.sqlSelect = sqlSelect;
+	}
+
+	public T getEntity() {
+		return entity;
+	}
+
+	public void setEntity(T entity) {
+		this.entity = entity;
+	}
+
+	public String getSqlSelect() {
+		if (StringUtils.isEmpty(sqlSelect)) {
+			return null;
+		}
+		return stripSqlInjection(sqlSelect);
+	}
+
+	public void setSqlSelect(String sqlSelect) {
+		if (StringUtils.isNotEmpty(sqlSelect)) {
+			this.sqlSelect = sqlSelect;
+		}
+	}
+
+	/**
+	 * SQL 片段
+	 */
+	public String getSqlSegment() {
+		/*
+		 * 无条件
+		 */
+		String tempQuery = queryFilter.toString();
+		if (StringUtils.isEmpty(tempQuery)) {
+			return null;
+		}
+
+		/*
+		 * 只排序、直接返回
 		 */
-        String tempQuery = queryFilter.toString().trim();
-        if (StringUtils.isEmpty(tempQuery)) {
-            return null;
-        }
-
-        // 使用防SQL注入处理后返回
-        return stripSqlInjection(queryFilter.toString());
-    }
-
-    /**
-     * <p>SQL中WHERE关键字跟的条件语句</p>
-     * <p>eg: ew.where("name='zhangsan'").and("id={0}",22).and("password is not null")</p>
-     *
-     * @param sqlWhere where语句
-     * @param params   参数集
-     * @return
-     */
-    public EntityWrapper<T> where(String sqlWhere, Object... params) {
-        addFilter(WHERE_WORD, sqlWhere, params);
-        return this;
-    }
-
-    /**
-     * <p>SQL中AND关键字跟的条件语句</p>
-     * <p>eg: ew.where("name='zhangsan'").and("id={0}",22).and("password is not null")</p>
-     *
-     * @param sqlAnd and连接串
-     * @param params 参数集
-     * @return
-     */
-    public EntityWrapper<T> and(String sqlAnd, Object... params) {
-        addFilter(AND_WORD, sqlAnd, params);
-        return this;
-    }
-
-    /**
-     * <p>与and方法的区别是 可根据需要判断是否添加该条件</p>
-     *
-     * @param need   是否需要使用该and条件
-     * @param sqlAnd and条件语句
-     * @param params 参数集
-     * @return
-     */
-    public EntityWrapper<T> andIfNeed(boolean need, String sqlAnd, Object... params) {
-        addFilterIfNeed(need, AND_WORD, sqlAnd, params);
-        return this;
-    }
-
-    /**
-     * <p>SQL中AND关键字跟的条件语句</p>
-     * <p>eg: ew.where("name='zhangsan'").or("password is not null")</p>
-     *
-     * @param sqlOr  or条件语句
-     * @param params 参数集
-     * @return
-     */
-    public EntityWrapper<T> or(String sqlOr, Object... params) {
-        addFilter(OR_WORD, sqlOr, params);
-        return this;
-    }
-
-    /**
-     * <p>与or方法的区别是 可根据需要判断是否添加该条件</p>
-     *
-     * @param need   是否需要使用OR条件
-     * @param sqlOr  OR条件语句
-     * @param params 参数集
-     * @return
-     */
-    public EntityWrapper<T> orIfNeed(boolean need, String sqlOr, Object... params) {
-        addFilterIfNeed(need, OR_WORD, sqlOr, params);
-        return this;
-    }
-
-    /**
-     * <p>SQL中groupBy关键字跟的条件语句</p>
-     * <p>eg: ew.where("name='zhangsan'").and("id={0}",22).and("password is not null")
-     * .groupBy("id,name")
-     * </p>
-     *
-     * @param sqlGroupBy sql中的Group by语句，无需输入Group By关键字
-     * @return this
-     */
-    public EntityWrapper<T> groupBy(String sqlGroupBy) {
-        addFilter(GROUPBY_WORD, sqlGroupBy);
-        return this;
-    }
-
-    /**
-     * <p>SQL中having关键字跟的条件语句</p>
-     * <p>eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null")
-     * </p>
-     *
-     * @param sqlHaving having关键字后面跟随的语句
-     * @param params    参数集
-     * @return EntityWrapper
-     */
-    public EntityWrapper<T> having(String sqlHaving, Object... params) {
-        addFilter(HAVING_WORD, sqlHaving, params);
-        return this;
-    }
-
-    /**
-     * <p>SQL中orderby关键字跟的条件语句</p>
-     * <p>
-     * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null")
-     * .orderBy("id,name")
-     * </p>
-     *
-     * @param sqlOrderBy sql中的order by语句，无需输入Order By关键字
-     * @return this
-     */
-    public EntityWrapper<T> orderBy(String sqlOrderBy) {
-        addFilter(ORDERBY_WORD, sqlOrderBy);
-        return this;
-    }
-
-    /**
-     * <p>SQL中orderby关键字跟的条件语句，可根据变更动态排序</p>
-     *
-     * @param sqlOrderBy
-     * @param isAsc
-     * @return
-     */
-    public EntityWrapper<T> orderBy(String sqlOrderBy, boolean isAsc) {
-        addFilter(ORDERBY_WORD, sqlOrderBy);
-        if (isAsc) {
-            queryFilter.append(ASC_WORD);
-        } else {
-            queryFilter.append(DESC_WORD);
-        }
-        return this;
-    }
-
-
-    /**
-     * <p>
-     * SQL注入内容剥离
-     * </p>
-     *
-     * @param value 待处理内容
-     * @return
-     */
-    protected String stripSqlInjection(String value) {
-        return value.replaceAll("('.+--)|(--)|(\\|)|(%7C)", "");
-    }
-
-    /**
-     * <p>
-     * 添加查询条件
-     * </p>
-     * <p>
-     * 例如： ew.addFilter("name={0}", "'123'") <br>
-     * 输出：name='123'
-     * </p>
-     *
-     * @param filter SQL 片段内容
-     * @param params 格式参数
-     * @return
-     */
-    private EntityWrapper<T> addFilter(String keyWord, String filter, Object... params) {
-        if (StringUtils.isEmpty(filter)) {
-            return this;
-        }
-        queryFilter.append(keyWord);
-        if (null != params && params.length >= 1) {
-            queryFilter.append(MessageFormat.format(filter, params));
-        } else {
-            queryFilter.append(filter);
-        }
-        return this;
-    }
-
-    /**
-     * <p>
-     * 添加查询条件
-     * </p>
-     * <p>
-     * 例如： ew.addFilter("name={0}", "'123'").addFilterIfNeed(false, " ORDER BY id") <br>
-     * 输出：name='123'
-     * </p>
-     *
-     * @param keyWord    SQL关键字
-     * @param willAppend 判断条件 true 输出 SQL 片段，false 不输出
-     * @param filter     SQL 片段
-     * @param params     格式参数
-     * @return
-     */
-    private EntityWrapper<T> addFilterIfNeed(boolean willAppend, String keyWord, String filter, Object... params) {
-        if (willAppend) {
-            addFilter(keyWord, filter, params);
-        }
-        return this;
-    }
+		if (tempQuery.trim().toUpperCase().indexOf("ORDER BY") == 0) {
+			return stripSqlInjection(queryFilter.toString());
+		}
+
+		/*
+		 * SQL 片段，兼容非 T-SQL 语法
+		 */
+		if (!tsql) {
+			StringBuffer sqlSegment = new StringBuffer();
+			if (null == this.getEntity()) {
+				sqlSegment.append(WHERE);
+			} else {
+				sqlSegment.append(AND);
+			}
+			sqlSegment.append(queryFilter.toString());
+			return stripSqlInjection(sqlSegment.toString());
+		}
+
+		/*
+		 * 使用防SQL注入处理后返回
+		 */
+		return stripSqlInjection(queryFilter.toString());
+	}
+
+	/**
+	 * <p>
+	 * SQL中WHERE关键字跟的条件语句
+	 * </p>
+	 * <p>
+	 * eg: ew.where("name='zhangsan'").and("id={0}",22).and(
+	 * "password is not null")
+	 * </p>
+	 *
+	 * @param sqlWhere
+	 *            where语句
+	 * @param params
+	 *            参数集
+	 * @return
+	 */
+	public EntityWrapper<T> where(String sqlWhere, Object... params) {
+		if (tsql) {
+			throw new MybatisPlusException("SQL already contains the string where.");
+		}
+		/*
+		 * 使用 T-SQL 语法
+		 */
+		tsql = true;
+		if (null == this.getEntity()) {
+			addFilter(WHERE, sqlWhere, params);
+		} else {
+			addFilter(AND, sqlWhere, params);
+		}
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL中 AND 关键字跟的条件语句
+	 * </p>
+	 * <p>
+	 * eg: ew.where("name='zhangsan'").and("id={0}",22).and(
+	 * "password is not null")
+	 * </p>
+	 *
+	 * @param sqlAnd
+	 *            and连接串
+	 * @param params
+	 *            参数集
+	 * @return
+	 */
+	public EntityWrapper<T> and(String sqlAnd, Object... params) {
+		addFilter(AND, sqlAnd, params);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * 与 AND 方法的区别是 可根据需要判断是否添加该条件
+	 * </p>
+	 *
+	 * @param need
+	 *            是否需要使用该and条件
+	 * @param sqlAnd
+	 *            and条件语句
+	 * @param params
+	 *            参数集
+	 * @return
+	 */
+	public EntityWrapper<T> andIfNeed(boolean need, String sqlAnd, Object... params) {
+		addFilterIfNeed(need, AND, sqlAnd, params);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL中AND关键字跟的条件语句
+	 * </p>
+	 * <p>
+	 * eg: ew.where("name='zhangsan'").or("password is not null")
+	 * </p>
+	 *
+	 * @param sqlOr
+	 *            or条件语句
+	 * @param params
+	 *            参数集
+	 * @return
+	 */
+	public EntityWrapper<T> or(String sqlOr, Object... params) {
+		addFilter(OR, sqlOr, params);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * 与or方法的区别是 可根据需要判断是否添加该条件
+	 * </p>
+	 *
+	 * @param need
+	 *            是否需要使用OR条件
+	 * @param sqlOr
+	 *            OR条件语句
+	 * @param params
+	 *            参数集
+	 * @return
+	 */
+	public EntityWrapper<T> orIfNeed(boolean need, String sqlOr, Object... params) {
+		addFilterIfNeed(need, OR, sqlOr, params);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL中groupBy关键字跟的条件语句
+	 * </p>
+	 * <p>
+	 * eg: ew.where("name='zhangsan'").and("id={0}",22).and(
+	 * "password is not null") .groupBy("id,name")
+	 * </p>
+	 *
+	 * @param sqlGroupBy
+	 *            SQL 中的 Group by 语句，无需输入 Group By 关键字
+	 * @return this
+	 */
+	public EntityWrapper<T> groupBy(String sqlGroupBy) {
+		addFilter(GROUPBY, sqlGroupBy);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL中having关键字跟的条件语句
+	 * </p>
+	 * <p>
+	 * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null")
+	 * </p>
+	 *
+	 * @param sqlHaving
+	 *            having关键字后面跟随的语句
+	 * @param params
+	 *            参数集
+	 * @return EntityWrapper
+	 */
+	public EntityWrapper<T> having(String sqlHaving, Object... params) {
+		addFilter(HAVING, sqlHaving, params);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL中orderby关键字跟的条件语句
+	 * </p>
+	 * <p>
+	 * eg: ew.groupBy("id,name").having("id={0}",22).and("password is not null"
+	 * ).orderBy("id,name")
+	 * </p>
+	 *
+	 * @param sqlOrderBy
+	 *            SQL 中的 order by 语句，无需输入 Order By 关键字
+	 * @return this
+	 */
+	public EntityWrapper<T> orderBy(String sqlOrderBy) {
+		addFilter(ORDERBY, sqlOrderBy);
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL中orderby关键字跟的条件语句，可根据变更动态排序
+	 * </p>
+	 *
+	 * @param sqlOrderBy
+	 *            SQL 中的 order by 语句，无需输入 Order By 关键字
+	 * @param isAsc
+	 *            是否为升序
+	 * @return
+	 */
+	public EntityWrapper<T> orderBy(String sqlOrderBy, boolean isAsc) {
+		addFilter(ORDERBY, sqlOrderBy);
+		if (isAsc) {
+			queryFilter.append(ASC);
+		} else {
+			queryFilter.append(DESC);
+		}
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * SQL注入内容剥离
+	 * </p>
+	 *
+	 * @param value
+	 *            待处理内容
+	 * @return
+	 */
+	protected String stripSqlInjection(String value) {
+		return value.replaceAll("('.+--)|(--)|(\\|)|(%7C)", "");
+	}
+
+	/**
+	 * <p>
+	 * 添加查询条件
+	 * </p>
+	 * <p>
+	 * 例如：ew.addFilter("name={0}", "'123'") <br>
+	 * 输出：name='123'
+	 * </p>
+	 *
+	 * @param keyWord
+	 *            SQL关键字
+	 * @param filter
+	 *            SQL 片段内容
+	 * @param params
+	 *            格式参数
+	 * @return
+	 */
+	protected EntityWrapper<T> addFilter(String keyWord, String filter, Object... params) {
+		if (StringUtils.isEmpty(filter)) {
+			return this;
+		}
+		if (StringUtils.isNotEmpty(keyWord)) {
+			queryFilter.append(keyWord);
+		}
+		if (null != params && params.length >= 1) {
+			queryFilter.append(MessageFormat.format(filter, params));
+		} else {
+			queryFilter.append(filter);
+		}
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * 添加查询条件
+	 * </p>
+	 * <p>
+	 * 例如：ew.addFilter("name={0}", "'123'") <br>
+	 * 输出：name='123'
+	 * </p>
+	 *
+	 * @param filter
+	 *            SQL 片段内容
+	 * @param params
+	 *            格式参数
+	 * @return
+	 */
+	public EntityWrapper<T> addFilter(String filter, Object... params) {
+		return addFilter(null, filter, params);
+	}
+
+	/**
+	 * <p>
+	 * 添加查询条件
+	 * </p>
+	 * <p>
+	 * 例如：ew.addFilter("name={0}", "'123'").addFilterIfNeed(false,
+	 * " ORDER BY id") <br>
+	 * 输出：name='123'
+	 * </p>
+	 *
+	 * @param keyWord
+	 *            SQL关键字
+	 * @param willAppend
+	 *            判断条件 true 输出 SQL 片段，false 不输出
+	 * @param filter
+	 *            SQL 片段
+	 * @param params
+	 *            格式参数
+	 * @return
+	 */
+	protected EntityWrapper<T> addFilterIfNeed(boolean willAppend, String keyWord, String filter, Object... params) {
+		if (willAppend) {
+			addFilter(keyWord, filter, params);
+		}
+		return this;
+	}
+
+	/**
+	 * <p>
+	 * 添加查询条件
+	 * </p>
+	 * <p>
+	 * 例如：ew.addFilter("name={0}", "'123'").addFilterIfNeed(false,
+	 * " ORDER BY id") <br>
+	 * 输出：name='123'
+	 * </p>
+	 *
+	 * @param willAppend
+	 *            判断条件 true 输出 SQL 片段，false 不输出
+	 * @param filter
+	 *            SQL 片段
+	 * @param params
+	 *            格式参数
+	 * @return
+	 */
+	public EntityWrapper<T> addFilterIfNeed(boolean willAppend, String filter, Object... params) {
+		return addFilterIfNeed(willAppend, null, filter, params);
+	}
 
 }

mybatis-plus/src/main/java/com/baomidou/mybatisplus/plugins/Page.java

@@ -15,11 +15,12 @@
  */
 package com.baomidou.mybatisplus.plugins;
 
-import com.baomidou.mybatisplus.plugins.pagination.Pagination;
-
 import java.util.Collections;
 import java.util.List;
 
+import com.baomidou.mybatisplus.plugins.pagination.Pagination;
+import com.baomidou.mybatisplus.toolkit.StringUtils;
+
 /**
  * <p>
  * 实现分页辅助类
@@ -30,38 +31,78 @@ import java.util.List;
  */
 public class Page<T> extends Pagination {
 
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 查询数据列表
-     */
-    private List<T> records = Collections.emptyList();
-
-    public Page() {
-        /* 注意，传入翻页参数 */
-    }
-
-    public Page(int current, int size) {
-        super(current, size);
-    }
-
-    public List<T> getRecords() {
-        return records;
-    }
-
-    public void setRecords(List<T> records) {
-        this.records = records;
-    }
-
-    @Override
-    public String toString() {
-        StringBuffer pg = new StringBuffer();
-        pg.append(" Page:{ [").append(super.toString()).append("], ");
-        if (records != null) {
-            pg.append("records-size:").append(records.size());
-        } else {
-            pg.append("records is null");
-        }
-        return pg.append(" }").toString();
-    }
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 查询数据列表
+	 */
+	private List<T> records = Collections.emptyList();
+
+	/**
+	 * <p>
+	 * SQL 排序 ORDER BY 字段，例如： id DESC（根据id倒序查询）
+	 * </p>
+	 * <p>
+	 * DESC 表示按倒序排序(即：从大到小排序)<br>
+	 * ASC 表示按正序排序(即：从小到大排序)
+	 * </p>
+	 */
+	private String orderByField;
+
+	/**
+	 * 是否为升序 ASC（ 默认： true ）
+	 */
+	private boolean isAsc = true;
+
+	public Page() {
+		/* 注意，传入翻页参数 */
+	}
+
+	public Page(int current, int size) {
+		super(current, size);
+	}
+
+	public Page(int current, int size, String orderByField) {
+		super(current, size);
+		this.setOrderByField(orderByField);
+	}
+
+	public List<T> getRecords() {
+		return records;
+	}
+
+	public void setRecords(List<T> records) {
+		this.records = records;
+	}
+
+	public String getOrderByField() {
+		return orderByField;
+	}
+
+	public void setOrderByField(String orderByField) {
+		if (StringUtils.isNotEmpty(orderByField)) {
+			this.orderByField = orderByField;
+		}
+	}
+
+	public boolean isAsc() {
+		return isAsc;
+	}
+
+	public void setAsc(boolean isAsc) {
+		this.isAsc = isAsc;
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer pg = new StringBuffer();
+		pg.append(" Page:{ [").append(super.toString()).append("], ");
+		if (records != null) {
+			pg.append("records-size:").append(records.size());
+		} else {
+			pg.append("records is null");
+		}
+		return pg.append(" }").toString();
+	}
+
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java

@@ -31,68 +31,109 @@ import com.baomidou.mybatisplus.test.mysql.entity.User;
  */
 public class EntityWrapperTest {
 
-    /*
-     * User 查询包装器
-     */
-    private EntityWrapper<User> ew = new EntityWrapper<User>();
+	/*
+	 * User 查询包装器
+	 */
+	private EntityWrapper<User> ew = new EntityWrapper<User>();
 
-    @Test
-    public void test() {
-        /*
-         * 无条件测试
+	@Test
+	public void test() {
+		/*
+		 * 无条件测试
 		 */
-        Assert.assertNull(ew.getSqlSegment());
-    }
+		Assert.assertNull(ew.getSqlSegment());
+	}
 
-    @Test
-    public void test1() {
-        ew.setEntity(new User(1));
-        ew.and("name={0}", "'123'").andIfNeed(false, "id=12");
-        String sqlSegment = ew.getSqlSegment();
-        System.err.println(sqlSegment);
-        Assert.assertEquals(" AND name='123'", sqlSegment);
-    }
+	@Test
+	public void test11() {
+		ew.setEntity(new User(1));
+		ew.where("name={0}", "'123'").andIfNeed(false, "id=12");
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("test11 = " + sqlSegment);
+		Assert.assertEquals(" AND name='123'", sqlSegment);
+	}
 
-    @Test
-    public void test2() {
-        ew.setEntity(new User(1));
-        ew.and("name={0}", "'123'").orderBy("id", false);
-        String sqlSegment = ew.getSqlSegment();
-        System.err.println(sqlSegment);
-        Assert.assertEquals(" AND name='123' ORDER BY id DESC ", sqlSegment);
-    }
+	@Test
+	public void test12() {
+		ew.setEntity(new User(1));
+		ew.where("name={0}", "'123'").orderBy("id", false);
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("test12 = " + sqlSegment);
+		Assert.assertEquals(" AND name='123' ORDER BY id DESC ", sqlSegment);
+	}
 
-    @Test
-    public void test3() {
-        ew.setEntity(new User(1));
-        ew.orderBy("id", false);
-        String sqlSegment = ew.getSqlSegment();
-        System.err.println(sqlSegment);
-        Assert.assertEquals(" ORDER BY id DESC ", sqlSegment);
-    }
+	@Test
+	public void test13() {
+		/*
+		 * 存在实体查询，只排序
+		 */
+		ew.setEntity(new User(1));
+		ew.orderBy("id", false);
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("test13 = " + sqlSegment);
+		Assert.assertEquals(" ORDER BY id DESC ", sqlSegment);
+	}
+
+	@Test
+	public void test21() {
+		ew.where("name={0}", "'123'").andIfNeed(false, "id=1").orderBy("id");
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("test21 = " + sqlSegment);
+		Assert.assertEquals(" WHERE name='123' ORDER BY id", sqlSegment);
+	}
+
+	@Test
+	public void test22() {
+		ew.where("name={0}", "'123'").orderBy("id", false);
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("test22 = " + sqlSegment);
+		Assert.assertEquals(" WHERE name='123' ORDER BY id DESC ", sqlSegment);
+	}
+
+	@Test
+	public void test23() {
+		/*
+		 * 无实体查询，只排序
+		 */
+		ew.orderBy("id", false);
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("test23 = " + sqlSegment);
+		Assert.assertEquals(" ORDER BY id DESC ", sqlSegment);
+	}
 
-    @Test
-    public void test21() {
-        ew.where("name={0}", "'123'").andIfNeed(false, "id=1").orderBy("id");
-        String sqlSegment = ew.getSqlSegment();
-        System.err.println(sqlSegment);
-        Assert.assertEquals(" WHERE name='123' ORDER BY id", sqlSegment);
-    }
+	@Test
+	public void testBlend() {
+		/*
+		 * 实体查询，混合 SQL 原样输出
+		 */
+		ew.setEntity(new User(1));
+		ew.addFilter("name={0}", "'123'").orderBy("id", false);
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("testBlend = " + sqlSegment);
+		Assert.assertEquals(" AND name='123' ORDER BY id DESC ", sqlSegment);
+	}
 
-    @Test
-    public void test22() {
-        ew.where("name={0}", "'123'").orderBy("id", false);
-        String sqlSegment = ew.getSqlSegment();
-        System.err.println(sqlSegment);
-        Assert.assertEquals(" WHERE name='123' ORDER BY id DESC ", sqlSegment);
-    }
+	@Test
+	public void testNoTSQL() {
+		/*
+		 * 非 T-SQL 实体查询
+		 */
+		ew.setEntity(new User(1));
+		ew.addFilter("name={0}", "'123'").addFilterIfNeed(true, " order by id");
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("testNoTSQL = " + sqlSegment);
+		Assert.assertEquals(" AND name='123' order by id", sqlSegment);
+	}
 
-    @Test
-    public void test23() {
-        ew.orderBy("id",false);
-        String sqlSegment = ew.getSqlSegment();
-        System.err.println(sqlSegment);
-        Assert.assertEquals(" ORDER BY id DESC ", sqlSegment);
-    }
+	@Test
+	public void testNoTSQL1() {
+		/*
+		 * 非 T-SQL 无实体查询
+		 */
+		ew.addFilter("name={0}", "'123'").addFilterIfNeed(false, " order by id");
+		String sqlSegment = ew.getSqlSegment();
+		System.err.println("testNoTSQL1 = " + sqlSegment);
+		Assert.assertEquals(" WHERE name='123'", sqlSegment);
+	}
 
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java

@@ -237,9 +237,7 @@ public class UserMapperTest {
 		/*
          * 查询条件，SQL 片段(根据常用的写SQL的方式按顺序添加相关条件即可)
 		 */
-        ew.and("name like {0}", "'%dateBatch%'")
-                .and("age={0}", 3)
-                .orderBy("age,name", true);
+        ew.where("name like {0}", "'%dateBatch%'").and("age={0}", 3).orderBy("age,name", true);
         List<User> paginList = userMapper.selectPage(page, ew);
         page.setRecords(paginList);
         for (int i = 0; i < page.getRecords().size(); i++) {