queryForMap(SqlBuffer sb) throws ServiceException;
+ /**
+ * Query given SQL to create a prepared statement from SQL and a
+ * list of arguments to bind to the query, expecting a result Map.
+ * The query is expected to be a single row query; the result row will be
+ * mapped to a Map (one entry for each column, using the column name as the key).
+ * @param sb SqlBuffer
+ * @param rowMapper ResultSet row convert to map handler
+ * @return the result Map (one entry for each column, using the column name as the key)
+ * @throws org.springframework.dao.IncorrectResultSizeServiceException
+ * if the query does not return exactly one row
+ * @throws ServiceException if the query fails
+ * @see org.springframework.jdbc.core.JdbcTemplate#queryForMap(String)
+ * @see org.springframework.jdbc.core.ColumnMapRowMapper
+ */
+ Map queryForMap(SqlBuffer sb, RowMapper> rowMapper)
+ throws ServiceException;
+
/**
* Query given SQL to create a prepared statement from SQL and a
* list of arguments to bind to the query, expecting a result list.
@@ -157,6 +175,21 @@ public interface SqlBufferJdbcOperations {
*/
List queryForList(SqlBuffer sb, Class elementType) throws ServiceException;
+ /**
+ * Query given SQL to create a prepared statement from SQL and a
+ * list of arguments to bind to the query, expecting a result list.
+ * The results will be mapped to a List (one entry for each row) of
+ * Maps (one entry for each column, using the column name as the key).
+ * Each element in the list will be of the form returned by this interface's
+ * {@code queryForMap} methods.
+ * @param sb SqlBuffer
+ * @param rowMapper ResultSet row convert to map handler
+ * @return a List that contains a Map per row
+ * @throws ServiceException if the query fails
+ * @see org.springframework.jdbc.core.JdbcTemplate#queryForList(String)
+ */
+ List> queryForList(SqlBuffer sb, RowMapper> rowMapper) throws ServiceException;
+
/**
* Query given SQL to create a prepared statement from SQL and a
* list of arguments to bind to the query, expecting a result list.
@@ -277,4 +310,7 @@ public interface SqlBufferJdbcOperations {
* classic JDBC operations.
*/
JdbcOperations getJdbcOperations();
+
+ /** 获取NamedParameterJdbcOperations **/
+ NamedParameterJdbcOperations getNamedParameterJdbcOperations();
}
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/api/SqlDao.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/api/SqlDao.java
index 1d2c65aeb2a7a58ef854e15d82f4452f1b8bdb76..33e5ccae9ba6434ab818c86b01684f8d842d40d9 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/api/SqlDao.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/api/SqlDao.java
@@ -194,4 +194,13 @@ public interface SqlDao {
* @return SQL内容
*/
SqlBuffer getSqlContent(String sqlId, Object params);
+
+ /**
+ * 渲染SQL模板内容
+ *
+ * @param templateContent SQL模板内容
+ * @param params params Sql参数
+ * @return SQL内容
+ */
+ SqlBuffer renderSqlTemplate(String templateContent, Object params);
}
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/BaseQueryerImpl.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/BaseQueryerImpl.java
index 0eb2f386a2c0f692d2b627eb613890f7e8d53e70..5311ab7dc3724373268b12b73634a3dfc62d71e6 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/BaseQueryerImpl.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/BaseQueryerImpl.java
@@ -16,6 +16,7 @@ import com.gitee.qdbp.able.jdbc.paging.PartList;
import com.gitee.qdbp.jdbc.api.SqlBufferJdbcOperations;
import com.gitee.qdbp.jdbc.exception.DbErrorCode;
import com.gitee.qdbp.jdbc.model.FieldScene;
+import com.gitee.qdbp.jdbc.model.SimpleFieldColumn;
import com.gitee.qdbp.jdbc.plugins.EntityFieldFillExecutor;
import com.gitee.qdbp.jdbc.plugins.SqlDialect;
import com.gitee.qdbp.jdbc.result.KeyIntegerMapper;
@@ -153,7 +154,7 @@ public abstract class BaseQueryerImpl {
DbWhere readyWhere = checkWhere(where);
entityFieldFillExecutor.fillQueryWhereDataState(readyWhere, getMajorTableAlias());
entityFieldFillExecutor.fillQueryWhereParams(readyWhere, getMajorTableAlias());
- PageList list = doListFieldValues(fieldName, false, readyWhere, null, valueClazz);
+ PageList list = doListFieldValues(fieldName, false, readyWhere, OrderPaging.NONE, valueClazz);
return VerifyTools.isBlank(list) ? null : list.get(0);
}
@@ -182,7 +183,9 @@ public abstract class BaseQueryerImpl {
if (odpg.isPaging() && odpg.isNeedCount()) {
csb = sqlBuilder.buildCountSql(wsb);
}
- String columnName = sqlBuilder.helper().getColumnName(FieldScene.CONDITION, fieldName);
+ // 这里不能用getColumnName(), 否则JoinQueryer调用时会返回u.USER_NAME这种带表别名的列名, 导致取不到数据
+ SimpleFieldColumn columnInfo = sqlBuilder.helper().getColumnInfo(FieldScene.CONDITION, fieldName);
+ String columnName = columnInfo.getColumnName();
RowMapper rowMapper = new SingleColumnMapper<>(columnName, valueClazz);
PartList list = PagingQuery.queryForList(jdbc, qsb, csb, odpg, rowMapper);
return list == null ? null : new PageList(list, list.getTotal());
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/CrudDaoImpl.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/CrudDaoImpl.java
index 1d8e374b28bd36e24735775c510e26f847ca1fee..2c458363a55eb71cb989af1303e24bb36a602c24 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/CrudDaoImpl.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/CrudDaoImpl.java
@@ -4,6 +4,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.gitee.qdbp.able.convert.MapToBeanConverter;
import com.gitee.qdbp.able.exception.ServiceException;
import com.gitee.qdbp.able.jdbc.condition.DbUpdate;
import com.gitee.qdbp.able.jdbc.condition.DbWhere;
@@ -25,9 +28,7 @@ import com.gitee.qdbp.jdbc.plugins.DbConditionConverter;
import com.gitee.qdbp.jdbc.plugins.EntityDataStateFillStrategy;
import com.gitee.qdbp.jdbc.plugins.EntityFieldFillExecutor;
import com.gitee.qdbp.jdbc.plugins.EntityFieldFillStrategy;
-import com.gitee.qdbp.jdbc.plugins.MapToBeanConverter;
import com.gitee.qdbp.jdbc.result.RowToBeanMapper;
-import com.gitee.qdbp.jdbc.result.TableRowToBeanMapper;
import com.gitee.qdbp.jdbc.sql.SqlBuffer;
import com.gitee.qdbp.jdbc.sql.build.CrudSqlBuilder;
import com.gitee.qdbp.jdbc.sql.build.QuerySqlBuilder;
@@ -45,12 +46,13 @@ import com.gitee.qdbp.tools.utils.VerifyTools;
*/
public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
+ private static Logger log = LoggerFactory.getLogger(CrudDaoImpl.class);
protected Class beanClass;
/** 批量执行时的大小限制(0为无限制) **/
protected int defaultBatchSize = QdbcBootImpl.DEFAULT_BATCH_SIZE;
CrudDaoImpl(Class c, SqlBufferJdbcOperations jdbc) {
- super(newQuerySqlBuilder(c, jdbc), newEntityFieldFillExecutor(c), jdbc, newRowToBeanMapper(c));
+ super(newQuerySqlBuilder(c, jdbc), newEntityFieldFillExecutor(c), jdbc, getRowToBeanMapper(c));
this.beanClass = c;
}
@@ -66,9 +68,8 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
return new EntityFieldFillExecutor(allFields, fieldFillStrategy, dataStateFillStrategy);
}
- private static RowToBeanMapper newRowToBeanMapper(Class clazz) {
- MapToBeanConverter converter = DbTools.getMapToBeanConverter();
- return new TableRowToBeanMapper<>(clazz, converter);
+ private static RowToBeanMapper getRowToBeanMapper(Class clazz) {
+ return DbTools.getRowToBeanMapper(clazz);
}
@Override
@@ -78,6 +79,11 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
@Override
public T findById(String id) {
+ return findById(Fields.ALL, id);
+ }
+
+ @Override
+ public T findById(Fields fields, String id) {
VerifyTools.requireNotBlank(id, "id");
SimpleFieldColumn pk = getSqlBuilder().helper().getPrimaryKey();
if (pk == null) { // 没有找到主键字段
@@ -87,7 +93,7 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
String primaryField = pk.getFieldName();
DbWhere where = new DbWhere();
where.on(primaryField, "=", id);
- return this.find(where);
+ return this.find(fields, where);
}
@Override
@@ -136,38 +142,6 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
return doListChildren(startCodes, codeField, parentField, Fields.ALL, filter, search, orderings, beanClass);
}
- // ORACLE： START WITH {codeField} IN( {startCode} ) CONNECT BY PRIOR {codeField} = {parentField}
- // DB2: 使用WITH递归
- // MYSQL 8.0+: 使用WITH RECURSIVE递归
- // MYSQL 8.0-: 使用存储过程RECURSIVE_LIST_CHILDREN_QUERY
- protected List doListChildren(List startCodes, String codeField, String parentField,
- Fields selectFields, DbWhere filterWhere, DbWhere searchWhere, Orderings orderings, Class resultType)
- throws ServiceException {
- CrudFragmentHelper sqlHelper = getSqlBuilder().helper();
- String codeColumn = sqlHelper.getColumnName(FieldScene.CONDITION, codeField);
- String parentColumn = sqlHelper.getColumnName(FieldScene.CONDITION, parentField);
- SqlBuffer selectColumns = sqlHelper.buildSelectFieldsSql(selectFields);
-
- Map params = new HashMap<>();
- params.put("codeColumn", codeColumn);
- params.put("parentColumn", parentColumn);
- params.put("tableName", sqlHelper.getTableName());
- params.put("selectColumns", selectColumns);
- params.put("startCodes", startCodes);
- if (filterWhere != null && !filterWhere.isEmpty()) {
- params.put("filterWhere", sqlHelper.buildWhereSql(filterWhere, false));
- }
- if (searchWhere != null && !searchWhere.isEmpty()) {
- params.put("searchWhere", sqlHelper.buildWhereSql(searchWhere, false));
- }
- if (orderings != null && !orderings.isEmpty()) {
- params.put("orderBy", sqlHelper.buildOrderBySql(orderings, false));
- }
-
- String sqlId = "recursive.list.children.query";
- return jdbc.getSqlDao().listForObjects(sqlId, params, resultType);
- }
-
@Override
public List listChildrenCodes(String startCode, String codeField, String parentField, DbWhere filterWhere,
DbWhere searchWhere, Orderings orderings) {
@@ -197,6 +171,106 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
return doListChildren(startCodes, codeField, parentField, fields, filter, search, orderings, String.class);
}
+ @Override
+ public List listParents(String startCode, String codeField, String parentField, DbWhere filterWhere,
+ DbWhere searchWhere, Orderings orderings) {
+ DbWhere filter = checkWhere(filterWhere);
+ DbWhere search = checkWhere(searchWhere);
+ // 数据状态填充在filterWhere中
+ entityFieldFillExecutor.fillQueryWhereDataState(filter, getMajorTableAlias());
+ // 数据权限填充在searchWhere中
+ entityFieldFillExecutor.fillQueryWhereParams(search, getMajorTableAlias());
+
+ List startCodes = ConvertTools.toList(startCode);
+ return doListParents(startCodes, codeField, parentField, Fields.ALL, filter, search, orderings, beanClass);
+ }
+
+ @Override
+ public List listParents(List startCodes, String codeField, String parentField, DbWhere filterWhere,
+ DbWhere searchWhere, Orderings orderings) {
+ DbWhere filter = checkWhere(filterWhere);
+ DbWhere search = checkWhere(searchWhere);
+ // 数据状态填充在filterWhere中
+ entityFieldFillExecutor.fillQueryWhereDataState(filter, getMajorTableAlias());
+ // 数据权限填充在searchWhere中
+ entityFieldFillExecutor.fillQueryWhereParams(search, getMajorTableAlias());
+
+ return doListParents(startCodes, codeField, parentField, Fields.ALL, filter, search, orderings, beanClass);
+ }
+
+ @Override
+ public List listParentCodes(String startCode, String codeField, String parentField, DbWhere filterWhere,
+ DbWhere searchWhere, Orderings orderings) {
+ DbWhere filter = checkWhere(filterWhere);
+ DbWhere search = checkWhere(searchWhere);
+ // 数据状态填充在filterWhere中
+ entityFieldFillExecutor.fillQueryWhereDataState(filter, getMajorTableAlias());
+ // 数据权限填充在searchWhere中
+ entityFieldFillExecutor.fillQueryWhereParams(search, getMajorTableAlias());
+
+ List startCodes = ConvertTools.toList(startCode);
+ IncludeFields fields = new IncludeFields(codeField);
+ return doListParents(startCodes, codeField, parentField, fields, filter, search, orderings, String.class);
+ }
+
+ @Override
+ public List listParentCodes(List startCodes, String codeField, String parentField,
+ DbWhere filterWhere, DbWhere searchWhere, Orderings orderings) {
+ DbWhere filter = checkWhere(filterWhere);
+ DbWhere search = checkWhere(searchWhere);
+ // 数据状态填充在filterWhere中
+ entityFieldFillExecutor.fillQueryWhereDataState(filter, getMajorTableAlias());
+ // 数据权限填充在searchWhere中
+ entityFieldFillExecutor.fillQueryWhereParams(search, getMajorTableAlias());
+
+ IncludeFields fields = new IncludeFields(codeField);
+ return doListParents(startCodes, codeField, parentField, fields, filter, search, orderings, String.class);
+ }
+
+ // ORACLE： START WITH {codeField} IN( {startCode} ) CONNECT BY PRIOR {codeField}={parentField}
+ // DB2: 使用WITH递归
+ // MYSQL 8.0+: 使用WITH RECURSIVE递归
+ // MYSQL 8.0-: 使用存储过程RECURSIVE_LIST_CHILDREN_QUERY
+ protected List doListChildren(List startCodes, String codeField, String parentField, Fields fields,
+ DbWhere filter, DbWhere search, Orderings orderings, Class resultType) throws ServiceException {
+ return doListRecursive("children", startCodes, codeField, parentField, fields, filter, search, orderings,
+ resultType);
+ }
+
+ protected List doListParents(List startCodes, String codeField, String parentField, Fields fields,
+ DbWhere filter, DbWhere search, Orderings orderings, Class resultType) throws ServiceException {
+ return doListRecursive("parents", startCodes, codeField, parentField, fields, filter, search, orderings,
+ resultType);
+ }
+
+ protected List doListRecursive(String type, List startCodes, String codeField, String parentField,
+ Fields selectFields, DbWhere filterWhere, DbWhere searchWhere, Orderings orderings, Class resultType)
+ throws ServiceException {
+ CrudFragmentHelper sqlHelper = getSqlBuilder().helper();
+ String codeColumn = sqlHelper.getColumnName(FieldScene.CONDITION, codeField);
+ String parentColumn = sqlHelper.getColumnName(FieldScene.CONDITION, parentField);
+ SqlBuffer selectColumns = sqlHelper.buildSelectFieldsSql(selectFields);
+
+ Map params = new HashMap<>();
+ params.put("codeColumn", codeColumn);
+ params.put("parentColumn", parentColumn);
+ params.put("tableName", sqlHelper.getTableName());
+ params.put("selectColumns", selectColumns);
+ params.put("startCodes", startCodes);
+ if (filterWhere != null && !filterWhere.isEmpty()) {
+ params.put("filterWhere", sqlHelper.buildWhereSql(filterWhere, false));
+ }
+ if (searchWhere != null && !searchWhere.isEmpty()) {
+ params.put("searchWhere", sqlHelper.buildWhereSql(searchWhere, false));
+ }
+ if (orderings != null && !orderings.isEmpty()) {
+ params.put("orderBy", sqlHelper.buildOrderBySql(orderings, false));
+ }
+
+ String sqlId = "global.recursive:recursive.list." + type + ".query";
+ return jdbc.getSqlDao().listForObjects(sqlId, params, resultType);
+ }
+
protected Map copmareMapDifference(Map original, Map current) {
Map diff = new HashMap<>();
for (Map.Entry entry : original.entrySet()) {
@@ -205,8 +279,10 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
}
}
for (Map.Entry entry : current.entrySet()) {
- if (VerifyTools.notEquals(entry.getValue(), original.get(entry.getKey()))) {
- diff.put(entry.getKey(), entry.getValue());
+ Object curvalue = DbTools.unwrapDbVariable(entry.getValue());
+ Object orivalue = DbTools.unwrapDbVariable(original.get(entry.getKey()));
+ if (VerifyTools.notEquals(curvalue, orivalue)) {
+ diff.put(entry.getKey(), curvalue);
}
}
return diff;
@@ -445,8 +521,13 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
protected int doUpdate(DbUpdate readyEntity, DbWhere readyWhere, boolean errorOnUnaffected)
throws ServiceException {
SqlBuffer buffer = getSqlBuilder().buildUpdateSql(readyEntity, readyWhere);
-
- int rows = jdbc.update(buffer);
+ int rows;
+ if (buffer.isBlank()) {
+ rows = 0;
+ log.debug("Update set fields is empty, the update operation will be skipped.");
+ } else {
+ rows = jdbc.update(buffer);
+ }
if (rows == 0 && errorOnUnaffected) {
throw new ServiceException(DbErrorCode.DB_AFFECTED_ROWS_IS_ZERO);
@@ -689,7 +770,12 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
entityFieldFillExecutor.fillLogicalDeleteParams(ud);
}
SqlBuffer buffer = getSqlBuilder().buildUpdateSql(ud, readyWhere);
- rows = jdbc.update(buffer);
+ if (buffer.isBlank()) {
+ rows = 0;
+ log.debug("Update set fields is empty, the logical delete operation will be skipped.");
+ } else {
+ rows = jdbc.update(buffer);
+ }
} else { // 不支持逻辑删除
String details = "UnsupportedLogicDelete, class=" + beanClass.getName();
throw new ServiceException(DbErrorCode.DB_UNSUPPORTED_LOGICAL_DELETE, details);
@@ -768,7 +854,8 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
if (pk == null) {
id = null;
} else if (VerifyTools.isNotBlank(entity.get(pk.getFieldName()))) {
- id = entity.get(pk.getFieldName()).toString();
+ Object pkValue = DbTools.unwrapDbVariable(entity.get(pk.getFieldName()));
+ id = pkValue.toString();
} else {
// 生成主键
entity.put(pk.getFieldName(), id = entityFieldFillExecutor.generatePrimaryKeyCode(tableName));
@@ -808,7 +895,7 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
// 比对修改后的字段值与原值的差异, 复制到原对象
Map diff = copmareMapDifference(original, readyEntity);
MapToBeanConverter mapToBeanConverter = DbTools.getMapToBeanConverter();
- mapToBeanConverter.fill(diff, entity);
+ mapToBeanConverter.fillTo(diff, entity);
return new PkEntity(id, readyEntity);
}
@@ -858,7 +945,7 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
}
// 填充实体的修改参数(如修改人修改时间等)
fillEntityUpdateParams(entity, fillUpdateParams);
- return new PkEntity(pkValue.toString(), entity);
+ return new PkEntity(DbTools.unwrapDbVariable(pkValue).toString(), entity);
} else if (beanClass.isAssignableFrom(object.getClass())) {
@SuppressWarnings("unchecked")
T entity = (T) object;
@@ -945,11 +1032,12 @@ public class CrudDaoImpl extends BaseQueryerImpl implements CrudDao {
// 比对修改后的字段值与原值的差异, 复制到原对象
Map diff = copmareMapDifference(original, readyEntity);
MapToBeanConverter mapToBeanConverter = DbTools.getMapToBeanConverter();
- mapToBeanConverter.fill(diff, entity);
+ mapToBeanConverter.fillTo(diff, entity);
return readyEntity;
}
/** 获取当前实例的Bean类型 **/
+ @Override
public Class getBeanClass() {
return beanClass;
}
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/JoinQueryerImpl.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/JoinQueryerImpl.java
index 301d45c7614728e06266db513e6b12e5e0e15720..12360cca208fd4de583aa2654ad50844477ff5ed 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/JoinQueryerImpl.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/JoinQueryerImpl.java
@@ -10,9 +10,7 @@ import com.gitee.qdbp.jdbc.model.AllFieldColumn;
import com.gitee.qdbp.jdbc.plugins.EntityDataStateFillStrategy;
import com.gitee.qdbp.jdbc.plugins.EntityFieldFillExecutor;
import com.gitee.qdbp.jdbc.plugins.EntityFieldFillStrategy;
-import com.gitee.qdbp.jdbc.plugins.MapToBeanConverter;
import com.gitee.qdbp.jdbc.result.RowToBeanMapper;
-import com.gitee.qdbp.jdbc.result.TablesRowToProperyMapper;
import com.gitee.qdbp.jdbc.sql.build.QuerySqlBuilder;
import com.gitee.qdbp.jdbc.sql.fragment.TableJoinFragmentHelper;
import com.gitee.qdbp.jdbc.utils.DbTools;
@@ -28,7 +26,7 @@ public class JoinQueryerImpl extends BaseQueryerImpl implements JoinQuerye
private String majorTableAlias;
public JoinQueryerImpl(TableJoin t, Class r, SqlBufferJdbcOperations jdbc) {
- super(newQuerySqlBuilder(t, jdbc), newEntityFieldFillExecutor(t), jdbc, newRowToBeanMapper(t, r));
+ super(newQuerySqlBuilder(t, jdbc), newEntityFieldFillExecutor(t), jdbc, getRowToBeanMapper(t, r));
this.majorTableAlias = t.getMajor().getTableAlias();
List joins = t.getJoins();
for (JoinItem item : joins) {
@@ -51,9 +49,8 @@ public class JoinQueryerImpl extends BaseQueryerImpl implements JoinQuerye
return new EntityFieldFillExecutor(allFields, fieldFillStrategy, dataStateFillStrategy);
}
- private static RowToBeanMapper newRowToBeanMapper(TableJoin tables, Class clazz) {
- MapToBeanConverter converter = DbTools.getMapToBeanConverter();
- return new TablesRowToProperyMapper<>(tables, clazz, converter);
+ private static RowToBeanMapper getRowToBeanMapper(TableJoin tables, Class clazz) {
+ return DbTools.getRowToBeanMapper(tables, clazz);
}
/** {@inheritDoc} **/
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/QdbcBootImpl.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/QdbcBootImpl.java
index 9b5bf0f0158dcd22c95a2ffb55470eb67d2c90f6..f5261a9bea8950a97a25d528538578cc0f24d1f9 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/QdbcBootImpl.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/QdbcBootImpl.java
@@ -19,6 +19,8 @@ import com.gitee.qdbp.jdbc.sql.build.QuerySqlBuilder;
import com.gitee.qdbp.jdbc.sql.fragment.CrudFragmentHelper;
import com.gitee.qdbp.jdbc.sql.fragment.TableCrudFragmentHelper;
import com.gitee.qdbp.jdbc.sql.fragment.TableJoinFragmentHelper;
+import com.gitee.qdbp.jdbc.stream.CrudStream;
+import com.gitee.qdbp.jdbc.stream.SqlStream;
/**
* 基础增删改查对象的构造器
@@ -60,6 +62,18 @@ public class QdbcBootImpl implements QdbcBoot {
}
}
+ /** {@inheritDoc} **/
+ @Override
+ public CrudStream crudStream(Class clazz) {
+ return new CrudStream(buildCrudDao(clazz));
+ }
+
+ /** {@inheritDoc} **/
+ @Override
+ public SqlStream sqlStream() {
+ return new SqlStream(getSqlDao());
+ }
+
/** {@inheritDoc} **/
@Override
@SuppressWarnings("unchecked")
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlBufferJdbcTemplate.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlBufferJdbcTemplate.java
index 673fa1a37ace3afa70ce57d5f4bfd00868b243f3..4d57e1591706b9588e271b0a13c83ecbf1c15899 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlBufferJdbcTemplate.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlBufferJdbcTemplate.java
@@ -10,7 +10,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.ColumnMapRowMapper;
import org.springframework.jdbc.core.JdbcOperations;
import org.springframework.jdbc.core.PreparedStatementCallback;
import org.springframework.jdbc.core.ResultSetExtractor;
@@ -32,11 +31,9 @@ import com.gitee.qdbp.able.result.ResultCode;
import com.gitee.qdbp.jdbc.api.SqlBufferJdbcOperations;
import com.gitee.qdbp.jdbc.api.SqlDao;
import com.gitee.qdbp.jdbc.model.DbVersion;
-import com.gitee.qdbp.jdbc.plugins.MapToBeanConverter;
import com.gitee.qdbp.jdbc.plugins.SqlDialect;
import com.gitee.qdbp.jdbc.result.FirstColumnMapper;
import com.gitee.qdbp.jdbc.result.RowToBeanMapper;
-import com.gitee.qdbp.jdbc.result.TableRowToBeanMapper;
import com.gitee.qdbp.jdbc.sql.SqlBuffer;
import com.gitee.qdbp.jdbc.sql.parse.SqlFragmentContainer;
import com.gitee.qdbp.jdbc.utils.CountSqlParser;
@@ -61,12 +58,10 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
private SqlDialect sqlDialect;
private SqlDao sqlDao;
private NamedParameterJdbcOperations namedParameterJdbcOperations;
- protected RowMapper> mapResultConvert;
protected CountSqlParser countSqlParser;
public SqlBufferJdbcTemplate() {
this.countSqlParser = new CountSqlParser();
- this.mapResultConvert = new ColumnMapRowMapper();
}
public SqlBufferJdbcTemplate(NamedParameterJdbcOperations jdbcOperations) {
@@ -74,53 +69,53 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
this.setNamedParameterJdbcOperations(jdbcOperations);
}
- protected SqlBufferJdbcTemplate(SqlBufferJdbcTemplate parent, RowMapper> mapResultConvert) {
- this.namedParameterJdbcOperations = parent.getNamedParameterJdbcOperations();
- this.mapResultConvert = mapResultConvert != null ? mapResultConvert : parent.mapResultConvert;
+ protected SqlBufferJdbcTemplate(SqlBufferJdbcTemplate parent) {
+ this.namedParameterJdbcOperations = parent.namedParameterJdbcOperations;
this.countSqlParser = parent.countSqlParser;
- this.dbVersion = parent.getDbVersion();
- this.sqlDialect = parent.getSqlDialect();
- this.sqlDao = parent.getSqlDao();
- this.inited = true;
- }
-
- public NamedParameterJdbcOperations getNamedParameterJdbcOperations() {
- return namedParameterJdbcOperations;
+ this.dbVersion = parent.dbVersion;
+ this.sqlDialect = parent.sqlDialect;
+ this.sqlDao = parent.sqlDao;
}
public void setNamedParameterJdbcOperations(NamedParameterJdbcOperations namedParameterJdbcOperations) {
this.namedParameterJdbcOperations = namedParameterJdbcOperations;
+ // 不能在系统初始化时执行dialect/sqlDao的初始化
+ // 因为此时DbPluginContainer.init(container)还没有执行
+ // 还没有配置DbVersionFinder
+ // this.doInitDialect();
+ // this.doInitSqlDao();
}
- private boolean inited = false;
-
- protected void init() {
- if (this.inited) {
- return;
+ private void initDialect() {
+ if (this.sqlDialect == null) {
+ this.doInitDialect();
}
- this.doInit();
}
- private synchronized void doInit() {
- if (this.inited) {
- return;
+ private void initSqlDao() {
+ if (this.sqlDao == null) {
+ this.doInitSqlDao();
}
- this.inited = true;
+ }
- JdbcOperations jdbcOperations = namedParameterJdbcOperations.getJdbcOperations();
- if (!(jdbcOperations instanceof JdbcAccessor)) {
- throw new IllegalStateException("Unsupported JdbcOperations: " + jdbcOperations.getClass().getName());
- }
- JdbcAccessor accessor = (JdbcAccessor) jdbcOperations;
- DataSource datasource = accessor.getDataSource();
- if (datasource == null) {
- throw new IllegalStateException("Datasource is null.");
- }
- if (dbVersion == null) {
+ private synchronized void doInitDialect() {
+ if (this.sqlDialect == null) {
+ JdbcOperations jdbcOperations = namedParameterJdbcOperations.getJdbcOperations();
+ if (!(jdbcOperations instanceof JdbcAccessor)) {
+ throw new IllegalStateException("Unsupported JdbcOperations: " + jdbcOperations.getClass().getName());
+ }
+ JdbcAccessor accessor = (JdbcAccessor) jdbcOperations;
+ DataSource datasource = accessor.getDataSource();
+ if (datasource == null) {
+ throw new IllegalStateException("Datasource is null.");
+ }
dbVersion = DbTools.findDbVersion(datasource);
sqlDialect = DbTools.buildSqlDialect(dbVersion);
log.debug("Database version: {}", dbVersion);
}
+ }
+
+ private synchronized void doInitSqlDao() {
if (this.sqlDao == null) {
SqlFragmentContainer container = SqlFragmentContainer.defaults();
this.sqlDao = new SqlDaoImpl(container, this);
@@ -129,25 +124,28 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
@Override
public DbVersion getDbVersion() {
- this.init();
+ initDialect();
return dbVersion;
}
@Override
public SqlDialect getSqlDialect() {
- this.init();
+ initDialect();
return sqlDialect;
}
@Override
public SqlDao getSqlDao() {
- this.init();
+ initSqlDao();
return sqlDao;
}
- protected RowToBeanMapper newRowToBeanMapper(Class clazz) {
- MapToBeanConverter converter = DbTools.getMapToBeanConverter();
- return new TableRowToBeanMapper<>(clazz, converter, true, mapResultConvert);
+ protected RowMapper> getRowToMapConverter() {
+ return DbTools.getRowToMapConverter();
+ }
+
+ protected RowToBeanMapper getRowToBeanConverter(Class clazz) {
+ return DbTools.getRowToBeanMapper(clazz);
}
@Override
@@ -158,6 +156,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql statement:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -174,8 +173,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return null;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -187,6 +185,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -204,8 +203,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return null;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -217,6 +215,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -227,8 +226,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
}
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -240,6 +238,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -251,8 +250,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return list;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -264,6 +262,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -281,8 +280,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return null;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -290,16 +288,17 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
public T queryForObject(SqlBuffer sb, Class resultType) throws ServiceException {
VerifyTools.requireNotBlank(sb, "sqlBuffer");
if (!ReflectTools.isPrimitive(resultType, false)) {
- return queryForObject(sb, newRowToBeanMapper(resultType));
+ return queryForObject(sb, getRowToBeanConverter(resultType));
}
long startTime = System.currentTimeMillis();
String logsql = null;
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
+ String sql = sb.getPreparedSqlString(sqlDialect);
+ Map params = sb.getPreparedVariables(sqlDialect);
try {
- String sql = sb.getPreparedSqlString(sqlDialect);
- Map params = sb.getPreparedVariables(sqlDialect);
T result = namedParameterJdbcOperations.queryForObject(sql, params, resultType);
if (log.isDebugEnabled()) {
long time = System.currentTimeMillis() - startTime;
@@ -314,8 +313,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return null;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -339,16 +337,24 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
@Override
public Map queryForMap(SqlBuffer sb) throws ServiceException {
+ RowMapper> rowToMapConverter = getRowToMapConverter();
+ return queryForMap(sb, rowToMapConverter);
+ }
+
+ @Override
+ public Map queryForMap(SqlBuffer sb, RowMapper> rowMapper)
+ throws ServiceException {
VerifyTools.requireNotBlank(sb, "sqlBuffer");
long startTime = System.currentTimeMillis();
String logsql = null;
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
- Map result = namedParameterJdbcOperations.queryForObject(sql, params, mapResultConvert);
+ Map result = namedParameterJdbcOperations.queryForObject(sql, params, rowMapper);
if (log.isDebugEnabled()) {
long time = System.currentTimeMillis() - startTime;
log.debug("Sql query returns {} rows, elapsed time {}ms.", result == null ? 0 : 1, time);
@@ -362,8 +368,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return null;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -375,6 +380,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -382,7 +388,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (ReflectTools.isPrimitive(elementType, false)) {
list = namedParameterJdbcOperations.queryForList(sql, params, elementType);
} else {
- list = namedParameterJdbcOperations.query(sql, params, newRowToBeanMapper(elementType));
+ list = namedParameterJdbcOperations.query(sql, params, getRowToBeanConverter(elementType));
}
if (log.isDebugEnabled()) {
long time = System.currentTimeMillis() - startTime;
@@ -391,23 +397,30 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return list;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@Override
public List> queryForList(SqlBuffer sb) throws ServiceException {
+ RowMapper> rowMapper = getRowToMapConverter();
+ return queryForList(sb, rowMapper);
+ }
+
+ @Override
+ public List> queryForList(SqlBuffer sb, RowMapper> rowMapper)
+ throws ServiceException {
VerifyTools.requireNotBlank(sb, "sqlBuffer");
long startTime = System.currentTimeMillis();
String logsql = null;
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
- List> list = namedParameterJdbcOperations.query(sql, params, mapResultConvert);
+ List> list = namedParameterJdbcOperations.query(sql, params, rowMapper);
if (log.isDebugEnabled()) {
long time = System.currentTimeMillis() - startTime;
log.debug("Sql query returns {} rows, elapsed time {}ms.", list == null ? 0 : list.size(), time);
@@ -415,8 +428,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return list;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -428,6 +440,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql query:\n{}", logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -439,8 +452,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return result;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
}
}
@@ -474,6 +486,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql {}:\n{}", desc, logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -485,8 +498,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return rows;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(errorCode, details, e);
+ throw createServiceException(errorCode, details, e);
}
}
@@ -497,6 +509,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql {}:\n{}", desc, logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
SqlParameterSource msps = new MapSqlParameterSource(params);
@@ -509,8 +522,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return rows;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(errorCode, details, e);
+ throw createServiceException(errorCode, details, e);
}
}
@@ -532,6 +544,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
if (log.isDebugEnabled()) {
log.debug("Executing sql batch {}:\n{}", operate, logsql = getFormattedSqlString(sb, 1));
}
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getPreparedSqlString(sqlDialect);
Map params = sb.getPreparedVariables(sqlDialect);
try {
@@ -543,31 +556,35 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return rows;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getFormattedSqlString(sb, 1));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(errorCode, details, e);
+ throw createServiceException(errorCode, details, e);
}
}
protected String getFormattedSqlString(SqlBuffer sb, int indent) {
// 未开启到TRACE级别的日志就执行省略模式
boolean omitMode = !log.isTraceEnabled();
+ SqlDialect sqlDialect = getSqlDialect();
String sql = sb.getLoggingSqlString(sqlDialect, omitMode);
return DbTools.formatSql(sql, 1);
}
// key=querySql, value=countSql
- private static Map COUNT_SQL_MAPS = new ConcurrentHashMap<>();
+ private static Map COUNT_SQL_MAPS = new ConcurrentHashMap<>();
@Override
public int countByQuerySql(SqlBuffer querySql) {
long startTime = System.currentTimeMillis();
+ SqlDialect sqlDialect = getSqlDialect();
String namedQuerySql = querySql.getPreparedSqlString(sqlDialect);
String countSql;
Object[] paramArray;
if (COUNT_SQL_MAPS.containsKey(namedQuerySql)) {
- SqlAndParams item = COUNT_SQL_MAPS.get(namedQuerySql);
- countSql = item.sql;
- paramArray = item.params;
+ CountSqlItem item = COUNT_SQL_MAPS.get(namedQuerySql);
+ countSql = item.countSql;
+ ParsedSql parsedQuerySql = item.parsedSql;
+ Map paramMaps = querySql.getPreparedVariables(sqlDialect);
+ SqlParameterSource paramSource = new MapSqlParameterSource(paramMaps);
+ paramArray = NamedParameterUtils.buildValueArray(parsedQuerySql, paramSource, null);
} else {
// 解析查询语句生成统计语句
Map paramMaps = querySql.getPreparedVariables(sqlDialect);
@@ -578,7 +595,7 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
countSql = countSqlParser.getSmartCountSql(actualQuerySql);
- COUNT_SQL_MAPS.put(namedQuerySql, new SqlAndParams(countSql, paramArray));
+ COUNT_SQL_MAPS.put(namedQuerySql, new CountSqlItem(parsedQuerySql, countSql));
}
// 输出日志
@@ -601,19 +618,29 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
return total;
} catch (DataAccessException e) {
String details = "Sql:\n" + (logsql != null ? logsql : getLoggingSqlForHashParamsSql(countSql, paramArray));
- details = StringTools.concat('\n', details, e.getCause() == null ? null : e.getCause().getMessage());
- throw new ServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ throw createServiceException(ResultCode.DB_SELECT_ERROR, details, e);
+ }
+ }
+
+ private ServiceException createServiceException(IResultMessage resultCode, String details, DataAccessException e) {
+ if (e.getCause() == null) {
+ return new ServiceException(resultCode, details, e);
+ } else {
+ details = StringTools.concat('\n', details, e.getCause().getMessage());
+ // 异常Cause层级太深了, 而且很多重复信息, 跳过一层
+ // return new ServiceException(resultCode, details, e);
+ return new ServiceException(resultCode, details, e.getCause());
}
}
- private static class SqlAndParams {
+ private static class CountSqlItem {
- private String sql;
- private Object[] params;
+ private ParsedSql parsedSql;
+ private String countSql;
- public SqlAndParams(String sql, Object[] params) {
- this.sql = sql;
- this.params = params;
+ public CountSqlItem(ParsedSql parsedSql, String countSql) {
+ this.parsedSql = parsedSql;
+ this.countSql = countSql;
}
}
@@ -673,4 +700,9 @@ public class SqlBufferJdbcTemplate implements SqlBufferJdbcOperations {
public JdbcOperations getJdbcOperations() {
return namedParameterJdbcOperations.getJdbcOperations();
}
+
+ @Override
+ public NamedParameterJdbcOperations getNamedParameterJdbcOperations() {
+ return namedParameterJdbcOperations;
+ }
}
diff --git a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlDaoImpl.java b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlDaoImpl.java
index 33898a8c2dbdfcbe4e10921f8418eb363a35a9ee..7b00129d00bb245a38189d81b043cf9fcea95780 100644
--- a/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlDaoImpl.java
+++ b/jdbc-core/src/main/java/com/gitee/qdbp/jdbc/biz/SqlDaoImpl.java
@@ -6,16 +6,12 @@ import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.RowMapper;
+import com.gitee.qdbp.able.convert.BeanToMapConverter;
import com.gitee.qdbp.able.jdbc.paging.PageList;
import com.gitee.qdbp.able.jdbc.paging.Paging;
import com.gitee.qdbp.jdbc.api.SqlBufferJdbcOperations;
import com.gitee.qdbp.jdbc.api.SqlDao;
-import com.gitee.qdbp.jdbc.plugins.BeanToMapConverter;
-import com.gitee.qdbp.jdbc.plugins.MapToBeanConverter;
import com.gitee.qdbp.jdbc.plugins.SqlDialect;
-import com.gitee.qdbp.jdbc.result.CamelNamingMapRowMapper;
-import com.gitee.qdbp.jdbc.result.RowToBeanMapper;
-import com.gitee.qdbp.jdbc.result.TableRowToBeanMapper;
import com.gitee.qdbp.jdbc.sql.SqlBuffer;
import com.gitee.qdbp.jdbc.sql.parse.SqlFragmentContainer;
import com.gitee.qdbp.jdbc.utils.DbTools;
@@ -35,16 +31,10 @@ public class SqlDaoImpl implements SqlDao {
protected SqlFragmentContainer container;
protected SqlBufferJdbcOperations jdbc;
- protected SqlDialect dialect;
public SqlDaoImpl(SqlFragmentContainer container, SqlBufferJdbcOperations jdbcOperations) {
this.container = container;
- this.dialect = jdbcOperations.getSqlDialect();
- if (jdbcOperations instanceof SqlBufferJdbcTemplate) {
- this.jdbc = new MapSqlBufferJdbcTemplate((SqlBufferJdbcTemplate) jdbcOperations);
- } else {
- this.jdbc = jdbcOperations;
- }
+ this.jdbc = jdbcOperations;
}
protected Map beanToMap(Object bean) {
@@ -57,49 +47,49 @@ public class SqlDaoImpl implements SqlDao {
@Override
public T findForObject(String sqlId, Object params, Class resultType) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.queryForObject(sql, resultType);
}
@Override
public T findForObject(String sqlId, Object params, RowMapper rowMapper) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.queryForObject(sql, rowMapper);
}
@Override
public Map findForMap(String sqlId, Object params) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.queryForMap(sql);
}
@Override
public List listForObjects(String sqlId, Object params, Class resultType) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.queryForList(sql, resultType);
}
@Override
public List listForObjects(String sqlId, Object params, RowMapper rowMapper) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.query(sql, rowMapper);
}
@Override
public List> listForMaps(String sqlId, Object params) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.queryForList(sql);
}
@Override
public PageList pageForObjects(String sqlId, Object params, Paging paging, Class resultType) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
// 先查询总数据量
Integer total = paging.getTotal();
@@ -124,7 +114,7 @@ public class SqlDaoImpl implements SqlDao {
@Override
public PageList pageForObjects(String sqlId, Object params, Paging paging, RowMapper rowMapper) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
// 先查询总数据量
Integer total = paging.getTotal();
@@ -149,7 +139,7 @@ public class SqlDaoImpl implements SqlDao {
@Override
public PageList> pageForMaps(String sqlId, Object params, Paging paging) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
// 先查询总数据量
Integer total = paging.getTotal();
@@ -175,12 +165,12 @@ public class SqlDaoImpl implements SqlDao {
public PageList pageForObjects(String queryId, String countId, Object params, Paging paging,
Class resultType) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer querySql = container.render(queryId, map, dialect);
+ SqlBuffer querySql = doGetSqlContent(queryId, map);
// 先查询总数据量
Integer total = paging.getTotal();
if (paging.isNeedCount()) {
- SqlBuffer countSql = container.render(countId, map, dialect);
+ SqlBuffer countSql = doGetSqlContent(countId, map);
total = jdbc.queryForObject(countSql, Integer.class);
paging.setTotal(total);
}
@@ -202,12 +192,12 @@ public class SqlDaoImpl implements SqlDao {
public PageList pageForObjects(String queryId, String countId, Object params, Paging paging,
RowMapper rowMapper) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer querySql = container.render(queryId, map, dialect);
+ SqlBuffer querySql = doGetSqlContent(queryId, map);
// 先查询总数据量
Integer total = paging.getTotal();
if (paging.isNeedCount()) {
- SqlBuffer countSql = container.render(countId, map, dialect);
+ SqlBuffer countSql = doGetSqlContent(countId, map);
total = jdbc.queryForObject(countSql, Integer.class);
paging.setTotal(total);
}
@@ -228,12 +218,12 @@ public class SqlDaoImpl implements SqlDao {
@Override
public PageList> pageForMaps(String queryId, String countId, Object params, Paging paging) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer querySql = container.render(queryId, map, dialect);
+ SqlBuffer querySql = doGetSqlContent(queryId, map);
// 先查询总数据量
Integer total = paging.getTotal();
if (paging.isNeedCount()) {
- SqlBuffer countSql = container.render(countId, map, dialect);
+ SqlBuffer countSql = doGetSqlContent(countId, map);
total = jdbc.queryForObject(countSql, Integer.class);
paging.setTotal(total);
}
@@ -254,54 +244,47 @@ public class SqlDaoImpl implements SqlDao {
@Override
public int insert(String sqlId, Object params) {
Map map = params == null ? null : beanToMap(params);
- SqlBuffer sql = renderSqlTemplate(sqlId, map);
+ SqlBuffer sql = doGetSqlContent(sqlId, map);
return jdbc.insert(sql);
}
@Override
public int update(String sqlId, Object params) {
Map