From a6f7c32c2817ce6714289a2c96b75b82d1599784 Mon Sep 17 00:00:00 2001
From: zhuangqian <smallchill@163.com>
Date: Thu, 8 Sep 2016 13:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Db=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/smallchill/core/plugins/dao/Db.java   | 87 ++++++++-----------
 1 file changed, 38 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/smallchill/core/plugins/dao/Db.java b/src/main/java/com/smallchill/core/plugins/dao/Db.java
index 13a8a1d4..39dc7631 100644
--- a/src/main/java/com/smallchill/core/plugins/dao/Db.java
+++ b/src/main/java/com/smallchill/core/plugins/dao/Db.java
@@ -79,7 +79,7 @@ public class Db {
 	 * @return
 	 */
 	public int insert(String sqlTemplate, Object modelOrMap){
-		return getSqlManager().executeUpdate(sqlTemplate, modelOrMap);
+		return executeUpdate(sqlTemplate, modelOrMap);
 	}
 	
 	/**
@@ -89,7 +89,7 @@ public class Db {
 	 * @return
 	 */
 	public int update(String sqlTemplate, Object modelOrMap){
-		return getSqlManager().executeUpdate(sqlTemplate, modelOrMap);
+		return executeUpdate(sqlTemplate, modelOrMap);
 	}
 	
 	/**
@@ -99,6 +99,16 @@ public class Db {
 	 * @return
 	 */
 	public int delete(String sqlTemplate, Object modelOrMap){
+		return executeUpdate(sqlTemplate, modelOrMap);
+	}
+	
+	/**
+	 * 执行sql语句
+	 * @param sqlTemplate	sql语句
+	 * @param modelOrMap	实体类或map
+	 * @return
+	 */
+	private int executeUpdate(String sqlTemplate, Object modelOrMap){
 		return getSqlManager().executeUpdate(sqlTemplate, modelOrMap);
 	}
 	
@@ -121,6 +131,21 @@ public class Db {
 		return queryMap(sqlTemplate, modelOrMap);
 	}
 	
+	/**
+	 * 获取一条数据
+	 * @param sqlTemplate	sql语句
+	 * @param modelOrMap	实体类或map
+	 * @return
+	 */
+	private Map queryMap(String sqlTemplate, Object modelOrMap){
+		List<Map> list = getSqlManager().execute(sqlTemplate, Map.class, modelOrMap, 1, 1);
+		if(list.size() == 0){
+			return null;
+		} else {
+			return list.get(0);
+		}
+	}	
+	
 	/**
 	 * 获取一条数据
 	 * @param sqlTemplate	sql语句
@@ -140,6 +165,17 @@ public class Db {
 		return queryListMap(sqlTemplate, modelOrMap);
 	}
 	
+	/**
+	 * 获取多条数据
+	 * @param sqlTemplate	sql语句
+	 * @param modelOrMap	实体类或map
+	 * @return
+	 */
+	private List<Map> queryListMap(String sqlTemplate, Object modelOrMap){
+		List<Map> list = getSqlManager().execute(sqlTemplate, Map.class, modelOrMap);
+		return list;
+	}
+	
 	/**
 	 * 根据表名、主键获取一条数据
 	 * @param tableName	表名
@@ -237,32 +273,6 @@ public class Db {
 		return list;
 	}
 	
-	/**
-	 * 获取map
-	 * @param sqlTemplate	sql语句
-	 * @param modelOrMap	实体类或map
-	 * @return
-	 */
-	public Map queryMap(String sqlTemplate, Object modelOrMap){
-		List<Map> list = getSqlManager().execute(sqlTemplate, Map.class, modelOrMap, 1, 1);
-		if(list.size() == 0){
-			return null;
-		} else {
-			return list.get(0);
-		}
-	}	
-	
-	/**
-	 * 获取map集合
-	 * @param sqlTemplate	sql语句
-	 * @param modelOrMap	实体类或map
-	 * @return
-	 */
-	public List<Map> queryListMap(String sqlTemplate, Object modelOrMap){
-		List<Map> list = getSqlManager().execute(sqlTemplate, Map.class, modelOrMap);
-		return list;
-	}
-	
 	/** 查询aop返回单条数据
 	 * @param sqlTemplate
 	 * @param modelOrMap
@@ -331,27 +341,6 @@ public class Db {
 	
 	/************   ↑↑↑   ********     通用     *********   ↑↑↑   ****************/
 	
-	
-	/**
-	 * 新增一条数据
-	 * @param rd		rd
-	 * @return
-	 */
-	public int save(String tableName, Record rd){
-		return save(tableName, "ID", rd);
-	}
-	
-	/**
-	 * 修改一条数据
-	 * @param tableName	表名
-	 * @param pk		主键名
-	 * @param rd		msps
-	 * @return
-	 */
-	public int update(String tableName, Record rd){
-		return update(tableName, "ID", rd);
-	}
-	
 	/**
 	 * 新增一条数据
 	 * @param tableName	表名