view query

Author: xlorne

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.codingapi</groupId>
     <artifactId>simple-mybatis</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <name>simple-mybatis</name>
     <url>https://github.com/codingapi/simple-mybatis</url>
     <description>simple mybatis project for Spring Boot</description>

src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java

@@ -0,0 +1,46 @@
+package com.codingapi.simplemybatis.mapper;
+
+import com.codingapi.simplemybatis.page.PageList;
+import com.codingapi.simplemybatis.page.PageRequest;
+import com.codingapi.simplemybatis.provider.QueryProvider;
+import com.codingapi.simplemybatis.query.Query;
+import com.codingapi.simplemybatis.utils.MapBeanUtils;
+import com.codingapi.simplemybatis.utils.MapCamelUtils;
+import com.github.pagehelper.PageHelper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * @author lorne
+ * @date 2020/4/27
+ * @description
+ */
+public interface ViewMapper {
+
+    @SelectProvider(type = QueryProvider.class, method = "queryView")
+    List<Map<String, Object>> queryMap(@Param("query") Query query);
+
+    default <V> List<V> queryView(Class<V> clazz, Query query) {
+        List<Map<String, Object>> list = queryMap(query);
+        return list.stream().map(item -> {
+            MapCamelUtils.camelMap(item);
+            return MapBeanUtils.toBean(clazz, item);
+        }).collect(Collectors.toList());
+    }
+
+    default <T> PageList<T> page(int nowPage, int pageSize, Supplier<List<T>> supplier) {
+        PageHelper.startPage(nowPage, pageSize);
+        return new PageList<>(supplier.get());
+    }
+
+    default <T> PageList<T> page(PageRequest request, Supplier<List<T>> supplier) {
+        return page(request.getNowPage(), request.getPageSize(), supplier);
+    }
+
+
+}

src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java

@@ -30,14 +30,17 @@ public List<QueryParameter> getParameterList() {
             return parameterList;
         }
 
-        public void column(QueryParameter queryParameter) {
+        public Condition column(QueryParameter queryParameter) {
             parameterList.add(queryParameter);
+            return condition;
         }
 
-        public void column(String key, Object val, QueryCondition condition) {
-            parameterList.add(new QueryParameter(key, val, condition));
+        public Condition column(String key, Object val,String sql) {
+            parameterList.add(new QueryParameter(key, val, sql));
+            return condition;
         }
 
+
         /**
          * 完全匹配
          *

src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java

@@ -23,6 +23,7 @@ public QueryConditionParser() {
     }
 
     public String parserParam(QueryParameter queryParameter) {
+        queryParameter.getCondition().equals(QueryCondition.SQL);
         for (IConditionParser conditionParser : conditionParsers) {
             if (conditionParser.type().equals(queryParameter.getCondition())) {
                 return conditionParser.condition(queryParameter);

src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java

@@ -9,16 +9,30 @@
  */
 public class QueryParameter {
 
+    private String key;
+    private Object val;
+    private Object two;
+    private String sql;
+    private QueryCondition condition;
+
+
     public QueryParameter(String key, Object val, QueryCondition condition) {
         this.key = key;
         this.val = val;
         this.condition = condition;
     }
 
-    private String key;
-    private Object val;
-    private Object two;
-    private QueryCondition condition;
+    public QueryParameter(String key, Object val, String sql) {
+        this.key = key;
+        this.val = val;
+        this.sql = sql;
+        this.condition = QueryCondition.SQL;
+    }
+
+
+    public String getSql() {
+        return sql;
+    }
 
     public String getKey() {
         return key;

src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java

@@ -1,6 +1,7 @@
 package com.codingapi.simplemybatis.query;
 
 
+import com.codingapi.simplemybatis.query.parser.QueryCondition;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -42,7 +43,11 @@ private boolean hasParameter() {
 
     private void appendParameter() {
         for (QueryParameter queryParameter : query.getParameterList()) {
-            currentSql.append(queryConditionParser.parserParam(queryParameter));
+            if(queryParameter.getCondition().equals(QueryCondition.SQL)){
+                currentSql.append(queryParameter.getSql());
+            }else {
+                currentSql.append(queryConditionParser.parserParam(queryParameter));
+            }
             currentSql.append(query.getCondition());
         }
     }

src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java

@@ -13,6 +13,7 @@ public enum QueryCondition {
     BETWEEN,
     GREATER,
     LESS,
-    IN
+    IN,
+    SQL
 
 }

src/test/java/com/codingapi/simplemybatis/query/QueryTest.java

@@ -48,7 +48,8 @@ void queryView() throws InvocationTargetException, IllegalAccessException {
         Query query = QueryBuilder.Build()
                 .select("select * from t_demo d join t_test t on d.id = t.demo_id ")
                 .where()
-                .equal("d.name","hello")
+                .column("name","234","d.name = #{name}")
+//                .equal("d.name","hello")
                 .and()
                 .date("d.create_time","2020-01-12")
                 .or()