dev-1.2.0

Author: xlorne

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

@@ -3,6 +3,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
@@ -26,67 +27,45 @@ public QueryBuilder select(String select) {
     public class Condition {
         private List<ConditionParameter> conditions = new ArrayList<>();
 
-        public Splice notNullCondition(String conditionSql,String paramKey, Object paramVal) {
+        public Splice condition(String conditionSql,String paramKey, Object paramVal) {
             if(paramVal!=null) {
                 conditions.add(new ConditionParameter(paramKey, paramVal, conditionSql));
             }else{
-                conditions.add(new ConditionParameter("1=1"));
+                splice.remove();
             }
             return splice;
         }
 
-        public Splice condition(String conditionSql,String paramKey, Object paramVal) {
-            conditions.add(new ConditionParameter(paramKey, paramVal, conditionSql));
-            return splice;
-        }
 
-        public Splice notNullCondition(String conditionSql,Map<String,Object> map) {
+        public Splice condition(String conditionSql,Map<String,Object> map) {
             if(map!=null&&map.size()>0) {
                 conditions.add(new ConditionParameter(map, conditionSql));
             }else{
-                conditions.add(new ConditionParameter("1=1"));
+                splice.remove();
             }
             return splice;
         }
 
-        public Splice condition(String conditionSql,Map<String,Object> map) {
-            conditions.add(new ConditionParameter(map, conditionSql));
-            return splice;
-        }
-
-        public Splice condition(String conditionSql) {
-            conditions.add(new ConditionParameter(conditionSql));
-            return splice;
-        }
 
-        public Splice notNullCondition(String conditionSql,Object paramVal) {
+        public Splice condition(String conditionSql,Object paramVal) {
             if(paramVal!=null) {
                 conditions.add(new ConditionParameter(paramVal, conditionSql));
             }else{
-                conditions.add(new ConditionParameter("1=1"));
+                splice.remove();
             }
             return splice;
         }
 
-        public Splice condition(String conditionSql,Object paramVal) {
-            conditions.add(new ConditionParameter( paramVal, conditionSql));
-            return splice;
-        }
 
-        public Splice notNullCondition(String conditionSql,Object... paramVal) {
+        public Splice condition(String conditionSql,Object... paramVal) {
             if(paramVal!=null&&paramVal.length>0) {
                 conditions.add(new ConditionParameter(StringUtils.join(paramVal, ","), conditionSql));
             }else{
-                conditions.add(new ConditionParameter("1=1"));
+                splice.remove();
             }
             return splice;
         }
 
-        public Splice condition(String conditionSql,Object... paramVal) {
-            conditions.add(new ConditionParameter(StringUtils.join(paramVal,","), conditionSql));
-            return splice;
-        }
-
     }
 
     public class Splice {
@@ -116,6 +95,8 @@ public Condition splice(String splice) {
             return condition;
         }
 
+
+
         public QueryBuilder orderBy(String orderByStr) {
             bySql = String.format(" order by %s",orderByStr);
             return QueryBuilder.this;
@@ -129,6 +110,12 @@ public QueryBuilder groupBy(String groupBySql) {
         public Query builder() {
             return new Query(select, condition.conditions, splice.splices, bySql);
         }
+
+        public void remove() {
+            if(splices.size()>0) {
+                splices.remove(splices.size()-1);
+            }
+        }
     }
 
     public Query builder() {

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

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 import java.util.HashMap;
 
 class QueryTest {
@@ -54,8 +55,6 @@ void queryView() throws InvocationTargetException, IllegalAccessException {
                 .condition("d.name = '1'")
                 .and()
                 .condition("create_time=STR_TO_DATE(%{createTime},'%Y-%m-%d')","createTime","2020-01-12")
-//                .or()
-//                .condition("d.id",1,2,3,4,5)
                 .orderBy("d.name desc")
                 .builder();
         SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query);
@@ -65,12 +64,13 @@ void queryView() throws InvocationTargetException, IllegalAccessException {
 
     @Test
     void queryNotNullView() throws InvocationTargetException, IllegalAccessException {
+        Object object = Arrays.asList(1,2,3,4,5,6,7,8,9,10);
         Query query = QueryBuilder.Build()
                 .select("select * from t_demo d join t_test t on d.id = t.demo_id ")
                 .where()
-                .notNullCondition("d.name1 = #{name}","123",null)
-                .or()
-                .notNullCondition("d.name2 = #{name}",new HashMap<>())
+                .condition("d.name = #{name}","112")
+                .and()
+                .condition("d.id in (%{ids})",object)
                 .builder();
         SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query);
         String sql = sqlBuilder.getSql();