diff --git a/build.gradle b/build.gradle index b106ce8..4177171 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ uploadArchives { authentication(userName: NEXUS_USERNAME, password: NEXUS_PASSWORD) } pom.project { - version '2.1.1' + version '2.1.2' artifactId ARTIFACT_Id groupId GROUP_ID packaging TYPE diff --git a/src/main/java/com/taover/repository/CustomJdbcTemplate.java b/src/main/java/com/taover/repository/CustomJdbcTemplate.java index a470420..d281f5f 100644 --- a/src/main/java/com/taover/repository/CustomJdbcTemplate.java +++ b/src/main/java/com/taover/repository/CustomJdbcTemplate.java @@ -371,14 +371,8 @@ public class CustomJdbcTemplate { String pageSql = sql.toString() + " limit ?, ?"; Map totalRowsMap = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).queryForMap(sqlCount.toString(), count_list.toArray()) ; - - Map resultMap = new HashMap(); - resultMap.put("page", page); - resultMap.put("total", totalRowsMap.get("rowCount")); - List resultList = null; - resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), this.customJdbcTemplateRowMapper, page_list.toArray()); - resultMap.put("rows", resultList); - return resultMap; + List resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), this.customJdbcTemplateRowMapper, page_list.toArray()); + return UtilsSql.createPage(page, pageSize, Integer.valueOf(totalRowsMap.get("rowCount").toString()), resultList); } /** @@ -401,14 +395,8 @@ public class CustomJdbcTemplate { page_list.add(page * pageSize); Map totalRowsMap = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).queryForMap(sqlCount.toString()); - - Map resultMap = new HashMap(); - resultMap.put("page", page); - resultMap.put("total", totalRowsMap.get("rowCount")); - List resultList = null; - resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), this.customJdbcTemplateRowMapper, page_list.toArray()); - resultMap.put("rows", resultList); - return resultMap; + List resultList =(fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), this.customJdbcTemplateRowMapper, page_list.toArray()); + return UtilsSql.createPage(page, pageSize, Integer.valueOf(totalRowsMap.get("rowCount").toString()), resultList); } /** @@ -624,7 +612,7 @@ public class CustomJdbcTemplate { Map countData = new HashMap(); queryData = this.jdbcTemplateRead.queryForList(querySql); countData = this.jdbcTemplateRead.queryForMap(countSql); - return UtilsSql.createPage(page, Integer.valueOf(countData.get("rows").toString()), queryData); + return UtilsSql.createPage(page, pageSize, Integer.valueOf(countData.get("rows").toString()), queryData); } public Map getBeanPageData(String coreSql, String orderByPartSql, Integer page, Integer pageSize, Class beanClass){ @@ -639,7 +627,7 @@ public class CustomJdbcTemplate { Map countData = new HashMap(); queryData = this.jdbcTemplateRead.queryForList(querySql, beanClass); countData = this.jdbcTemplateRead.queryForMap(countSql); - return UtilsSql.createPage(page, Integer.valueOf(countData.get("rows").toString()), queryData); + return UtilsSql.createPage(page, pageSize, Integer.valueOf(countData.get("rows").toString()), queryData); } /** @@ -781,14 +769,8 @@ public class CustomJdbcTemplate { String pageSql = sql.toString() + " limit ?, ?"; Map totalRowsMap = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).queryForMap(sqlCount.toString(), count_list.toArray()) ; - - Map resultMap = new HashMap(); - resultMap.put("page", page); - resultMap.put("total", totalRowsMap.get("rowCount")); - List resultList = null; - resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), new CustomJdbcTemplateRowMapper(beanClass, this.tableToBeanField), page_list.toArray()); - resultMap.put("rows", resultList); - return resultMap; + List resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), new CustomJdbcTemplateRowMapper(beanClass, this.tableToBeanField), page_list.toArray()); + return UtilsSql.createPage(page, pageSize, Integer.valueOf(totalRowsMap.get("rowCount").toString()), resultList); } /** @@ -811,13 +793,7 @@ public class CustomJdbcTemplate { page_list.add(page * pageSize); Map totalRowsMap = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).queryForMap(sqlCount.toString()); - - Map resultMap = new HashMap(); - resultMap.put("page", page); - resultMap.put("total", totalRowsMap.get("rowCount")); - List resultList = null; - resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), new CustomJdbcTemplateRowMapper(beanClass, this.tableToBeanField), page_list.toArray()); - resultMap.put("rows", resultList); - return resultMap; + List resultList = (fromWriteDB ? jdbcTemplateWrite : jdbcTemplateRead).query(pageSql.toString(), new CustomJdbcTemplateRowMapper(beanClass, this.tableToBeanField), page_list.toArray()); + return UtilsSql.createPage(page, pageSize, Integer.valueOf(totalRowsMap.get("rowCount").toString()), resultList); } } diff --git a/src/main/java/com/taover/repository/UtilsSql.java b/src/main/java/com/taover/repository/UtilsSql.java index 7accb8c..3e618a5 100644 --- a/src/main/java/com/taover/repository/UtilsSql.java +++ b/src/main/java/com/taover/repository/UtilsSql.java @@ -76,11 +76,12 @@ public class UtilsSql { * @param data * @return */ - public static Map createPage(int page, int rows, Object data){ + public static Map createPage(int page, int size, int total, Object data){ Map pageData = new HashMap(); pageData.put("page", page); - pageData.put("rows", rows); - pageData.put("data", data); + pageData.put("rows", data); + pageData.put("size", size); + pageData.put("total", total); return pageData; } } -- libgit2 0.21.2