update

src/main/java/com/smallchill/core/beetl/tag/DropDownTag.java

@@ -26,6 +26,7 @@ import com.smallchill.common.vo.TreeNode;
 import com.smallchill.core.constant.ConstCache;
 import com.smallchill.core.interfaces.ILoader;
 import com.smallchill.core.plugins.dao.Db;
+import com.smallchill.core.plugins.dao.Md;
 import com.smallchill.core.toolbox.Func;
 import com.smallchill.core.toolbox.kit.CacheKit;
 
@@ -58,7 +59,7 @@ public class DropDownTag extends Tag {
 				sql = "select ID,(case when PID is null then 0 else PID end) PID,NUM,name as TEXT from  TMSP_ROLE";
 			} else if (type.equals("diy")) {
 				type = type + "_" + param.get("source");
-				sql = Db.getSql(param.get("source")); //.getNamespaceSql(param.get("source"));
+				sql = Md.getSql(param.get("source")); //.getNamespaceSql(param.get("source"));
 			}
  
 			final String sqlstr = sql;

src/main/java/com/smallchill/core/beetl/tag/SelectTag.java

@@ -27,6 +27,7 @@ import com.smallchill.core.constant.Cst;
 import com.smallchill.core.interfaces.ILoader;
 import com.smallchill.core.interfaces.IQuery;
 import com.smallchill.core.plugins.dao.Db;
+import com.smallchill.core.plugins.dao.Md;
 import com.smallchill.core.shiro.ShiroKit;
 import com.smallchill.core.toolbox.Func;
 import com.smallchill.core.toolbox.Paras;
@@ -81,7 +82,7 @@ public class SelectTag extends Tag {
 				if(StrKit.notBlank(where)){
 					modelOrMap = JsonKit.parse(where, Map.class);
 				}
-				sql = Db.getSql(param.get("source"));
+				sql = Md.getSql(param.get("source"));
 			}
 
 			if(StrKit.notBlank(inter)) {

src/main/java/com/smallchill/core/controller/ExcelController.java

@@ -22,6 +22,7 @@ import com.smallchill.core.base.controller.BladeController;
 import com.smallchill.core.constant.ConstCache;
 import com.smallchill.core.interfaces.ILoader;
 import com.smallchill.core.plugins.dao.Db;
+import com.smallchill.core.plugins.dao.Md;
 import com.smallchill.core.shiro.ShiroKit;
 import com.smallchill.core.toolbox.Func;
 import com.smallchill.core.toolbox.ajax.AjaxResult;
@@ -45,7 +46,7 @@ public class ExcelController extends BladeController{
 		String[] _colname = colnames.replace("[", "").replace("]", "").split(",");
 		List<Map<String, String>> _colmodel = JsonKit.parse(colmodel, ArrayList.class);
 	
-		String xml_source = Db.getSql(source);
+		String xml_source = Md.getSql(source);
 		String menu_source = getInfoByCode(code, "SOURCE");
 
 		String _source = (StrKit.notBlank(menu_source)) ? menu_source : xml_source;

src/main/java/com/smallchill/core/controller/ZTreeController.java

@@ -15,6 +15,7 @@ import com.smallchill.core.constant.Cst;
 import com.smallchill.core.interfaces.ILoader;
 import com.smallchill.core.interfaces.IQuery;
 import com.smallchill.core.plugins.dao.Db;
+import com.smallchill.core.plugins.dao.Md;
 import com.smallchill.core.toolbox.Func;
 import com.smallchill.core.toolbox.Paras;
 import com.smallchill.core.toolbox.ajax.AjaxResult;
@@ -149,7 +150,7 @@ public class ZTreeController extends BladeController {
 		} else if (type.equals("role")) {
 			sql = "select ID as \"id\",0 as \"pId\",NAME as \"name\",(case when (pId=0 or pId is null) then 'true' else 'false' end) \"open\" from  TFW_ROLE";
 		} else {
-			sql = Db.getSql(source);
+			sql = Md.getSql(source);
 		}
 		return sql;
 	}

src/main/java/com/smallchill/core/plugins/dao/Blade.java

@@ -34,6 +34,9 @@ import com.smallchill.core.toolbox.Func;
 import com.smallchill.core.toolbox.Paras;
 import com.smallchill.core.toolbox.support.BladePage;
 
+/**
+ * beetlsql 自动API封装dao工具
+ */
 @SuppressWarnings({"unchecked","rawtypes"})
 public class Blade {
 	private static Map<Class<?>, Blade> pool = new ConcurrentHashMap<Class<?>, Blade>();

src/main/java/com/smallchill/core/plugins/dao/Db.java

@@ -19,14 +19,15 @@ import java.util.List;
 import java.util.Map;
 
 import org.beetl.sql.core.SQLReady;
-import org.beetl.sql.core.SQLResult;
 
 import com.smallchill.core.aop.AopContext;
 import com.smallchill.core.interfaces.IQuery;
 import com.smallchill.core.toolbox.Paras;
 import com.smallchill.core.toolbox.support.BladePage;
 
-@SuppressWarnings("rawtypes")
+/**
+ * beetlsql Dao工具
+ */
 public class Db {
 
 	private static volatile DbManager dbManager = null;
@@ -46,7 +47,6 @@ public class Db {
 		return dbManager;
 	}
 	
-	
 	/************   ↓↓↓   ********     通用     *********   ↓↓↓   ****************/
 	
 	/**
@@ -102,6 +102,7 @@ public class Db {
 	 * @param sqlTemplate	sql语句
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static Map selectOne(String sqlTemplate){
 		return getDbManager().selectOne(sqlTemplate);
 	}
@@ -112,6 +113,7 @@ public class Db {
 	 * @param paras	实体类或map
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static Map selectOne(String sqlTemplate, Object paras){
 		return getDbManager().selectOne(sqlTemplate, paras);
 	}
@@ -121,6 +123,7 @@ public class Db {
 	 * @param sqlTemplate	sql语句
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static List<Map> selectList(String sqlTemplate){	
 		return getDbManager().selectList(sqlTemplate);
 	}
@@ -131,6 +134,7 @@ public class Db {
 	 * @param paras	实体类或map
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static List<Map> selectList(String sqlTemplate, Object paras){	
 		return getDbManager().selectList(sqlTemplate, paras);
 	}
@@ -141,6 +145,7 @@ public class Db {
 	 * @param pkValue	主键值
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static Map findById(String tableName, String pkValue) {
 		return getDbManager().findById(tableName, pkValue);
 	}
@@ -152,6 +157,7 @@ public class Db {
 	 * @param pkValue	主键值
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static Map findById(String tableName, String pk, String pkValue) {
 		return getDbManager().findById(tableName, pk, pkValue);
 	}
@@ -202,6 +208,7 @@ public class Db {
 	 * @param ac
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static Map selectOne(String sqlTemplate, Map<String, Object> param, AopContext ac) {
 		return getDbManager().selectOne(sqlTemplate, param, ac);
 	}
@@ -212,6 +219,7 @@ public class Db {
 	 * @param ac
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static List<Map> selectList(String sqlTemplate, Map<String, Object> param, AopContext ac) {
 		return getDbManager().selectList(sqlTemplate, param, ac);
 	}
@@ -223,6 +231,7 @@ public class Db {
 	 * @param intercept
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static Map selectOne(String sqlTemplate, Map<String, Object> param, AopContext ac, IQuery intercept) {
 		return getDbManager().selectOne(sqlTemplate, param, ac, intercept);
 	}
@@ -234,6 +243,7 @@ public class Db {
 	 * @param intercept
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static List<Map> selectList(String sqlTemplate, Map<String, Object> param, AopContext ac, IQuery intercept) {
 		return getDbManager().selectList(sqlTemplate, param, ac, intercept);
 	}
@@ -246,6 +256,7 @@ public class Db {
 	 * @param paras
 	 * @return Map
 	*/
+	@SuppressWarnings("rawtypes")
 	public static Map selectOneByCache(String cacheName, String key, String sqlTemplate, Object paras){
 		return getDbManager().selectOneByCache(cacheName, key, sqlTemplate, paras);
 	}
@@ -258,6 +269,7 @@ public class Db {
 	 * @param paras
 	 * @return List<Map>
 	*/
+	@SuppressWarnings("rawtypes")
 	public static List<Map> selectListByCache(String cacheName, String key, String sqlTemplate, Object paras){
 		return getDbManager().selectListByCache(cacheName, key, sqlTemplate, paras);
 	} 
@@ -331,6 +343,7 @@ public class Db {
 	 * @param pageSize	数量
 	 * @return
 	 */
+	@SuppressWarnings("rawtypes")
 	public static BladePage<Map> paginate(String sqlTemplate, Object paras, int pageNum, int pageSize){
 		return getDbManager().paginate(sqlTemplate, paras, pageNum, pageSize);
 	}
@@ -358,23 +371,4 @@ public class Db {
 	public static boolean isExist(String sqlTemplate, Object paras) {
 		return getDbManager().isExist(sqlTemplate, paras);
 	}
-	
-	/**
-	 * 根据sqlId获取beetlsql的sql语句
-	 * @param sqlId
-	 * @return
-	 */
-	public static String getSql(String sqlId) {
-		return getDbManager().getSql(sqlId);
-	}
-	
-	/**
-	 * 根据sqlId获取beetlsql的sql语句
-	 * @param sqlId
-	 * @param paras
-	 * @return
-	 */
-	public static SQLResult getSQLResult(String sqlId, Object paras){
-		return getDbManager().getSQLResult(sqlId, paras);
-	}
 }

src/main/java/com/smallchill/core/plugins/dao/DbManager.java

@@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.beetl.sql.core.SQLManager;
 import org.beetl.sql.core.SQLReady;
-import org.beetl.sql.core.SQLResult;
 
 import com.smallchill.core.aop.AopContext;
 import com.smallchill.core.constant.Cst;
@@ -524,23 +523,4 @@ public class DbManager {
 		}
 		return false;
 	}
-	
-	/**
-	 * 根据sqlId获取beetlsql的sql语句
-	 * @param sqlId
-	 * @return
-	 */
-	public String getSql(String sqlId) {
-		return getSqlManager().getScript(sqlId).getSql();
-	}
-	
-	/**
-	 * 根据sqlId获取beetlsql的sql语句
-	 * @param sqlId
-	 * @param paras
-	 * @return
-	 */
-	public SQLResult getSQLResult(String sqlId, Object paras){
-		return getSqlManager().getSQLResult(sqlId, paras);
-	}
 }

src/main/java/com/smallchill/core/plugins/dao/Md.java

@@ -18,10 +18,14 @@ package com.smallchill.core.plugins.dao;
 import java.math.BigDecimal;
 import java.util.List;
 
+import org.beetl.sql.core.SQLResult;
 import org.beetl.sql.core.db.KeyHolder;
 
 import com.smallchill.core.toolbox.support.BladePage;
 
+/**
+ * beetlsql  MarkDown模式sql管理工具
+ */
 public class Md {
 
 	private static volatile MdManager mdManager = null;
@@ -42,6 +46,18 @@ public class Md {
 	}
 	
 	
+	/************   ↓↓↓   ********    mapper    *********   ↓↓↓   **************/
+	
+	/**
+	 * 获取Mapper
+	 * @param mapperInterface mapper接口类
+	 * @return
+	 */
+	public static <T> T getMapper(Class<T> mapperInterface){
+		return getMdManager().getMapper(mapperInterface);
+	}
+	
+	
 	/************   ↓↓↓   ********     通用     *********   ↓↓↓   ****************/
 	
 	/**
@@ -187,6 +203,15 @@ public class Md {
 		return getMdManager().update(sqlId, paras);
 	}
 	
+	/**批量修改
+	 * @param sqlId sqlId
+	 * @param list 参数
+	 * @return
+	 */
+	public static int[] updateBatch(String sqlId, List<?> list){
+		return getMdManager().updateBatch(sqlId, list);
+	}
+	
 	/**删除
 	 * @param sqlId sqlId
 	 * @param paras 参数
@@ -196,5 +221,24 @@ public class Md {
 		return getMdManager().delete(sqlId, paras);
 	}
 	
+	/**
+	 * 根据sqlId获取beetlsql的sql语句
+	 * @param sqlId
+	 * @return
+	 */
+	public static String getSql(String sqlId) {
+		return getMdManager().getSql(sqlId);
+	}
+	
+	/**
+	 * 根据sqlId获取beetlsql的sql语句
+	 * @param sqlId
+	 * @param paras
+	 * @return
+	 */
+	public static SQLResult getSQLResult(String sqlId, Object paras){
+		return getMdManager().getSQLResult(sqlId, paras);
+	}
+	
 
 }

src/main/java/com/smallchill/core/plugins/dao/MdManager.java

@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.beetl.sql.core.SQLManager;
+import org.beetl.sql.core.SQLResult;
 import org.beetl.sql.core.db.KeyHolder;
 import org.beetl.sql.core.engine.PageQuery;
 
@@ -67,6 +68,18 @@ public class MdManager {
 	}
 	
 	
+	/************   ↓↓↓   ********    mapper    *********   ↓↓↓   **************/
+	
+	/**
+	 * 获取Mapper
+	 * @param mapperInterface mapper接口类
+	 * @return
+	 */
+	public <T> T getMapper(Class<T> mapperInterface){
+		return getSqlManager().getMapper(mapperInterface);
+	}
+	
+	
 	/************   ↓↓↓   ********     通用     *********   ↓↓↓   ****************/
 	
 	/**
@@ -225,6 +238,15 @@ public class MdManager {
 		return getSqlManager().update(sqlId, paras);
 	}
 	
+	/**批量修改
+	 * @param sqlId sqlId
+	 * @param list 参数
+	 * @return
+	 */
+	public int[] updateBatch(String sqlId, List<?> list){
+		return getSqlManager().updateBatch(sqlId, list);
+	}
+	
 	/**删除
 	 * @param sqlId sqlId
 	 * @param paras 参数
@@ -233,4 +255,23 @@ public class MdManager {
 	public int delete(String sqlId, Object paras){
 		return getSqlManager().update(sqlId, paras);
 	}
+	
+	/**
+	 * 根据sqlId获取beetlsql的sql语句
+	 * @param sqlId
+	 * @return
+	 */
+	public String getSql(String sqlId) {
+		return getSqlManager().getScript(sqlId).getSql();
+	}
+	
+	/**
+	 * 根据sqlId获取beetlsql的sql语句
+	 * @param sqlId
+	 * @param paras
+	 * @return
+	 */
+	public SQLResult getSQLResult(String sqlId, Object paras){
+		return getSqlManager().getSQLResult(sqlId, paras);
+	}
 }

src/main/java/com/smallchill/core/shiro/ShiroDbRealm.java

@@ -77,7 +77,7 @@ public class ShiroDbRealm extends AuthorizingRealm {
 		for (String roleId : roleList) {
 			List<Map> permissions = shiroFactory.findPermissionsByRoleId(userId, roleId);
 			if (null != permissions) {
-				for (Map<String, Object> map : permissions) {
+				for (Map map : permissions) {
 					if (!Func.isEmpty(map.get("URL"))) {
 						urlSet.add(Func.toStr(map.get("URL")));
 					}

src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java

@@ -24,6 +24,7 @@ import com.smallchill.core.constant.Const;
 import com.smallchill.core.interfaces.IGrid;
 import com.smallchill.core.interfaces.IQuery;
 import com.smallchill.core.plugins.dao.Db;
+import com.smallchill.core.plugins.dao.Md;
 import com.smallchill.core.toolbox.Func;
 import com.smallchill.core.toolbox.kit.JsonKit;
 import com.smallchill.core.toolbox.kit.StrKit;
@@ -70,7 +71,7 @@ public abstract class BaseGridFactory implements IGrid{
 	}
 	
 	private Object paginateById(String slaveName, Integer page, Integer rows, String sqlId, String para, String sort, String order, IQuery intercept, BladeController ctrl) {	
-		String sqlTemplate = Db.getSql(sqlId);
+		String sqlTemplate = Md.getSql(sqlId);
 		return paginateBySql(slaveName, page, rows, sqlTemplate, para, sort, order, intercept, ctrl);
 	}
 

src/main/java/com/smallchill/platform/controller/NoticeController.java

@@ -22,8 +22,8 @@ import com.smallchill.platform.model.Notice;
 public class NoticeController extends BaseController {
 	private static String CODE = "notice";
 	private static String PERFIX = "TB_TFW_TZGG";
-	private static String DATA_SOURCE = "Notice.data";
+	private static String DATA_SOURCE = "notice.data";
-	private static String LIST_SOURCE = "Notice.list";
+	private static String LIST_SOURCE = "notice.list";
 	private static String BASE_PATH = "/platform/notice/";
 	
 	@RequestMapping(KEY_MAIN)
@@ -85,8 +85,13 @@ public class NoticeController extends BaseController {
 	@RequestMapping(KEY_UPDATE)
 	public AjaxResult update() {
 		Notice notice = mapping(PERFIX, Notice.class);
-		//boolean temp = Blade.create(Notice.class).update(notice);
+		//1.使用mapper
-		boolean temp = Md.update("Notice.update", notice) > 0;
+		//NoticeMapper mapper = Md.getMapper(NoticeMapper.class);
+		//boolean temp = mapper.updateTemplateById(notice) > 0;
+		//2.使用sql模板
+		//boolean temp = Md.update("notice.update", notice) > 0;
+		//3.使用自动生成api
+		boolean temp = Blade.create(Notice.class).update(notice);
 		if (temp) {
 			return success(UPDATE_SUCCESS_MSG);
 		} else {

src/main/java/com/smallchill/platform/mapper/NoticeMapper.java

@@ -0,0 +1,22 @@
+package com.smallchill.platform.mapper;
+
+import java.util.List;
+
+import org.beetl.sql.core.annotatoin.Param;
+import org.beetl.sql.core.annotatoin.Sql;
+import org.beetl.sql.core.annotatoin.SqlStatementType;
+import org.beetl.sql.core.mapper.BaseMapper;
+
+import com.smallchill.platform.model.Notice;
+
+public interface NoticeMapper extends BaseMapper<Notice>{
+
+	public Notice findById(@Param("id") Integer id);
+	
+	@Sql("select * from tb_tfw_tzgg")
+	public List<Notice> selectAll();
+	
+	@Sql(value=" update tb_tfw_tzgg set f_vc_bt = ? where f_it_xl = ? ", type=SqlStatementType.UPDATE)
+	public void updateTitle(String f_vc_bt, int id);
+	
+}

src/main/java/com/smallchill/system/controller/DeptController.java

@@ -34,7 +34,7 @@ import com.smallchill.system.model.Dept;
 @Controller
 @RequestMapping("/dept")
 public class DeptController extends BaseController{
-	private static String LIST_SOURCE = "Dept.list";
+	private static String LIST_SOURCE = "dept.list";
 	private static String BASE_PATH = "/system/dept/";
 	private static String CODE = "dept";
 	private static String PERFIX = "tfw_dept";

src/main/java/com/smallchill/system/controller/DictController.java

@@ -33,7 +33,7 @@ import com.smallchill.system.model.Dict;
 @Controller
 @RequestMapping("/dict")
 public class DictController extends BaseController{
-	private static String LIST_SOURCE = "Dict.list";
+	private static String LIST_SOURCE = "dict.list";
 	private static String BASE_PATH = "/system/dict/";
 	private static String CODE = "dict";
 	private static String PERFIX = "tfw_dict";

src/main/java/com/smallchill/system/controller/MenuController.java

@@ -47,7 +47,7 @@ import com.smallchill.system.service.MenuService;
 @Controller
 @RequestMapping("/menu")
 public class MenuController extends BaseController implements ConstShiro{
-	private static String LIST_SOURCE = "Menu.list";
+	private static String LIST_SOURCE = "menu.list";
 	private static String BASE_PATH = "/system/menu/";
 	private static String CODE = "menu";
 	private static String PERFIX = "TFW_MENU";

src/main/java/com/smallchill/system/controller/RoleController.java

@@ -38,7 +38,7 @@ import com.smallchill.system.service.RoleService;
 @Controller
 @RequestMapping("/role")
 public class RoleController extends BaseController{
-	private static String LIST_SOURCE = "Role.list";
+	private static String LIST_SOURCE = "role.list";
 	private static String BASE_PATH = "/system/role/";
 	private static String CODE = "role";
 	private static String PERFIX = "tfw_role";

src/main/java/com/smallchill/system/controller/UserController.java

@@ -50,7 +50,7 @@ import com.smallchill.system.model.RoleExt;
 @Controller
 @RequestMapping("/user")
 public class UserController extends BaseController implements ConstShiro{
-	private static String LIST_SOURCE = "User.list";
+	private static String LIST_SOURCE = "user.list";
 	private static String BASE_PATH = "/system/user/";
 	private static String CODE = "user";
 	private static String PERFIX = "TFW_USER";

src/main/java/com/smallchill/system/meta/factory/AttachFactory.java

@@ -48,7 +48,7 @@ public class AttachFactory extends MetaManager {
 
 	public Map<String, String> sourceMap() {
 		Map<String, String> sourceMap = new HashMap<>();
-		sourceMap.put(KEY_INDEX, "Attach.sourceList");
+		sourceMap.put(KEY_INDEX, "attach.sourceList");
 		return sourceMap;
 	}
 

src/main/java/com/smallchill/system/meta/factory/GenerateFactory.java

@@ -42,7 +42,7 @@ public class GenerateFactory extends MetaManager {
 
 	public Map<String, String> sourceMap() {
 		Map<String, String> sourceMap = new HashMap<>();
-		sourceMap.put(KEY_INDEX, "Generate.sourceList");
+		sourceMap.put(KEY_INDEX, "generate.sourceList");
 		return sourceMap;
 	}
 

src/main/java/com/smallchill/system/meta/factory/LLogFactory.java

@@ -48,7 +48,7 @@ public class LLogFactory extends MetaManager {
 
 	public Map<String, String> sourceMap() {
 		Map<String, String> sourceMap = new HashMap<>();
-		sourceMap.put(KEY_INDEX, "LLog.sourceList");
+		sourceMap.put(KEY_INDEX, "llog.sourceList");
 		return sourceMap;
 	}
 

src/main/java/com/smallchill/system/meta/factory/OLogFactory.java

@@ -48,7 +48,7 @@ public class OLogFactory extends MetaManager {
 
 	public Map<String, String> sourceMap() {
 		Map<String, String> sourceMap = new HashMap<>();
-		sourceMap.put(KEY_INDEX, "OLog.sourceList");
+		sourceMap.put(KEY_INDEX, "olog.sourceList");
 		return sourceMap;
 	}
 

src/main/java/com/smallchill/system/meta/factory/ParameterFactory.java

@@ -48,7 +48,7 @@ public class ParameterFactory extends MetaManager {
 
 	public Map<String, String> sourceMap() {
 		Map<String, String> sourceMap = new HashMap<>();
-		sourceMap.put(KEY_INDEX, "Parameter.sourceList");
+		sourceMap.put(KEY_INDEX, "parameter.sourceList");
 		return sourceMap;
 	}
 

src/main/resources/beetlsql/Notice.md

@@ -39,6 +39,10 @@ update
 	 @}
  where f_it_xl = #{f_it_xl}
 
+findById
+===
+select * from tb_tfw_tzgg where f_it_xl = #{id}
+
 
 diy
 ===