Skip to content

修改添加mapSqlParameterSource策略 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zenuo wants to merge 2 commits into from
Closed

修改添加mapSqlParameterSource策略 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f29d352
修改添加mapSqlParameterSource策略
Dec 2, 2017
f8cec57
修改deleteInBatch的参数为Collection<ID>
Apr 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 50 additions & 74 deletions src/main/java/top/fastsql/SQL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.*;
import org.springframework.jdbc.core.namedparam.*;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.ColumnMapRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.SingleColumnRowMapper;
import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.jdbc.core.namedparam.SqlParameterSource;
import org.springframework.util.StringUtils;
import top.fastsql.config.DataSourceType;
import top.fastsql.dto.BatchUpdateResult;
Expand All @@ -18,12 +25,21 @@
import javax.sql.DataSource;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.*;
import java.sql.Blob;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;

/**
Expand All @@ -43,7 +59,7 @@ public class SQL {

private boolean logSqlWhenBuild = false;

private SqlParameterSource sqlParameterSource = new EmptySqlParameterSource();
private final MapSqlParameterSource sqlParameterSource = new MapSqlParameterSource();

private Object[] varParams;

Expand Down Expand Up @@ -652,8 +668,8 @@ public SQL top216() {
}


public SQL parameter(SqlParameterSource sqlParameterSource) {
this.sqlParameterSource = sqlParameterSource;
public SQL parameter(MapSqlParameterSource mapSqlParameterSource) {
Copy link
Copy Markdown
Member

@chenjazz chenjazz Dec 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

paramer就是为了方便传入不同种类的SqlParameterSource

Copy link
Copy Markdown
Author

@zenuo zenuo Dec 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

额，此处可以还原为SqlParameterSource，再将键值对加入。

this.sqlParameterSource.addValues(mapSqlParameterSource.getValues());
return this;
}

Expand All @@ -664,7 +680,7 @@ public SQL parameter(SqlParameterSource sqlParameterSource) {
* @param mapParameter Map参数
*/
public SQL mapParameter(Map<String, Object> mapParameter) {
this.sqlParameterSource = new MapSqlParameterSource(mapParameter);
this.sqlParameterSource.addValues(mapParameter);
return this;
}

Expand All @@ -674,114 +690,74 @@ public SQL mapParameter(Map<String, Object> mapParameter) {
* @param mapParameter 多个Map参数
*/
public SQL mapParameter(Map<String, Object>... mapParameter) {
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
for (Map<String, Object> map : mapParameter) {
mapSqlParameterSource.addValues(map);
this.sqlParameterSource.addValues(map);
}
this.sqlParameterSource = mapSqlParameterSource;
return this;
}


public SQL mapItemsParameter(String k1, Object v1) {
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
mapSqlParameterSource.addValue(k1, v1);
this.sqlParameterSource = mapSqlParameterSource;
this.sqlParameterSource.addValue(k1, v1);
return this;
}

public SQL mapItemsParameter(String k1, Object v1, String k2, Object v2) {
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
mapSqlParameterSource.addValue(k1, v1);
mapSqlParameterSource.addValue(k2, v2);
this.sqlParameterSource = mapSqlParameterSource;
this.sqlParameterSource.addValue(k1, v1);
this.sqlParameterSource.addValue(k2, v2);
return this;
}

public SQL mapItemsParameter(String k1, Object v1, String k2, Object v2, String k3, Object v3) {
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
mapSqlParameterSource.addValue(k1, v1);
mapSqlParameterSource.addValue(k2, v2);
mapSqlParameterSource.addValue(k3, v3);
this.sqlParameterSource = mapSqlParameterSource;
this.sqlParameterSource.addValue(k1, v1);
this.sqlParameterSource.addValue(k2, v2);
this.sqlParameterSource.addValue(k3, v3);
return this;
}

public SQL mapItemsParameter(String k1, Object v1, String k2, Object v2, String k3, Object v3, String k4, Object v4) {
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
mapSqlParameterSource.addValue(k1, v1);
mapSqlParameterSource.addValue(k2, v2);
mapSqlParameterSource.addValue(k3, v3);
mapSqlParameterSource.addValue(k4, v4);
this.sqlParameterSource = mapSqlParameterSource;
this.sqlParameterSource.addValue(k1, v1);
this.sqlParameterSource.addValue(k2, v2);
this.sqlParameterSource.addValue(k3, v3);
this.sqlParameterSource.addValue(k4, v4);
return this;
}

public SQL mapItemsParameter(String k1, Object v1, String k2, Object v2, String k3, Object v3, String k4, Object v4, String k5, Object v5) {
MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
mapSqlParameterSource.addValue(k1, v1);
mapSqlParameterSource.addValue(k2, v2);
mapSqlParameterSource.addValue(k3, v3);
mapSqlParameterSource.addValue(k4, v4);
mapSqlParameterSource.addValue(k5, v5);
this.sqlParameterSource = mapSqlParameterSource;
this.sqlParameterSource.addValue(k1, v1);
this.sqlParameterSource.addValue(k2, v2);
this.sqlParameterSource.addValue(k3, v3);
this.sqlParameterSource.addValue(k4, v4);
this.sqlParameterSource.addValue(k5, v5);
return this;
}


public SQL addMapParameterItem(String key, Object value) {
if (this.sqlParameterSource instanceof EmptySqlParameterSource) {
//新建一个MapSqlParameterSource
this.sqlParameterSource = new MapSqlParameterSource(key, value);
} else if (this.sqlParameterSource instanceof BeanPropertySqlParameterSource) {
BeanPropertySqlParameterSource propertySqlParameterSource = (BeanPropertySqlParameterSource) this.sqlParameterSource;

MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();
//TODO propertySqlParameterSource.getReadablePropertyNames 多了class属性
for (String name : propertySqlParameterSource.getReadablePropertyNames()) {
mapSqlParameterSource.addValue(name, propertySqlParameterSource.getValue(name));
}
//add
mapSqlParameterSource.addValue(key, value);
this.sqlParameterSource = mapSqlParameterSource;
} else if (this.sqlParameterSource instanceof MapSqlParameterSource) {
((MapSqlParameterSource) this.sqlParameterSource).addValue(key, value);
} else {
throw new RuntimeException("当前参数不支持addParameterMapItem");
}
this.sqlParameterSource.addValue(key, value);
return this;

}

public SQL appendMapParameterItem(String key, Object value) {
return addMapParameterItem(key, value);
}


/**
* 出现相同名称的参数时，map或覆盖bean中的参数
*
* @param bean bean
* @param map map
*/
public SQL beanAndMapParameter(Object bean, Map<String, Object> map) {
BeanPropertySqlParameterSource propertySqlParameterSource = new BeanPropertySqlParameterSource(bean);

MapSqlParameterSource mapSqlParameterSource = new MapSqlParameterSource();

for (String name : propertySqlParameterSource.getReadablePropertyNames()) {
mapSqlParameterSource.addValue(name, propertySqlParameterSource.getValue(name));
}
for (Map.Entry<String, Object> entry : map.entrySet()) {
mapSqlParameterSource.addValue(entry.getKey(), entry.getValue());
}
this.sqlParameterSource = mapSqlParameterSource;
this.beanParameter(bean);
this.sqlParameterSource.addValues(map);
return this;
}


public SQL beanParameter(Object beanParam) {
this.sqlParameterSource = new BeanPropertySqlParameterSource(beanParam);
final BeanPropertySqlParameterSource propertySqlParameterSource
= new BeanPropertySqlParameterSource(beanParam);

for (String name : propertySqlParameterSource.getReadablePropertyNames()) {
this.sqlParameterSource.addValue(name, propertySqlParameterSource.getValue(name));
}

return this;
}

Expand Down
13 changes: 7 additions & 6 deletions src/main/java/top/fastsql/dao/BaseDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.namedparam.SqlParameterSource;
import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
import org.springframework.util.StringUtils;
import top.fastsql.SQL;
import top.fastsql.SQLFactory;
Expand All @@ -18,6 +18,7 @@
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -349,7 +350,7 @@ public int deleteWhere(String sqlCondition, Object... values) {
/**
* 根据id列表批量删除数据
*/
public BatchUpdateResult deleteInBatch(List<ID> ids) {
public BatchUpdateResult deleteInBatch(Collection<ID> ids) {
final String sql = "DELETE FROM " + tableName + " WHERE " + idColumnName + "=:" + idColumnName;

List<Map<String, Object>> mapList = new ArrayList<>(ids.size());
Expand Down Expand Up @@ -409,7 +410,7 @@ public E selectOneWhere(String sqlCondition, Object... values) {
}
}

public E selectOneWhere(String sqlCondition, SqlParameterSource parameterSource) {
public E selectOneWhere(String sqlCondition, MapSqlParameterSource parameterSource) {
//sql
String sql = "SELECT * FROM " + tableName + " WHERE " + sqlCondition;

Expand Down Expand Up @@ -440,7 +441,7 @@ public List<E> selectWhere(String sqlCondition, Object... values) {
return getSQL().useSql(sql).varParameter(values).queryList(new BeanPropertyRowMapper<>(entityClass));
}

public List<E> selectWhere(String sqlCondition, SqlParameterSource parameterSource) {
public List<E> selectWhere(String sqlCondition, MapSqlParameterSource parameterSource) {
//sql
String sql = "SELECT * FROM " + tableName + " WHERE " + sqlCondition;
return getSQL().useSql(sql).parameter(parameterSource).queryList(new BeanPropertyRowMapper<>(entityClass));
Expand All @@ -452,7 +453,7 @@ public int countWhere(String sqlCondition, Object... values) {
return getSQL().useSql(sql).varParameter(values).queryInteger();
}

public int countWhere(String sqlCondition, SqlParameterSource parameterSource) {
public int countWhere(String sqlCondition, MapSqlParameterSource parameterSource) {
//sql
String sql = "SELECT count(*) FROM " + tableName + " WHERE " + sqlCondition;
return getSQL().useSql(sql).parameter(parameterSource).queryInteger();
Expand All @@ -471,7 +472,7 @@ public ResultPage<E> selectPageWhere(String sqlCondition, int pageNumber, int pe
}

public ResultPage<E> selectPageWhere(String sqlCondition, int pageNumber, int perPage,
SqlParameterSource parameterSource) {
MapSqlParameterSource parameterSource) {
String sql = "SELECT * FROM " + tableName + " WHERE 1=1 AND " + sqlCondition;
return getSQL().useSql(sql).parameter(parameterSource)
.queryPage(pageNumber, perPage, new BeanPropertyRowMapper<>(entityClass));
Expand Down