|
@@ -18,6 +18,8 @@ package org.springblade.core.mp.support;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import org.springblade.core.launch.constant.TokenConstant;
|
|
|
+import org.springblade.core.tool.support.Kv;
|
|
|
import org.springblade.core.tool.utils.BeanUtil;
|
|
|
import org.springblade.core.tool.utils.Func;
|
|
|
|
|
@@ -33,8 +35,8 @@ public class Condition {
|
|
|
/**
|
|
|
* 转化成mybatis plus中的Page
|
|
|
*
|
|
|
- * @param query 查询包装类
|
|
|
- * @return Page T
|
|
|
+ * @param query 查询条件
|
|
|
+ * @return IPage
|
|
|
*/
|
|
|
public static <T> IPage<T> getPage(Query query) {
|
|
|
Page<T> page = new Page<>(Func.toInt(query.getCurrent(), 1), Func.toInt(query.getSize(), 10));
|
|
@@ -46,8 +48,8 @@ public class Condition {
|
|
|
/**
|
|
|
* 获取mybatis plus中的QueryWrapper
|
|
|
*
|
|
|
- * @param entity 实体类
|
|
|
- * @param <T> 泛型
|
|
|
+ * @param entity 实体
|
|
|
+ * @param <T> 类型
|
|
|
* @return QueryWrapper
|
|
|
*/
|
|
|
public static <T> QueryWrapper<T> getQueryWrapper(T entity) {
|
|
@@ -57,16 +59,28 @@ public class Condition {
|
|
|
/**
|
|
|
* 获取mybatis plus中的QueryWrapper
|
|
|
*
|
|
|
- * @param query 查询包装类
|
|
|
+ * @param query 查询条件
|
|
|
* @param clazz 实体类
|
|
|
- * @param <T> 泛型
|
|
|
+ * @param <T> 类型
|
|
|
* @return QueryWrapper
|
|
|
*/
|
|
|
public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Class<T> clazz) {
|
|
|
- query.remove("current");
|
|
|
- query.remove("size");
|
|
|
- query.remove("ascs");
|
|
|
- query.remove("descs");
|
|
|
+ Kv exclude = Kv.init().set(TokenConstant.HEADER, TokenConstant.HEADER)
|
|
|
+ .set("current", "current").set("size", "size").set("ascs", "ascs").set("descs", "descs");
|
|
|
+ return getQueryWrapper(query, exclude, clazz);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取mybatis plus中的QueryWrapper
|
|
|
+ *
|
|
|
+ * @param query 查询条件
|
|
|
+ * @param exclude 排除的查询条件
|
|
|
+ * @param clazz 实体类
|
|
|
+ * @param <T> 类型
|
|
|
+ * @return QueryWrapper
|
|
|
+ */
|
|
|
+ public static <T> QueryWrapper<T> getQueryWrapper(Map<String, Object> query, Map<String, Object> exclude, Class<T> clazz) {
|
|
|
+ exclude.forEach((k, v) -> query.remove(k));
|
|
|
QueryWrapper<T> qw = new QueryWrapper<>();
|
|
|
qw.setEntity(BeanUtil.newInstance(clazz));
|
|
|
SqlKeyword.buildCondition(query, qw);
|