or 查询优化

xuejike · xuejike · commit a3ff84695175 · 2020-12-31T10:31:21.000+08:00
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ LambdaQuery 将支持通过Lambda进行多种数据源的查询 实现java端的
 * [ ] 实现 新增,删除,更新等基础操作[开发中]
 
 ### 2. mybatis-plus
-* [ ] 接入mybatis-plus的查询接口
+* [x] 接入mybatis-plus的查询接口(已完成)
 * [ ] 接入mybatis-plus 的新增,删除,更新操作
 * [ ] 新增LoadJoin功能,通过selectIn的方式进行数据表join
 * [ ] 新增Cache功能,采用redis 进行数据缓存,配合selectIn方式避免join查询直接访问数据库
@@ -45,13 +45,67 @@ LambdaQuery 将支持通过Lambda进行多种数据源的查询 实现java端的
 
 
 
-### 3.持久化操作
+## 使用说明
+### 1.依赖引入
+1. springBoot自动配置
+```xml
+      <dependency>
+            <groupId>com.github.xuejike</groupId>
+            <artifactId>lambda-query-mongo-starter</artifactId>
+            <version>${jkquery.version}</version>
+        </dependency>
+```
+2. 手动配置
 
-* 新增
-* 删除
-* 更新
-* 条件更新
+引入依赖
+```xml
+      <dependency>
+            <groupId>com.github.xuejike</groupId>
+            <artifactId>lambda-query-mongo</artifactId>
+            <version>${jkquery.version}</version>
+        </dependency>
+```
 
-## 扩展其他查询
+初始化工厂类
+```java
+
+MongoDaoFactory mongoDaoFactory =   new MongoDaoFactory(mongoTemplate);
+
+```
+### 2.Mongo查询器使用
+
+1. 创建实体类
+
+```java
+@Document("demo_doc")
+@Data
+// 采用mongo进行查询
+@MongoDaoSelect
+public class TestDoc {
+    @MongoId
+    private String id;
+    private String name;
+    private String title;
+    private Long num;
+    private List<Title> toc;
+    @Data
+    public static class Title{
+        private String title;
+        private String desc;
+
+    }
+}
+
+```
+
+2. 进行查询
+```java
+        JkLambdaQuery<TestDoc> lambda = JkQuerys.lambdaQuery(TestDoc.class);
+
+
+```
+
+
+### 3.MybatisPlus查询器使用
 
 
diff --git a/lambda-query-core/src/main/java/com/github/xuejike/query/core/base/BaseNestedWhereQuery.java b/lambda-query-core/src/main/java/com/github/xuejike/query/core/base/BaseNestedWhereQuery.java
@@ -6,7 +6,7 @@
  * @author xuejike
  * @date 2020/12/18
  */
-public class BaseNestedWhereQuery<T,F,C extends BaseWhereQuery>  extends BaseSimpleWhereQuery<T,F,C>{
+public class BaseNestedWhereQuery<T,F,C extends BaseWhereQuery<T,F,C>>  extends BaseSimpleWhereQuery<T,F,C>{
 
     public BaseNestedWhereQuery() {
 
diff --git a/lambda-query-core/src/main/java/com/github/xuejike/query/core/base/BaseSimpleWhereQuery.java b/lambda-query-core/src/main/java/com/github/xuejike/query/core/base/BaseSimpleWhereQuery.java
@@ -4,7 +4,7 @@
  * @author xuejike
  * @date 2020/12/18
  */
-public class BaseSimpleWhereQuery<T,F,C extends BaseWhereQuery>  extends BaseWhereQuery<T,F,C>{
+public class BaseSimpleWhereQuery<T,F,C extends BaseWhereQuery<T,F,C>>  extends BaseWhereQuery<T,F,C>{
 
 
     public BaseSimpleWhereQuery() {
diff --git a/lambda-query-core/src/main/java/com/github/xuejike/query/core/base/BaseWhereQuery.java b/lambda-query-core/src/main/java/com/github/xuejike/query/core/base/BaseWhereQuery.java
@@ -22,7 +22,7 @@
  * @date 2020/12/16
  */
 
-public class BaseWhereQuery<T,F,C extends BaseWhereQuery> implements  WhereCriteria<C,F>,SelectCriteria<C,F>{
+public class BaseWhereQuery<T,F,C extends BaseWhereQuery<T,F,C>> implements  WhereCriteria<C,F>,SelectCriteria<C,F>{
     protected Map<Object, Map<WhereOperation,Object>> whereMap = new ConcurrentHashMap<>();
     protected List<BaseWhereQuery<T,F,?>> orList = new LinkedList<>();
     protected List<FieldInfo> selectList = new LinkedList<>();
diff --git a/lambda-query-core/src/main/java/com/github/xuejike/query/core/criteria/DaoCriteria.java b/lambda-query-core/src/main/java/com/github/xuejike/query/core/criteria/DaoCriteria.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author xuejike
@@ -17,6 +18,12 @@ public interface DaoCriteria<T> {
     default List<T> list(){
         return getDao().list();
     }
+    default T getFirst(){
+        return getDao().getFirst();
+    }
+    default Optional<T> getFirstStream(){
+        return Optional.ofNullable(getFirst());
+    }
     default Long count(){
         return getDao().count();
     }
@@ -38,6 +45,9 @@ default T findById(Serializable id){
         return getDao().findById(id);
     }
 
+    default Optional<T> findByIdStream(Serializable id){
+        return Optional.ofNullable(findById(id));
+    }
     /**
      * 根据ID进行更新
      * @param entity
diff --git a/lambda-query-mongo/src/main/java/com/github/xuejike/query/mongo/MongoDao.java b/lambda-query-mongo/src/main/java/com/github/xuejike/query/mongo/MongoDao.java
@@ -75,6 +75,18 @@ public DaoCriteria<T> getDao() {
     }
 
 
+    @Override
+    public T getFirst() {
+        Query query = buildQuery();
+        query.limit(1);
+        List<T> list = mongoTemplate.find(query, entityCls);
+        if (list.isEmpty()){
+            return null;
+        }else{
+            return list.get(0);
+        }
+
+    }
 
     @Override
     public List<T> list() {
diff --git a/lambda-query-mongo/src/main/java/com/github/xuejike/query/mongo/MongoQueryBuilder.java b/lambda-query-mongo/src/main/java/com/github/xuejike/query/mongo/MongoQueryBuilder.java
@@ -1,17 +1,15 @@
 package com.github.xuejike.query.mongo;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.xuejike.query.core.base.BaseNestedWhereQuery;
 import com.github.xuejike.query.core.enums.WhereOperation;
 import com.github.xuejike.query.core.po.*;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.IntFunction;
 import java.util.stream.Collectors;
 
@@ -31,37 +29,34 @@ public static Query builder(QueryInfo queryInfo) {
             updateCriteria(where,item.getVal());
             query.addCriteria(where);
         }
-        List<QueryInfo> or = queryInfo.getOr();
+        if (CollUtil.isNotEmpty(queryInfo.getOr())){
+            Criteria criteria = new Criteria();
+            Criteria[] criteriaArray = queryInfo.getOr().stream().map(MongoQueryBuilder::orBuildItem).toArray(Criteria[]::new);
+            query.addCriteria(criteria.orOperator(criteriaArray));
 
-
-        Criteria[] criteriaList = or.stream().map(MongoQueryBuilder::buildItem).filter(Objects::nonNull).toArray(Criteria[]::new);
-        if (criteriaList.length > 0){
-            Criteria orCriteria = new Criteria();
-            orCriteria.orOperator(criteriaList);
-            query.addCriteria(orCriteria);
         }
 
         return query;
     }
-    protected static Criteria buildItem(QueryInfo queryInfo){
+
+
+    protected static Criteria orBuildItem(QueryInfo queryInfo){
         if (queryInfo.getAnd().isEmpty() && queryInfo.getOr().isEmpty()){
             return null;
         }
+        ArrayList<Criteria> list = new ArrayList<>(queryInfo.getAnd().size() + queryInfo.getOr().size());
         Criteria criteria = new Criteria();
+
         List<QueryItem> and = queryInfo.getAnd();
         for (QueryItem item : and) {
             Criteria where = Criteria.where(buildField(item.getField()));
             updateCriteria(where,item.getVal());
-            criteria.andOperator(where);
+            list.add(where);
         }
 
-        List<QueryInfo> or = queryInfo.getOr();
-        for (QueryInfo info : or) {
-            Criteria buildItem = buildItem(info);
-            if (buildItem != null){
-                criteria.orOperator(buildItem);
-            }
-        }
+        List<Criteria> orList = queryInfo.getOr().stream().map(MongoQueryBuilder::orBuildItem).collect(Collectors.toList());
+        list.addAll(orList);
+        criteria.orOperator(list.toArray(new Criteria[0]));
         return criteria;
     }
     public static String buildField(FieldInfo fieldInfo){
@@ -74,30 +69,41 @@ public static String buildField(FieldInfo fieldInfo){
     }
     protected static void updateCriteria(Criteria criteria, Map<WhereOperation,Object> valMap){
         for (Map.Entry<WhereOperation, Object> entry : valMap.entrySet()) {
+            Object value = entry.getValue();
             switch (entry.getKey()){
                 case eq:
-                    criteria.is(entry.getValue());
+                    criteria.is(value);
                     break;
                 case gt:
-                    criteria.gt(entry.getValue());
+                    criteria.gt(value);
                     break;
                 case gte:
-                    criteria.gte(entry.getValue());
+                    criteria.gte(value);
                     break;
                 case lt:
-                    criteria.lt(entry.getValue());
+                    criteria.lt(value);
                     break;
                 case lte:
-                    criteria.lte(entry.getValue());
+                    criteria.lte(value);
                     break;
                 case in:
-                    criteria.in(entry.getValue());
+                    if (value instanceof Collection){
+                        criteria.in((Collection)value);
+                    }else{
+                        criteria.in(value);
+                    }
+
                     break;
                 case notIn:
-                    criteria.nin(entry.getValue());
+                    if (value instanceof Collection){
+                        criteria.nin((Collection)value);
+                    }else{
+                        criteria.nin(value);
+                    }
+
                     break;
                 case ne:
-                    criteria.ne(entry.getValue());
+                    criteria.ne(value);
                     break;
                 case isNull:
                     criteria.is(null);
@@ -106,10 +112,10 @@ protected static void updateCriteria(Criteria criteria, Map<WhereOperation,Objec
                     criteria.exists(true);
                     break;
                 case like:
-                    criteria.regex(regexVal(entry.getValue()));
+                    criteria.regex(regexVal(value));
                     break;
                 case between:
-                    BetweenObj obj = (BetweenObj) entry.getValue();
+                    BetweenObj obj = (BetweenObj) value;
                     criteria.gt(obj.getFirst());
                     criteria.lt(obj.getSecond());
                     break;
diff --git a/lambda-query-mybatis-plus/src/main/java/com/github/xuejike/query/mybatisplus/MyBatisPlusDao.java b/lambda-query-mybatis-plus/src/main/java/com/github/xuejike/query/mybatisplus/MyBatisPlusDao.java
@@ -52,11 +52,18 @@ protected QueryWrapper<T> buildQuery(){
         }
         return build;
     }
+
     @Override
     public DaoCriteria<T> getDao() {
         return this;
     }
 
+    @Override
+    public T getFirst() {
+        QueryWrapper<T> query = buildQuery();
+        return baseMapper.selectOne(query);
+    }
+
     @Override
     public List<T> list() {
         QueryWrapper<T> query = buildQuery();
diff --git a/mongo-demo/src/test/java/TestMain.java b/mongo-demo/src/test/java/TestMain.java

Original file line number	Diff line number	Diff line change
`@@ -52,11 +52,18 @@ protected QueryWrapper<T> buildQuery(){`
`52`	`52`	`}`
`53`	`53`	`return build;`
`54`	`54`	`}`
	`55`	`+`
`55`	`56`	`@Override`
`56`	`57`	`public DaoCriteria<T> getDao() {`
`57`	`58`	`return this;`
`58`	`59`	`}`
`59`	`60`
	`61`	`+ @Override`
	`62`	`+ public T getFirst() {`
	`63`	`+ QueryWrapper<T> query = buildQuery();`
	`64`	`+ return baseMapper.selectOne(query);`
	`65`	`+ }`
	`66`	`+`
`60`	`67`	`@Override`
`61`	`68`	`public List<T> list() {`
`62`	`69`	`QueryWrapper<T> query = buildQuery();`