数据库读写分离 功能完善

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -390,7 +390,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> listPager(Pager pager) {
-        if (pager.getTotalRows() > 0) {
+        if (pager != null) {
             return entityManager.createQuery("from " + persistentClass.getName())
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
@@ -647,7 +647,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
             return entityManager.createQuery(queryString)
                     .setParameter(propertyName, value)
@@ -659,7 +659,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByPropertyPage(String[] propertyNames, Object[] values, String orderByStuff, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             if(propertyNames.length != values.length){
                 throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
             }
@@ -790,7 +790,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager, String[] propertyNames, Object[] values, String orderByStuff) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             if(propertyNames.length != values.length){
                 throw new IllegalArgumentException("参数名的数量和参数值不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
             }
@@ -825,7 +825,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Deprecated
     @Override
     public List<T> findByHqlWherePage(String hqlWhere, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             StringBuffer queryString = new StringBuffer();
             queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
@@ -844,7 +844,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlWherePage(DdlPackBean packBean, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
                     + " as model where 1=1 " + packBean.getPackedHql());
 
@@ -922,7 +922,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(String hqlWhere, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             StringBuffer queryString = new StringBuffer();
             queryString.append("from " + persistentClass.getSimpleName() + " as model where 1=1 ");
 
@@ -941,7 +941,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(DdlPackBean packBean, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
                     + " as model where 1=1 " + packBean.getPackedHql());
 
@@ -959,7 +959,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findByHqlPage(String hql, Pager pager, String[] paramName, Object[] paramValue) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             Query queryObject = entityManager.createQuery(hql);
             for (int i = 0; i < paramName.length; i++) {
                 if (paramValue[i] != null) {
@@ -987,7 +987,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List findBySqlPage(String sql, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             return entityManager.createNativeQuery(sql)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
@@ -999,7 +999,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             return entityManager.createNativeQuery(sql,entity)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())
@@ -1112,7 +1112,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<T> findColumnsByHql(String hql, String hqlWhere, String orderByStuff, Pager pager) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             StringBuffer queryString = new StringBuffer();
 
             queryString.append(hql + " as model where 1=1 ");
@@ -1151,7 +1151,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findByHqlPageObjects(String hql, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             return entityManager.createQuery(hql).setFirstResult(pager.getStartRow()).setMaxResults(pager.getPageSize()).getResultList();
         }else{
             return new ArrayList<Object[]>();
@@ -1160,7 +1160,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findByHqlPageObjects(String hql, Pager pager, String[] paramName, Object[] paramValue) {
-        if(pager.getTotalRows() > 0) {
+        if(pager != null) {
             Query queryObject = entityManager.createQuery(hql);
             for (int i = 0; i < paramName.length; i++) {
                 if (paramValue[i] != null) {
@@ -1181,7 +1181,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
 
     @Override
     public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
-        if(pager.getTotalRows() > 0){
+        if(pager != null){
             return entityManager.createNativeQuery(sql)
                     .setFirstResult(pager.getStartRow())
                     .setMaxResults(pager.getPageSize())