From 26424cf2d2605c091ce36fcb0bc9df23807d7a76 Mon Sep 17 00:00:00 2001 From: wangliang <1991wangliang@gmail.com> Date: Mon, 27 Apr 2020 20:24:29 +0800 Subject: [PATCH 01/17] view query --- pom.xml | 2 +- .../simplemybatis/mapper/ViewMapper.java | 46 +++++++++++++++++++ .../simplemybatis/query/QueryBuilder.java | 9 ++-- .../query/QueryConditionParser.java | 1 + .../simplemybatis/query/QueryParameter.java | 22 +++++++-- .../simplemybatis/query/QuerySqlBuilder.java | 7 ++- .../query/parser/QueryCondition.java | 3 +- .../simplemybatis/query/QueryTest.java | 3 +- 8 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java diff --git a/pom.xml b/pom.xml index 6318853..5bd57b8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codingapi simple-mybatis - 1.1.0 + 1.1.1 simple-mybatis https://github.com/codingapi/simple-mybatis simple mybatis project for Spring Boot diff --git a/src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java b/src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java new file mode 100644 index 0000000..1729e57 --- /dev/null +++ b/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> queryMap(@Param("query") Query query); + + default List queryView(Class clazz, Query query) { + List> list = queryMap(query); + return list.stream().map(item -> { + MapCamelUtils.camelMap(item); + return MapBeanUtils.toBean(clazz, item); + }).collect(Collectors.toList()); + } + + default PageList page(int nowPage, int pageSize, Supplier> supplier) { + PageHelper.startPage(nowPage, pageSize); + return new PageList<>(supplier.get()); + } + + default PageList page(PageRequest request, Supplier> supplier) { + return page(request.getNowPage(), request.getPageSize(), supplier); + } + + +} diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java index 8b6abb9..24c0545 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java +++ b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java @@ -30,14 +30,17 @@ public List 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; } + /** * 完全匹配 * diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java index 21120cc..44e14ea 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java +++ b/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); diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java b/src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java index 01f3b5a..4997b5a 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java +++ b/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; diff --git a/src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java index 105093a..28a3a79 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java +++ b/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()); } } diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java b/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java index 75df1dc..4d020a0 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java +++ b/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java @@ -13,6 +13,7 @@ public enum QueryCondition { BETWEEN, GREATER, LESS, - IN + IN, + SQL } diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index a0ceb67..b88db25 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/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() From 2343dc1065e40bfbfa0eddf88d6ae406e9e959e5 Mon Sep 17 00:00:00 2001 From: gitee-wangliang <1991wangliang@gmail.com> Date: Mon, 27 Apr 2020 22:41:36 +0800 Subject: [PATCH 02/17] dev-1.1.1 --- readme.md | 51 +++--- .../simplemybatis/parser/SqlParser.java | 6 +- .../simplemybatis/provider/QueryProvider.java | 6 +- .../query/ConditionParameter.java | 64 ++++++++ .../codingapi/simplemybatis/query/Query.java | 27 ++-- .../simplemybatis/query/QueryBuilder.java | 146 +++++------------- .../query/QueryConditionParser.java | 34 ---- .../simplemybatis/query/QueryParameter.java | 76 --------- .../{QuerySqlBuilder.java => SqlBuilder.java} | 25 +-- .../query/parser/BetweenConditionParser.java | 27 ---- .../query/parser/DateConditionParser.java | 25 --- .../query/parser/EqualConditionParser.java | 25 --- .../query/parser/GreaterConditionParser.java | 25 --- .../query/parser/IConditionParser.java | 17 -- .../query/parser/InConditionParser.java | 27 ---- .../query/parser/LessConditionParser.java | 25 --- .../query/parser/LikeConditionParser.java | 25 --- .../query/parser/QueryCondition.java | 19 --- .../utils/PatternMatcherHelper.java | 35 +++++ .../simplemybatis/query/QueryTest.java | 23 +-- 20 files changed, 204 insertions(+), 504 deletions(-) create mode 100644 src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java rename src/main/java/com/codingapi/simplemybatis/query/{QuerySqlBuilder.java => SqlBuilder.java} (67%) delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/BetweenConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/DateConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/EqualConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/GreaterConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/IConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/InConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/LessConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/LikeConditionParser.java delete mode 100644 src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java create mode 100644 src/main/java/com/codingapi/simplemybatis/utils/PatternMatcherHelper.java diff --git a/readme.md b/readme.md index 4b0c7a9..4689adf 100644 --- a/readme.md +++ b/readme.md @@ -146,32 +146,31 @@ query 通过QueryBuilder来创建，当查询返回的是表的数据，则不 select语句中的字段可以用下划线，也可以直接处理成小驼峰。都可以转成java bean对象。 ```java @Test - void viewList(){ - //select d.name,d.super_id from t_demo d join t_test t on t.demo_id = d.id where d.time = STR_TO_DATE('2020-04-12','%Y-$m-%d') or d.id = 31 and d.id in (1,2,3,4,5,6,7,8,9,10) and d.name like '%2%' order by d.name desc - List list = - demoMapper.queryView( - DemoView.class, - QueryBuilder.Build() - .select("select d.name,d.super_id from t_demo d join t_test t on t.demo_id = d.id ") - .where() - .date("d.time","2020-04-12") - .or() - .equal("d.id",31) - .and() - .in("d.id",1,2,3,4,5,6,7,8,9,10) - .and() - .like("d.name","2") - .orderBy("d.name desc") - .builder()); - log.info("list:{}",list); - } - - @Test - void queryList(){ - //select * from t_demo where name = '123' - List list = demoMapper.query(QueryBuilder.Build().where().equal("name","123").builder()); - log.info("list:{}",list); - } + void viewList(){ + List list = + demoMapper.queryView( + DemoView.class, + QueryBuilder.Build() + .select("select * from t_demo d left join t_refrigerator r on d.id = r.ID ") + .where() + .condition("d.id between #{small} and #{larger}", Map.of("small",1,"larger",10)) + .or() + .condition("r.state = #{state}",1) + .and() + .condition("d.id in (${ids})",1,2,3,4,5,6,7,8,9,10) + .or() + .condition("d.name like '%${name}%'","2") + .orderBy("d.id desc") + .builder()); + log.info("list:{}",list); + } + + @Test + void queryList(){ + //select * from t_demo where name = '123' + List list = demoMapper.query(QueryBuilder.Build().where().condition("name=#{name}","123").builder()); + log.info("list:{}",list); + } ``` ## 示例 diff --git a/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java b/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java index 45e7526..4609b30 100644 --- a/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java +++ b/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java @@ -1,7 +1,7 @@ package com.codingapi.simplemybatis.parser; import com.codingapi.simplemybatis.query.Query; -import com.codingapi.simplemybatis.query.QuerySqlBuilder; +import com.codingapi.simplemybatis.query.SqlBuilder; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -37,8 +37,8 @@ public String createSelectAll() { } public String createQuery(Query query) { - QuerySqlBuilder querySqlBuilder = new QuerySqlBuilder(tableInfo.columnToFiled(), tableInfo.getTableName(), query); - return querySqlBuilder.getSql(); + SqlBuilder sqlBuilder = new SqlBuilder(tableInfo.columnToFiled(), tableInfo.getTableName(), query); + return sqlBuilder.getSql(); } diff --git a/src/main/java/com/codingapi/simplemybatis/provider/QueryProvider.java b/src/main/java/com/codingapi/simplemybatis/provider/QueryProvider.java index 16af546..dfef768 100644 --- a/src/main/java/com/codingapi/simplemybatis/provider/QueryProvider.java +++ b/src/main/java/com/codingapi/simplemybatis/provider/QueryProvider.java @@ -2,7 +2,7 @@ import com.codingapi.simplemybatis.parser.SqlParser; import com.codingapi.simplemybatis.query.Query; -import com.codingapi.simplemybatis.query.QuerySqlBuilder; +import com.codingapi.simplemybatis.query.SqlBuilder; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.builder.annotation.ProviderContext; @@ -29,8 +29,8 @@ public String query(@Param("query") Query query, ProviderContext context) throws public String queryView(@Param("query") Query query, ProviderContext context) throws IllegalAccessException, InvocationTargetException { - QuerySqlBuilder querySqlBuilder = new QuerySqlBuilder(query.getSelect(), null, query); - return querySqlBuilder.getSql(); + SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(), null, query); + return sqlBuilder.getSql(); } diff --git a/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java b/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java new file mode 100644 index 0000000..40a4c70 --- /dev/null +++ b/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java @@ -0,0 +1,64 @@ +package com.codingapi.simplemybatis.query; + +import com.codingapi.simplemybatis.utils.PatternMatcherHelper; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * @author lorne + * @date 2020/4/15 + * @description + */ +public class ConditionParameter { + + private String sql; + private Map map; + + public ConditionParameter(String sql) { + this.map = new HashMap<>(); + this.sql = sql; + } + + public ConditionParameter(String key, Object val, String sql) { + this.map = new HashMap<>(); + this.sql = sql; + map.put(key,val); + } + + public ConditionParameter(Map map, String sql) { + this.map = map; + this.sql = sql; + } + + + public ConditionParameter(Object val, String sql) { + this.map = new HashMap<>(); + String key = new PatternMatcherHelper(PatternMatcherHelper.BRACE_MATCHER).matcher(sql); + map.put(key,val); + this.sql = sql; + } + + + public String getSql() { + for(String key:keys()) { + sql = sql.replace(String.format("{%s}", key), String.format("{%s}", getQueryParamKey(key))); + } + return sql; + } + + public Object getVal(String key) { + return map.get(key); + } + + public Set keys() { + return map.keySet(); + } + + private String getQueryParamKey(String key) { + return String.format("query.data.%s", key); + } + + +} diff --git a/src/main/java/com/codingapi/simplemybatis/query/Query.java b/src/main/java/com/codingapi/simplemybatis/query/Query.java index 39c02ba..2e6badc 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/Query.java +++ b/src/main/java/com/codingapi/simplemybatis/query/Query.java @@ -1,10 +1,9 @@ package com.codingapi.simplemybatis.query; -import com.codingapi.simplemybatis.query.parser.QueryCondition; - import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; /** * @author lorne @@ -14,7 +13,7 @@ public class Query { - private List parameterList; + private List parameterList; private List conditions; @@ -22,16 +21,16 @@ public class Query { private String select; - private String orderBy; + private String bySql; public Map data; - protected Query(String select, List parameterList, List conditions, String orderBy) { + protected Query(String select, List parameterList, List conditions, String bySql) { this.select = select; this.parameterList = parameterList; this.conditions = conditions; - this.orderBy = orderBy; + this.bySql = bySql; this.data = new HashMap<>(); pushData(); } @@ -40,15 +39,15 @@ public String getSelect() { return select; } - public String getOrderBy() { - return orderBy; + public String getBySql() { + return bySql; } public Map getData() { return data; } - public List getParameterList() { + public List getParameterList() { return parameterList; } @@ -61,12 +60,10 @@ public String getCondition() { } private void pushData() { - for (QueryParameter queryParameter : parameterList) { - if (queryParameter.getCondition().equals(QueryCondition.BETWEEN)) { - data.put(queryParameter.getKey(), queryParameter.getVal()); - data.put(queryParameter.getTwoKey(), queryParameter.getTwo()); - } else { - data.put(queryParameter.getKey(), queryParameter.getVal()); + for (ConditionParameter parameter : parameterList) { + Set keys = parameter.keys(); + for (String key : keys) { + data.put(key, parameter.getVal(key)); } } } diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java index 24c0545..acc7138 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java +++ b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java @@ -1,10 +1,10 @@ package com.codingapi.simplemybatis.query; -import com.codingapi.simplemybatis.query.parser.QueryCondition; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import java.util.Map; /** * @author lorne @@ -13,9 +13,9 @@ */ public class QueryBuilder { - private Parameter parameter = new Parameter(); private Condition condition = new Condition(); - private String orderBy; + private Splice splice = new Splice(); + private String bySql; private String select; public QueryBuilder select(String select) { @@ -23,149 +23,87 @@ public QueryBuilder select(String select) { return this; } - public class Parameter { - private List parameterList = new ArrayList<>(); + public class Condition { + private List conditions = new ArrayList<>(); - public List getParameterList() { - return parameterList; + public Splice condition(String conditionSql,String paramKey, Object paramVal) { + conditions.add(new ConditionParameter(paramKey, paramVal, conditionSql)); + return splice; } - public Condition column(QueryParameter queryParameter) { - parameterList.add(queryParameter); - return condition; + public Splice condition(String conditionSql,Map map) { + conditions.add(new ConditionParameter(map, conditionSql)); + return splice; } - public Condition column(String key, Object val,String sql) { - parameterList.add(new QueryParameter(key, val, sql)); - return condition; + public Splice condition(String conditionSql) { + conditions.add(new ConditionParameter(conditionSql)); + return splice; } - - /** - * 完全匹配 - * - * @param key - * @param val - * @return - */ - public Condition equal(String key, Object val) { - parameterList.add(new QueryParameter(key, val, QueryCondition.EQUAL)); - return condition; - } - - /** - * 大于匹配 - * - * @param key - * @param val - * @return - */ - public Condition greater(String key, Object val) { - parameterList.add(new QueryParameter(key, val, QueryCondition.GREATER)); - return condition; + public Splice condition(String conditionSql,Object paramVal) { + conditions.add(new ConditionParameter( paramVal, conditionSql)); + return splice; } - /** - * 小于匹配 - * - * @param key - * @param val - * @return - */ - public Condition less(String key, Object val) { - parameterList.add(new QueryParameter(key, val, QueryCondition.LESS)); - return condition; + public Splice condition(String conditionSql,Object... paramVal) { + conditions.add(new ConditionParameter(StringUtils.join(paramVal,","), conditionSql)); + return splice; } + } + public class Splice { + private List splices = new ArrayList<>(); /** - * 模糊匹配 + * and 条件 * - * @param key - * @param val * @return */ - public Condition like(String key, String val) { - parameterList.add(new QueryParameter(key, val, QueryCondition.LIKE)); + public Condition and() { + splices.add(" and "); return condition; } /** - * 日期字段 + * or 条件 * - * @param key 数据库字段 - * @param val %Y-%m-%d 格式的时间串 2020-02-17 * @return */ - public Condition date(String key, String val) { - parameterList.add(new QueryParameter(key, val, QueryCondition.DATE)); + public Condition or() { + splices.add(" or "); return condition; } - - /** - * in 包含 - * - * @param key - * @param val - * @return - */ - public Condition in(String key, Object... val) { - parameterList.add(new QueryParameter(key, Arrays.asList(val), QueryCondition.IN)); + public Condition splice(String splice) { + splices.add(String.format(" %s ",splice)); return condition; } - - } - - public class Condition { - private List conditions = new ArrayList<>(); - - public List getConditions() { - return conditions; - } - - /** - * and 条件 - * - * @return - */ - public Parameter and() { - conditions.add(" and "); - return parameter; - } - - /** - * or 条件 - * - * @return - */ - public Parameter or() { - conditions.add(" or "); - return parameter; + public QueryBuilder orderBy(String orderByStr) { + bySql = String.format(" order by %s",orderByStr); + return QueryBuilder.this; } - public QueryBuilder orderBy(String orderByStr) { - orderBy = orderByStr; + public QueryBuilder groupBy(String groupBySql) { + bySql = String.format(" group by %s",groupBySql); return QueryBuilder.this; } public Query builder() { - return new Query(select, parameter.parameterList, condition.conditions, orderBy); + return new Query(select, condition.conditions, splice.splices, bySql); } } public Query builder() { - return new Query(select, parameter.parameterList, condition.conditions, orderBy); + return new Query(select, condition.conditions, splice.splices, bySql); } public static QueryBuilder Build() { - QueryBuilder queryBuilder = new QueryBuilder(); - return queryBuilder; + return new QueryBuilder(); } - public Parameter where() { - return parameter; + public Condition where() { + return condition; } - } diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java deleted file mode 100644 index 44e14ea..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryConditionParser.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.codingapi.simplemybatis.query; - -import com.codingapi.simplemybatis.query.parser.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class QueryConditionParser { - - private List conditionParsers = new ArrayList<>(); - - public QueryConditionParser() { - conditionParsers.add(new EqualConditionParser()); - conditionParsers.add(new LikeConditionParser()); - conditionParsers.add(new DateConditionParser()); - conditionParsers.add(new BetweenConditionParser()); - conditionParsers.add(new InConditionParser()); - } - - public String parserParam(QueryParameter queryParameter) { - queryParameter.getCondition().equals(QueryCondition.SQL); - for (IConditionParser conditionParser : conditionParsers) { - if (conditionParser.type().equals(queryParameter.getCondition())) { - return conditionParser.condition(queryParameter); - } - } - throw new IllegalArgumentException("no find condition parser to " + queryParameter.getCondition()); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java b/src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java deleted file mode 100644 index 4997b5a..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryParameter.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.codingapi.simplemybatis.query; - -import com.codingapi.simplemybatis.query.parser.QueryCondition; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -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; - } - - 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; - } - - public Object getVal() { - return val; - } - - public Object getTwo() { - return two; - } - - public QueryCondition getCondition() { - return condition; - } - - public String getParamKey() { - return getParamKey(false); - } - - public String getParamKey(boolean dollar) { - if (dollar) { - return String.format("${%s}", getQueryKey()); - } else { - return String.format("#{%s}", getQueryKey()); - } - } - - public String getQueryKey() { - return String.format("query.data.%s", key); - } - - public String getTwoParamKey() { - return String.format("#{query.data.%s}", getTwoKey()); - } - - public String getTwoKey() { - return String.format("%s_two", key); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/SqlBuilder.java similarity index 67% rename from src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java rename to src/main/java/com/codingapi/simplemybatis/query/SqlBuilder.java index 28a3a79..b262d70 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QuerySqlBuilder.java +++ b/src/main/java/com/codingapi/simplemybatis/query/SqlBuilder.java @@ -1,7 +1,6 @@ package com.codingapi.simplemybatis.query; -import com.codingapi.simplemybatis.query.parser.QueryCondition; import org.apache.commons.lang3.StringUtils; /** @@ -9,17 +8,15 @@ * @date 2020/4/15 * @description */ -public class QuerySqlBuilder { +public class SqlBuilder { private StringBuilder currentSql; private Query query; - private QueryConditionParser queryConditionParser = new QueryConditionParser(); private String tableName; private String columnName; - public QuerySqlBuilder(String columnName, String tableName, Query query) { + public SqlBuilder(String columnName, String tableName, Query query) { this.currentSql = new StringBuilder(); - ; this.query = query; this.tableName = tableName; this.columnName = columnName; @@ -42,20 +39,15 @@ private boolean hasParameter() { } private void appendParameter() { - for (QueryParameter queryParameter : query.getParameterList()) { - if(queryParameter.getCondition().equals(QueryCondition.SQL)){ - currentSql.append(queryParameter.getSql()); - }else { - currentSql.append(queryConditionParser.parserParam(queryParameter)); - } + for (ConditionParameter conditionParameter : query.getParameterList()) { + currentSql.append(conditionParameter.getSql()); currentSql.append(query.getCondition()); } } - private void orderBy() { - if (StringUtils.isNotEmpty(query.getOrderBy())) { - currentSql.append(" order by "); - currentSql.append(query.getOrderBy()); + private void bySql() { + if (StringUtils.isNotEmpty(query.getBySql())) { + currentSql.append(query.getBySql()); } } @@ -66,7 +58,7 @@ public String getSql() { appendParameter(); appendOver(); } - orderBy(); + bySql(); currentSql.append(""); return currentSql.toString(); } @@ -85,7 +77,6 @@ private void appendBegin() { currentSql.append(" from "); currentSql.append(tableName); } - } } diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/BetweenConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/BetweenConditionParser.java deleted file mode 100644 index 141d43b..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/BetweenConditionParser.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class BetweenConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.BETWEEN; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append(" between "); - currentSql.append(queryParameter.getParamKey()); - currentSql.append(" and "); - currentSql.append(queryParameter.getTwoParamKey()); - return currentSql.toString(); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/DateConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/DateConditionParser.java deleted file mode 100644 index 3abc074..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/DateConditionParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class DateConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.DATE; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append(" = "); - currentSql.append("STR_TO_DATE(" + queryParameter.getParamKey() + ",'%Y-%m-%d')"); - return currentSql.toString(); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/EqualConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/EqualConditionParser.java deleted file mode 100644 index 8c350e4..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/EqualConditionParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class EqualConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.EQUAL; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append("="); - currentSql.append(queryParameter.getParamKey()); - return currentSql.toString(); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/GreaterConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/GreaterConditionParser.java deleted file mode 100644 index fed61b3..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/GreaterConditionParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class GreaterConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.EQUAL; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append(">"); - currentSql.append(queryParameter.getParamKey()); - return currentSql.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/IConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/IConditionParser.java deleted file mode 100644 index dfbdb9d..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/IConditionParser.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public interface IConditionParser { - - QueryCondition type(); - - String condition(QueryParameter queryParameter); - - -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/InConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/InConditionParser.java deleted file mode 100644 index e7905f8..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/InConditionParser.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class InConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.IN; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append(" in "); - currentSql.append(""); - currentSql.append("#{item}"); - currentSql.append(""); - return currentSql.toString(); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/LessConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/LessConditionParser.java deleted file mode 100644 index e98d0a3..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/LessConditionParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class LessConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.EQUAL; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append("<"); - currentSql.append(queryParameter.getParamKey()); - return currentSql.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/LikeConditionParser.java b/src/main/java/com/codingapi/simplemybatis/query/parser/LikeConditionParser.java deleted file mode 100644 index 7b898f7..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/LikeConditionParser.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -import com.codingapi.simplemybatis.query.QueryParameter; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public class LikeConditionParser implements IConditionParser { - - @Override - public QueryCondition type() { - return QueryCondition.LIKE; - } - - @Override - public String condition(QueryParameter queryParameter) { - StringBuilder currentSql = new StringBuilder(); - currentSql.append(queryParameter.getKey()); - currentSql.append(" like "); - currentSql.append("'%" + queryParameter.getParamKey(true) + "%'"); - return currentSql.toString(); - } -} diff --git a/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java b/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java deleted file mode 100644 index 4d020a0..0000000 --- a/src/main/java/com/codingapi/simplemybatis/query/parser/QueryCondition.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.codingapi.simplemybatis.query.parser; - -/** - * @author lorne - * @date 2020/4/15 - * @description - */ -public enum QueryCondition { - - LIKE, - EQUAL, - DATE, - BETWEEN, - GREATER, - LESS, - IN, - SQL - -} diff --git a/src/main/java/com/codingapi/simplemybatis/utils/PatternMatcherHelper.java b/src/main/java/com/codingapi/simplemybatis/utils/PatternMatcherHelper.java new file mode 100644 index 0000000..73679c3 --- /dev/null +++ b/src/main/java/com/codingapi/simplemybatis/utils/PatternMatcherHelper.java @@ -0,0 +1,35 @@ +package com.codingapi.simplemybatis.utils; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class PatternMatcherHelper { + + public final static String BRACE_MATCHER = "\\{([^}]*)\\}"; + + private Pattern pattern; + + public PatternMatcherHelper(String regex) { + this.pattern = Pattern.compile(regex); + } + + public String matcher(String val){ + Matcher matcher = pattern.matcher(val); + if (matcher.find()){ + return matcher.group(1); + } + throw new IllegalArgumentException(String.format("not matcher of {%s} in regex:%s",val,pattern.pattern())); + } + + public List matcherList(String val){ + List list = new ArrayList<>(); + Matcher matcher = pattern.matcher(val); + while (matcher.find()){ + list.add(matcher.group(1)); + } + return list; + } + +} diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index b88db25..fa60d01 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java @@ -32,12 +32,12 @@ void query() throws InvocationTargetException, IllegalAccessException { SqlParser sqlParser = createSqlParser(); String sql = sqlParser.createQuery(QueryBuilder.Build() .where() - .equal("name","hello") + .condition("name=#{name}","hello") .and() - .date("create_time","2020-01-12") + .condition("create_time=STR_TO_DATE(%{createTime},'%Y-%m-%d')","2020-01-12") .or() - .in("id",1,2,3,4,5) - .orderBy("name desc") + .condition("id in (${ids})", 1,2,3,4,5) + .groupBy("d.name") .builder()); System.out.println(sql); } @@ -48,16 +48,17 @@ 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() - .column("name","234","d.name = #{name}") -// .equal("d.name","hello") - .and() - .date("d.create_time","2020-01-12") + .condition("d.name = #{name}","name","234") .or() - .in("d.id",1,2,3,4,5) + .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(); - QuerySqlBuilder querySqlBuilder = new QuerySqlBuilder(query.getSelect(),null,query); - String sql = querySqlBuilder.getSql(); + SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query); + String sql = sqlBuilder.getSql(); System.out.println(sql); } From 074faf7821cf47ba30a4d158ada9cfa37a16423a Mon Sep 17 00:00:00 2001 From: gitee-wangliang <1991wangliang@gmail.com> Date: Mon, 27 Apr 2020 22:48:28 +0800 Subject: [PATCH 03/17] dev-1.2.0 --- pom.xml | 2 +- readme.md | 36 ++++--------------- .../simplemybatis/mapper/ViewMapper.java | 1 - .../simplemybatis/tree/ITreeQuery.java | 1 - .../simplemybatis/tree/TreeList.java | 4 +-- 5 files changed, 10 insertions(+), 34 deletions(-) diff --git a/pom.xml b/pom.xml index 5bd57b8..937b247 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codingapi simple-mybatis - 1.1.1 + 1.2.0 simple-mybatis https://github.com/codingapi/simple-mybatis simple mybatis project for Spring Boot diff --git a/readme.md b/readme.md index 4689adf..bb97ed7 100644 --- a/readme.md +++ b/readme.md @@ -58,7 +58,7 @@ public class Demo implements ITree{ //ITree根据业务需要可不实现 int save(T t); //批量保存 - int saveAll(@Param("list") List list); + int saveAll(List list); //修改数据，修改数据只会替换非null对象 int update(T t); @@ -67,29 +67,29 @@ public class Demo implements ITree{ //ITree根据业务需要可不实现 int delete(T t); //批量删除，删除条件为Id - int deleteAll(@Param("list") List list); + int deleteAll(List list); //通过Id直接删除 - int deleteById(@Param("id") Object id); + int deleteById(Object id); //通过Id批量删除 - int deleteAllById(@Param("list") List id); + int deleteAllById(List id); ``` * `QueryMapper`提供常用的查询操作 ```java //通过Id查询 - T getById(@Param("id") Object id); + T getById(Object id); //查询属于数据 List findAll(); //通过Query查询数据 - List query(@Param("query") Query query); + List query(Query query); //通过Query查询试图数据，返回List Map对象 - List> queryMap(@Param("query") Query query); + List> queryMap(Query query); //通过Query查询试图数据，返回List Bean对象 List queryView(Class clazz, Query query); @@ -117,28 +117,6 @@ public class Demo implements ITree{ //ITree根据业务需要可不实现 log.info("treeLists:{}",treeLists); ``` -* 用户根据自己的Mapper来选择集成对应的功能接口 - -```java - @Mapper - public interface DemoMapper extends QueryMapper,IPageQuery,ITreeQuery { - - - } - - @Mapper - public interface DemoMapper extends SimpleMapper { - - - } - @Mapper - public interface DemoMapper extends CommandMapper { - - - } - -``` - * query使用说明 query 通过QueryBuilder来创建，当查询返回的是表的数据，则不需要写select语句，直接拼接where()查询条件。 diff --git a/src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java b/src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java index 1729e57..ce396c5 100644 --- a/src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java +++ b/src/main/java/com/codingapi/simplemybatis/mapper/ViewMapper.java @@ -18,7 +18,6 @@ /** * @author lorne * @date 2020/4/27 - * @description */ public interface ViewMapper { diff --git a/src/main/java/com/codingapi/simplemybatis/tree/ITreeQuery.java b/src/main/java/com/codingapi/simplemybatis/tree/ITreeQuery.java index 9ecedb2..c6c4c80 100644 --- a/src/main/java/com/codingapi/simplemybatis/tree/ITreeQuery.java +++ b/src/main/java/com/codingapi/simplemybatis/tree/ITreeQuery.java @@ -7,7 +7,6 @@ public interface ITreeQuery, ID> { - default List> tree(Supplier> supplier, ID rootId) { List list = supplier.get(); List> trees = new ArrayList<>(); diff --git a/src/main/java/com/codingapi/simplemybatis/tree/TreeList.java b/src/main/java/com/codingapi/simplemybatis/tree/TreeList.java index af475c2..c0d20de 100644 --- a/src/main/java/com/codingapi/simplemybatis/tree/TreeList.java +++ b/src/main/java/com/codingapi/simplemybatis/tree/TreeList.java @@ -5,9 +5,9 @@ public class TreeList { - T node; + private T node; - List> children; + private List> children; public TreeList(T node) { this.node = node; From 21e5ac549c29a5faa7ea0cc349382724fe51477a Mon Sep 17 00:00:00 2001 From: gitee-wangliang <1991wangliang@gmail.com> Date: Mon, 27 Apr 2020 23:07:16 +0800 Subject: [PATCH 04/17] dev-1.2.0 --- .../simplemybatis/query/QueryBuilder.java | 37 +++++++++++++++++++ .../simplemybatis/query/QueryTest.java | 16 ++++++++ 2 files changed, 53 insertions(+) diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java index acc7138..198a681 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java +++ b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java @@ -26,11 +26,29 @@ public QueryBuilder select(String select) { public class Condition { private List conditions = new ArrayList<>(); + public Splice notNullCondition(String conditionSql,String paramKey, Object paramVal) { + if(paramVal!=null) { + conditions.add(new ConditionParameter(paramKey, paramVal, conditionSql)); + }else{ + conditions.add(new ConditionParameter("1=1")); + } + 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 map) { + if(map!=null&&map.size()>0) { + conditions.add(new ConditionParameter(map, conditionSql)); + }else{ + conditions.add(new ConditionParameter("1=1")); + } + return splice; + } + public Splice condition(String conditionSql,Map map) { conditions.add(new ConditionParameter(map, conditionSql)); return splice; @@ -41,15 +59,34 @@ public Splice condition(String conditionSql) { return splice; } + public Splice notNullCondition(String conditionSql,Object paramVal) { + if(paramVal!=null) { + conditions.add(new ConditionParameter(paramVal, conditionSql)); + }else{ + conditions.add(new ConditionParameter("1=1")); + } + return splice; + } + public Splice condition(String conditionSql,Object paramVal) { conditions.add(new ConditionParameter( paramVal, conditionSql)); return splice; } + public Splice notNullCondition(String conditionSql,Object... paramVal) { + if(paramVal!=null&¶mVal.length>0) { + conditions.add(new ConditionParameter(StringUtils.join(paramVal, ","), conditionSql)); + }else{ + conditions.add(new ConditionParameter("1=1")); + } + return splice; + } + public Splice condition(String conditionSql,Object... paramVal) { conditions.add(new ConditionParameter(StringUtils.join(paramVal,","), conditionSql)); return splice; } + } public class Splice { diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index fa60d01..c52b479 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/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.HashMap; class QueryTest { @@ -62,4 +63,19 @@ void queryView() throws InvocationTargetException, IllegalAccessException { System.out.println(sql); } + @Test + void queryNotNullView() throws InvocationTargetException, IllegalAccessException { + 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<>()) + .builder(); + SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query); + String sql = sqlBuilder.getSql(); + System.out.println(sql); + } + + } \ No newline at end of file From 9b122069b608325f1b86a7e67454641abbd0a018 Mon Sep 17 00:00:00 2001 From: gitee-wangliang <1991wangliang@gmail.com> Date: Mon, 27 Apr 2020 23:25:38 +0800 Subject: [PATCH 05/17] dev-1.2.0 --- .../simplemybatis/query/QueryBuilder.java | 47 +++++++------------ .../simplemybatis/query/QueryTest.java | 10 ++-- 2 files changed, 22 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java index 198a681..b7718e6 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java +++ b/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 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 map) { + public Splice condition(String conditionSql,Map 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 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&¶mVal.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() { diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index c52b479..b4e870b 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/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(); From 6427cd89e7d3702073a697a20cc7963e7a4cfa8b Mon Sep 17 00:00:00 2001 From: wangliang <1991wangliang@gmail.com> Date: Wed, 29 Apr 2020 08:59:37 +0800 Subject: [PATCH 06/17] =?UTF-8?q?MapListCamelParser=20=E8=BF=94=E5=9B=9EMa?= =?UTF-8?q?p=E6=95=B0=E6=8D=AE=E7=9A=84=E8=A7=A3=E6=9E=90=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simplemybatis/utils/MapCamelUtils.java | 1 + .../utils/MapListCamelParser.java | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 src/main/java/com/codingapi/simplemybatis/utils/MapListCamelParser.java diff --git a/src/main/java/com/codingapi/simplemybatis/utils/MapCamelUtils.java b/src/main/java/com/codingapi/simplemybatis/utils/MapCamelUtils.java index 1d00b7a..8240d2a 100644 --- a/src/main/java/com/codingapi/simplemybatis/utils/MapCamelUtils.java +++ b/src/main/java/com/codingapi/simplemybatis/utils/MapCamelUtils.java @@ -17,6 +17,7 @@ public static void camelMap(Map item) { String newKey = StringCharacterUtils.underlineToCamel(key); if (!newKey.equals(key)) { item.put(newKey, item.get(key)); + item.remove(key); } } } diff --git a/src/main/java/com/codingapi/simplemybatis/utils/MapListCamelParser.java b/src/main/java/com/codingapi/simplemybatis/utils/MapListCamelParser.java new file mode 100644 index 0000000..e3cdd50 --- /dev/null +++ b/src/main/java/com/codingapi/simplemybatis/utils/MapListCamelParser.java @@ -0,0 +1,61 @@ +package com.codingapi.simplemybatis.utils; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author lorne + * @date 2020/4/28 + * @description + */ +public class MapListCamelParser { + + private List> list; + + private Set keys; + + public MapListCamelParser(List> list) { + this.keys = new HashSet<>(); + this.list = list; + + if(hasData()){ + camelMap(); + } + } + + private boolean hasData(){ + return list!=null&&list.size()>0; + } + + + private void camelMap(){ + this.list = list.stream().map(item->{ + MapCamelUtils.camelMap(item); + keys.addAll(item.keySet()); + return item; + }).collect(Collectors.toList()); + } + + public List> parser(){ + if(!hasData()) { + return null; + } + return list.stream().map(item -> { + pushKeys(item); + return item; + }).collect(Collectors.toList()); + } + + public List> getList() { + return list; + } + + private void pushKeys(Map item){ + for(String key:keys){ + if(!item.containsKey(key)){ + item.put(key,null); + } + } + } + +} From dc9b134cff830043d598fc6d69e05fc65da20c44 Mon Sep 17 00:00:00 2001 From: xinpaisoft Date: Wed, 29 Apr 2020 15:44:24 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E5=BF=BD=E7=95=A5=E6=B2=A1=E6=9C=89Prope?= =?UTF-8?q?rtyDescriptor=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/codingapi/simplemybatis/parser/TableParser.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java b/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java index 0b135fa..efe703f 100644 --- a/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java +++ b/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java @@ -50,7 +50,8 @@ public void parser(Object obj) throws IllegalAccessException, InvocationTargetEx private void loadColumnNames(Object obj) throws IllegalAccessException, InvocationTargetException { Field[] fields = clazz.getDeclaredFields(); for (Field field : fields) { - if(field.isSynthetic()){ + Method method = getFieldMethod(field); + if(method==null||field.isSynthetic()){ continue; } Transient transientField = field.getAnnotation(Transient.class); @@ -61,7 +62,6 @@ private void loadColumnNames(Object obj) throws IllegalAccessException, Invocati Id id = field.getAnnotation(Id.class); if (id != null) { String idColumnName = getColumnName(field.getAnnotation(Column.class), field); - Method method = getFieldMethod(field); Object idValue = getFieldValue(method, obj); String fieldName = field.getName(); idColumn = new ColumnFiled(fieldName, idColumnName, idValue, method); @@ -70,7 +70,6 @@ private void loadColumnNames(Object obj) throws IllegalAccessException, Invocati } Column column = field.getAnnotation(Column.class); String columnName = getColumnName(column, field); - Method method = getFieldMethod(field); Object value = getFieldValue(method, obj); columns.add(new ColumnFiled(field.getName(), columnName, value, method)); } From 976c76169b332398b8ef93faba021fb8c05343e2 Mon Sep 17 00:00:00 2001 From: ujued Date: Tue, 12 May 2020 15:11:34 +0800 Subject: [PATCH 08/17] test --- .../java/com/codingapi/simplemybatis/mapper/QueryMapper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/codingapi/simplemybatis/mapper/QueryMapper.java b/src/main/java/com/codingapi/simplemybatis/mapper/QueryMapper.java index 2fbe362..e6285c5 100644 --- a/src/main/java/com/codingapi/simplemybatis/mapper/QueryMapper.java +++ b/src/main/java/com/codingapi/simplemybatis/mapper/QueryMapper.java @@ -30,10 +30,14 @@ public interface QueryMapper extends BaseMapper { @SelectProvider(type = QueryProvider.class, method = "queryView") List> queryMap(@Param("query") Query query); + @SuppressWarnings("unchecked") default List queryView(Class clazz, Query query) { List> list = queryMap(query); return list.stream().map(item -> { MapCamelUtils.camelMap(item); + if (Map.class.isAssignableFrom(clazz)) { + return (V) item; + } return MapBeanUtils.toBean(clazz, item); }).collect(Collectors.toList()); } From a3b9b28aeddfa0d614db4466549430195ffa143f Mon Sep 17 00:00:00 2001 From: wangliang <1991wangliang@gmail.com> Date: Tue, 12 May 2020 15:33:37 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=8F=AF=E4=BB=A5select=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5order=20by?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codingapi/simplemybatis/query/QueryBuilder.java | 5 +++++ .../com/codingapi/simplemybatis/query/QueryTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java index b7718e6..bfab6f0 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java +++ b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java @@ -130,4 +130,9 @@ public Condition where() { return condition; } + public QueryBuilder orderBy(String orderByStr) { + bySql = String.format(" order by %s",orderByStr); + return QueryBuilder.this; + } + } diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index b4e870b..63df3b5 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java @@ -62,6 +62,18 @@ void queryView() throws InvocationTargetException, IllegalAccessException { System.out.println(sql); } + + @Test + void queryOrderBy() throws InvocationTargetException, IllegalAccessException { + Query query = QueryBuilder.Build() + .select("select * from t_demo d join t_test t on d.id = t.demo_id ") + .orderBy("d.sort desc ") + .builder(); + SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query); + String sql = sqlBuilder.getSql(); + System.out.println(sql); + } + @Test void queryNotNullView() throws InvocationTargetException, IllegalAccessException { Object object = Arrays.asList(1,2,3,4,5,6,7,8,9,10); From 810657633985a9a9f175480d1d9f7a4fa155d5cd Mon Sep 17 00:00:00 2001 From: wangliang <1991wangliang@gmail.com> Date: Tue, 12 May 2020 18:55:01 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=8F=AF=E4=BB=A5select=E4=BB=A5?= =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5order=20by?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../query/ConditionParameter.java | 4 +++- .../simplemybatis/query/QueryBuilder.java | 7 +----- .../simplemybatis/query/QueryTest.java | 24 +++++++++++++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java b/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java index 40a4c70..4142bef 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java +++ b/src/main/java/com/codingapi/simplemybatis/query/ConditionParameter.java @@ -36,7 +36,9 @@ public ConditionParameter(Map map, String sql) { public ConditionParameter(Object val, String sql) { this.map = new HashMap<>(); String key = new PatternMatcherHelper(PatternMatcherHelper.BRACE_MATCHER).matcher(sql); - map.put(key,val); + if(key!=null) { + map.put(key, val); + } this.sql = sql; } diff --git a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java index bfab6f0..53e9925 100644 --- a/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java +++ b/src/main/java/com/codingapi/simplemybatis/query/QueryBuilder.java @@ -38,15 +38,10 @@ public Splice condition(String conditionSql,String paramKey, Object paramVal) { public Splice condition(String conditionSql,Map map) { - if(map!=null&&map.size()>0) { - conditions.add(new ConditionParameter(map, conditionSql)); - }else{ - splice.remove(); - } + conditions.add(new ConditionParameter(map, conditionSql)); return splice; } - public Splice condition(String conditionSql,Object paramVal) { if(paramVal!=null) { conditions.add(new ConditionParameter(paramVal, conditionSql)); diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index 63df3b5..6e37fd6 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java @@ -63,6 +63,18 @@ void queryView() throws InvocationTargetException, IllegalAccessException { } + @Test + void queryNumberKey() throws InvocationTargetException, IllegalAccessException { + Query query = QueryBuilder.Build() + .select("select * from t_demo d join t_test t on d.id = t.demo_id ") + .where() + .condition("d.order = #{?1} or d.order = #{?2} or d.order = #{?3} or d.order = #{?4} ",1,2,3,4) + .builder(); + SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query); + String sql = sqlBuilder.getSql(); + System.out.println(sql); + } + @Test void queryOrderBy() throws InvocationTargetException, IllegalAccessException { Query query = QueryBuilder.Build() @@ -74,6 +86,18 @@ void queryOrderBy() throws InvocationTargetException, IllegalAccessException { System.out.println(sql); } + @Test + void queryLikeKey() throws InvocationTargetException, IllegalAccessException { + Query query = QueryBuilder.Build() + .select("select * from t_demo d join t_test t on d.id = t.demo_id ") + .where() + .condition("d.name = #{name} and d.name = '123'",new HashMap<>()) + .builder(); + SqlBuilder sqlBuilder = new SqlBuilder(query.getSelect(),null,query); + String sql = sqlBuilder.getSql(); + System.out.println(sql); + } + @Test void queryNotNullView() throws InvocationTargetException, IllegalAccessException { Object object = Arrays.asList(1,2,3,4,5,6,7,8,9,10); From 974474e4eb2ab14ef0d8424db34ab4f04284bdb3 Mon Sep 17 00:00:00 2001 From: wangliang Date: Sun, 31 Jan 2021 20:36:11 +0800 Subject: [PATCH 11/17] =?UTF-8?q?BaseMapper=20=E5=88=A4=E6=96=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simplemybatis/parser/SqlParser.java | 2 +- .../simplemybatis/parser/TableParser.java | 12 +++---- .../properties/GlabelProperties.java | 25 -------------- ...ties.java => SimpleMybatisProperties.java} | 6 +++- .../SimpleMybatisPropertiesContext.java | 34 +++++++++++++++++++ .../simplemybatis/provider/BaseProvider.java | 14 ++++---- .../simplemybatis/parser/SqlParserTest.java | 6 ++-- .../simplemybatis/query/QueryTest.java | 7 ++-- 8 files changed, 58 insertions(+), 48 deletions(-) delete mode 100644 src/main/java/com/codingapi/simplemybatis/properties/GlabelProperties.java rename src/main/java/com/codingapi/simplemybatis/properties/{DbProperties.java => SimpleMybatisProperties.java} (63%) create mode 100644 src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisPropertiesContext.java diff --git a/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java b/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java index 4609b30..f1c7a99 100644 --- a/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java +++ b/src/main/java/com/codingapi/simplemybatis/parser/SqlParser.java @@ -44,7 +44,7 @@ public String createQuery(Query query) { public String createUpdateSql() { if (tableInfo.getIdColumnFiled().getValue() == null) { - throw new RuntimeException("no Id value,do't create update sql."); + throw new RuntimeException("no Id value,don't create update sql."); } StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("update "); diff --git a/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java b/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java index efe703f..a76b6cf 100644 --- a/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java +++ b/src/main/java/com/codingapi/simplemybatis/parser/TableParser.java @@ -1,7 +1,7 @@ package com.codingapi.simplemybatis.parser; -import com.codingapi.simplemybatis.properties.DbProperties.ColumnNameStyle; -import com.codingapi.simplemybatis.properties.GlabelProperties; +import com.codingapi.simplemybatis.properties.SimpleMybatisProperties.ColumnNameStyle; +import com.codingapi.simplemybatis.properties.SimpleMybatisPropertiesContext; import com.codingapi.simplemybatis.utils.StringCharacterUtils; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.StringUtils; @@ -36,15 +36,16 @@ public class TableParser { public TableParser(Class clazz) { this.clazz = clazz; - columnNameStyle = GlabelProperties.getInstance().getColumnNameStyle(); + columnNameStyle = SimpleMybatisPropertiesContext.getInstance().getColumnNameStyle(); propertyDescriptors = PropertyUtils.getPropertyDescriptors(clazz); columns = new ArrayList<>(); loadTableName(); } - public void parser(Object obj) throws IllegalAccessException, InvocationTargetException { + public TableInfo parser(Object obj) throws IllegalAccessException, InvocationTargetException { loadColumnNames(obj); + return new TableInfo(tableName, idColumn, columns); } private void loadColumnNames(Object obj) throws IllegalAccessException, InvocationTargetException { @@ -138,9 +139,6 @@ private String getColumnStyleName(String name) { } } - public TableInfo getTableInfo() { - return new TableInfo(tableName, idColumn, columns); - } public static class ColumnFiled { diff --git a/src/main/java/com/codingapi/simplemybatis/properties/GlabelProperties.java b/src/main/java/com/codingapi/simplemybatis/properties/GlabelProperties.java deleted file mode 100644 index 73608e0..0000000 --- a/src/main/java/com/codingapi/simplemybatis/properties/GlabelProperties.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.codingapi.simplemybatis.properties; - - -import com.codingapi.simplemybatis.properties.DbProperties.ColumnNameStyle; - -public class GlabelProperties { - - private static GlabelProperties instance = new GlabelProperties(); - - private GlabelProperties() { - dbProperties = new DbProperties(); - } - - private DbProperties dbProperties; - - public static GlabelProperties getInstance() { - return instance; - } - - public ColumnNameStyle getColumnNameStyle() { - return dbProperties.getColumnNameStyle(); - } - - -} diff --git a/src/main/java/com/codingapi/simplemybatis/properties/DbProperties.java b/src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisProperties.java similarity index 63% rename from src/main/java/com/codingapi/simplemybatis/properties/DbProperties.java rename to src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisProperties.java index eaa5724..884cc71 100644 --- a/src/main/java/com/codingapi/simplemybatis/properties/DbProperties.java +++ b/src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisProperties.java @@ -1,7 +1,7 @@ package com.codingapi.simplemybatis.properties; -public class DbProperties { +public class SimpleMybatisProperties { private ColumnNameStyle columnNameStyle = ColumnNameStyle.UNDERLINE; @@ -12,4 +12,8 @@ public enum ColumnNameStyle { public ColumnNameStyle getColumnNameStyle() { return columnNameStyle; } + + public void setColumnNameStyle(ColumnNameStyle columnNameStyle) { + this.columnNameStyle = columnNameStyle; + } } diff --git a/src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisPropertiesContext.java b/src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisPropertiesContext.java new file mode 100644 index 0000000..02fc7ab --- /dev/null +++ b/src/main/java/com/codingapi/simplemybatis/properties/SimpleMybatisPropertiesContext.java @@ -0,0 +1,34 @@ +package com.codingapi.simplemybatis.properties; + + +import com.codingapi.simplemybatis.properties.SimpleMybatisProperties.ColumnNameStyle; + +public class SimpleMybatisPropertiesContext { + + private static SimpleMybatisPropertiesContext instance; + + public static SimpleMybatisPropertiesContext getInstance() { + if(instance==null){ + synchronized (SimpleMybatisPropertiesContext.class){ + instance = new SimpleMybatisPropertiesContext(); + } + } + return instance; + } + + private final SimpleMybatisProperties simpleMybatisProperties; + + private SimpleMybatisPropertiesContext() { + simpleMybatisProperties = new SimpleMybatisProperties(); + } + + public void setColumnNameStyle(ColumnNameStyle columnNameStyle) { + simpleMybatisProperties.setColumnNameStyle(columnNameStyle); + } + + public ColumnNameStyle getColumnNameStyle() { + return simpleMybatisProperties.getColumnNameStyle(); + } + + +} diff --git a/src/main/java/com/codingapi/simplemybatis/provider/BaseProvider.java b/src/main/java/com/codingapi/simplemybatis/provider/BaseProvider.java index 572fa55..d4bcd45 100644 --- a/src/main/java/com/codingapi/simplemybatis/provider/BaseProvider.java +++ b/src/main/java/com/codingapi/simplemybatis/provider/BaseProvider.java @@ -2,6 +2,7 @@ import com.codingapi.simplemybatis.mapper.*; import com.codingapi.simplemybatis.parser.SqlParser; +import com.codingapi.simplemybatis.parser.TableInfo; import com.codingapi.simplemybatis.parser.TableParser; import org.apache.ibatis.builder.annotation.ProviderContext; @@ -16,12 +17,9 @@ protected Class entityType(ProviderContext context) { return Stream.of(context.getMapperType().getGenericInterfaces()) .filter(ParameterizedType.class::isInstance) .map(ParameterizedType.class::cast) - .filter(type -> (type.getRawType() == BaseMapper.class - || type.getRawType() == CommonMapper.class - || type.getRawType() == QueryMapper.class - || type.getRawType() == SimpleMapper.class - || type.getRawType() == TreeMapper.class - || type.getRawType() == PageMapper.class) + .filter( + (type) -> + type.getRawType().getClass().isInstance(BaseMapper.class) ) .findFirst() .map(type -> type.getActualTypeArguments()[0]) @@ -34,8 +32,8 @@ protected SqlParser createParser(Object obj, ProviderContext context) throws IllegalAccessException, InvocationTargetException { Class clazz = entityType(context); TableParser tableParser = new TableParser(clazz); - tableParser.parser(obj); - return new SqlParser(tableParser.getTableInfo()); + TableInfo tableInfo = tableParser.parser(obj); + return new SqlParser(tableInfo); } } diff --git a/src/test/java/com/codingapi/simplemybatis/parser/SqlParserTest.java b/src/test/java/com/codingapi/simplemybatis/parser/SqlParserTest.java index 9e491d4..ed486d8 100644 --- a/src/test/java/com/codingapi/simplemybatis/parser/SqlParserTest.java +++ b/src/test/java/com/codingapi/simplemybatis/parser/SqlParserTest.java @@ -22,8 +22,8 @@ private Demo createDemo(){ private SqlParser createSqlParser() throws InvocationTargetException, IllegalAccessException { Demo demo = createDemo(); TableParser tableParser = new TableParser(demo.getClass()); - tableParser.parser(demo); - return new SqlParser(tableParser.getTableInfo()); + TableInfo tableInfo = tableParser.parser(demo); + return new SqlParser(tableInfo); } @Test @@ -88,4 +88,4 @@ void createGetByIdSql() throws InvocationTargetException, IllegalAccessException String sql = sqlParser.createGetByIdSql(); System.out.println(sql); } -} \ No newline at end of file +} diff --git a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java index 6e37fd6..8b54875 100644 --- a/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java +++ b/src/test/java/com/codingapi/simplemybatis/query/QueryTest.java @@ -2,6 +2,7 @@ import com.codingapi.simplemybatis.entity.Demo; import com.codingapi.simplemybatis.parser.SqlParser; +import com.codingapi.simplemybatis.parser.TableInfo; import com.codingapi.simplemybatis.parser.TableParser; import org.junit.jupiter.api.Test; @@ -24,8 +25,8 @@ private Demo createDemo(){ private SqlParser createSqlParser() throws InvocationTargetException, IllegalAccessException { Demo demo = createDemo(); TableParser tableParser = new TableParser(demo.getClass()); - tableParser.parser(demo); - return new SqlParser(tableParser.getTableInfo()); + TableInfo tableInfo = tableParser.parser(demo); + return new SqlParser(tableInfo); } @@ -114,4 +115,4 @@ void queryNotNullView() throws InvocationTargetException, IllegalAccessException } -} \ No newline at end of file +} From 53ac88369b7db8c85cd96ef44633b7c7e77ce482 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 31 Jan 2021 12:39:43 +0000 Subject: [PATCH 12/17] Bump commons-beanutils from 1.9.3 to 1.9.4 Bumps commons-beanutils from 1.9.3 to 1.9.4. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 937b247..b073a95 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 5.1.10 3.4.6 1.0.0.Final - 1.9.3 + 1.9.4 3.10 28.1-jre From e6f1a2d0237a2a56e8c45acea73d425b81a7d606 Mon Sep 17 00:00:00 2001 From: wangliang Date: Sun, 31 Jan 2021 20:54:50 +0800 Subject: [PATCH 13/17] Bump commons-beanutils from 1.9.3 to 1.9.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b073a95..e690f99 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.codingapi simple-mybatis - 1.2.0 + 1.2.1 simple-mybatis https://github.com/codingapi/simple-mybatis simple mybatis project for Spring Boot From 5c739f2014f2678c9cd975adf9f9a64f157b0170 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Mar 2021 21:52:43 +0000 Subject: [PATCH 14/17] Bump guava from 28.1-jre to 29.0-jre Bumps [guava](https://github.com/google/guava) from 28.1-jre to 29.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e690f99..a17756d 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.0.0.Final 1.9.4 3.10 - 28.1-jre + 29.0-jre 5.6.2 From a7a0879cb4985085e19bdbfcbf843b16689bdad8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Apr 2021 19:05:03 +0000 Subject: [PATCH 15/17] Bump mybatis from 3.4.6 to 3.5.6 Bumps [mybatis](https://github.com/mybatis/mybatis-3) from 3.4.6 to 3.5.6. - [Release notes](https://github.com/mybatis/mybatis-3/releases) - [Commits](https://github.com/mybatis/mybatis-3/compare/mybatis-3.4.6...mybatis-3.5.6) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e690f99..4109729 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 1.2.7 1.18.0 5.1.10 - 3.4.6 + 3.5.6 1.0.0.Final 1.9.4 3.10 From ead2741822df4fcf7f40aa8d55f7b056e8e70848 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 22:33:31 +0000 Subject: [PATCH 16/17] Bump guava from 29.0-jre to 32.0.0-jre Bumps [guava](https://github.com/google/guava) from 29.0-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32b8c73..fd4c599 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 1.0.0.Final 1.9.4 3.10 - 29.0-jre + 32.0.0-jre 5.6.2 From 396f41d4622acbd189ee72098217772f9d74d482 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 12:20:23 +0000 Subject: [PATCH 17/17] Bump com.github.pagehelper:pagehelper from 5.1.10 to 5.3.1 Bumps [com.github.pagehelper:pagehelper](https://github.com/pagehelper/Mybatis-PageHelper) from 5.1.10 to 5.3.1. - [Release notes](https://github.com/pagehelper/Mybatis-PageHelper/releases) - [Commits](https://github.com/pagehelper/Mybatis-PageHelper/compare/v5.1.10...v5.3.1) --- updated-dependencies: - dependency-name: com.github.pagehelper:pagehelper dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32b8c73..21c3c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 1.2.7 1.18.0 - 5.1.10 + 5.3.1 3.5.6 1.0.0.Final 1.9.4