Merge branch 'feature/mergever' into 'release'

feat:[none] 调用sessionTemplate统一改成方法形式以便子类自定义

See merge request rays/pcloud-common-parent!287

pcloud-common-core/src/main/java/com/pcloud/common/core/dao/BaseDaoImpl.java

@@ -57,6 +57,10 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         return sqlSessionTemplate;
     }
 
+    public SqlSessionFactory getSqlSessionFactory() {
+        return sqlSessionFactory;
+    }
+
     public SqlSession getSqlSession() {
         return sqlSessionTemplate;
     }
@@ -66,7 +70,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         if (t == null)
             throw new RuntimeException("T is null");
 
-        int result = sqlSessionTemplate.insert(getStatement(SQL_INSERT), t);
+        int result = getSessionTemplate().insert(getStatement(SQL_INSERT), t);
 
         if (result <= 0)
             throw BizException.DB_INSERT_RESULT_0;
@@ -82,7 +86,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         if (list == null || list.size() <= 0)
             return 0;
 
-        int result = sqlSessionTemplate.insert(getStatement(SQL_BATCH_INSERT), list);
+        int result = getSessionTemplate().insert(getStatement(SQL_BATCH_INSERT), list);
 
         if (result <= 0)
             throw BizException.DB_INSERT_RESULT_0;
@@ -94,7 +98,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         if (t == null)
             throw new RuntimeException("T is null");
 
-        int result = sqlSessionTemplate.update(getStatement(SQL_UPDATE), t);
+        int result = getSessionTemplate().update(getStatement(SQL_UPDATE), t);
 
         if (result <= 0)
             throw BizException.DB_UPDATE_RESULT_0;
@@ -108,7 +112,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
 
         int result = 0;
         try {
-            result = sqlSessionTemplate.update(getStatement(sqlId), t);
+            result = getSessionTemplate().update(getStatement(sqlId), t);
         } catch (Exception e) {
             logger.error("update fail[" + sqlId + "]:" + e.getMessage(), e);
             throw BizException.DB_DML_FAIL;
@@ -125,7 +129,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
 
         int result = 0;
         try {
-            result = sqlSessionTemplate.update(getStatement(sqlId), t);
+            result = getSessionTemplate().update(getStatement(sqlId), t);
         } catch (Exception e) {
             logger.error("update fail[" + sqlId + "]:" + e.getMessage(), e);
             throw BizException.DB_DML_FAIL;
@@ -159,11 +163,11 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
     }
 
     public T getById(long id) {
-        return sqlSessionTemplate.selectOne(getStatement(SQL_GET_BY_ID), id);
+        return getSessionTemplate().selectOne(getStatement(SQL_GET_BY_ID), id);
     }
 
     public long deleteById(long id) {
-        return (long) sqlSessionTemplate.delete(getStatement(SQL_DELETE_BY_ID), id);
+        return (long) getSessionTemplate().delete(getStatement(SQL_DELETE_BY_ID), id);
     }
 
     public PageBean listPage(PageParam pageParam, Map<String, Object> paramMap, String sqlId) {
@@ -260,7 +264,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         // 是否统计当前分页条件下的数据：1:是，其他为否
         Object isCount = paramMap.get("isCount");
         if (isCount != null && "1".equals(isCount.toString())) {
-            Map<String, Object> countResultMap = sqlSessionTemplate.selectOne(getStatement(SQL_COUNT_BY_PAGE_PARAM),
+            Map<String, Object> countResultMap = getSessionTemplate().selectOne(getStatement(SQL_COUNT_BY_PAGE_PARAM),
                     paramMap);
             return new PageBean(pageParam.getPageNum(), pageParam.getNumPerPage(), count.intValue(), list,
                     countResultMap);
@@ -278,7 +282,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
         if (paramMap == null)
             paramMap = new HashMap<String, Object>();
 
-        return sqlSessionTemplate.selectList(getStatement(sqlId), paramMap);
+        return getSessionTemplate().selectList(getStatement(sqlId), paramMap);
     }
 
     @SuppressWarnings("unchecked")
@@ -307,7 +311,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
     public String getSeqNextValue(String seqName) {
         boolean isClosedConn = false;
         // 获取当前线程的连接
-        Connection connection = this.sqlSessionTemplate.getConnection();
+        Connection connection = this.getSessionTemplate().getConnection();
         // 获取Mybatis的SQLRunner类
         SqlRunner sqlRunner = null;
         try {
@@ -327,7 +331,7 @@ public abstract class BaseDaoImpl<T extends BaseEntity> implements BaseDao<T> {
             }
             // 如果状态为关闭,则需要从新打开一个连接
             if (connection.isClosed()) {
-                connection = sqlSessionFactory.openSession().getConnection();
+                connection = getSqlSessionFactory().openSession().getConnection();
                 isClosedConn = true;
             }
             sqlRunner = new SqlRunner(connection);