github/SpringBlade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

变量重命名

Browse Source
This commit is contained in:
zhuangqian 2016-12-03 08:45:39 +08:00
parent 2b6fbb332b
commit 7e155ddd21
7 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/main/java/com/smallchill/core/base/controller/BladeController.java
View File

@ -292,7 +292,14 @@ public class BladeController {
/** ============================ paginate ================================================= */
private Object basepage(String slaveName, String source, IQuery intercept){
/**
* 分页
* @param dbName 数据库别名
* @param source 数据源
* @param intercept 分页拦截器
* @return Object
*/
private Object basepage(String dbName, String source, IQuery intercept){
Integer page = getParameterToInt("page", 1);
Integer rows = getParameterToInt("rows", 10);
String where = getParameter("where", StrKit.EMPTY);
@ -304,44 +311,52 @@ public class BladeController {
sort = sidx + " " + sord
+ (StrKit.notBlank(sort) ? ("," + sort) : StrKit.EMPTY);
}
Object grid = GridManager.paginate(slaveName, page, rows, source, where, sort, order, intercept, this);
Object grid = GridManager.paginate(dbName, page, rows, source, where, sort, order, intercept, this);
return grid;
}
/**
* @param 数据源
* @return
*/
/**
* 分页
* @param source 数据源
* @return Object
*/
protected Object paginate(String source){
return basepage(null, source, null);
}
/**
* @param 数据源
* @param 自定义拦截器
* @return
*/
/**
* 分页
* @param source 数据源
* @param intercept 分页拦截器
* @return Object
*/
protected Object paginate(String source, IQuery intercept){
return basepage(null, source, intercept);
}
/**
* @param 数据库别名
* @param 数据源
* @return
*/
protected Object paginate(String slaveName, String source){
return basepage(slaveName, source, null);
/**
* 分页
* @param dbName 数据库别名
* @param source 数据源
* @return Object
*/
protected Object paginate(String dbName, String source){
return basepage(dbName, source, null);
}
/**
* @param 数据库别名
* @param 数据源
* @param 自定义拦截器
* @return
*/
protected Object paginate(String slaveName, String source, IQuery intercept){
return basepage(slaveName, source, intercept);
/**
* 分页
* @param dbName 数据库别名
* @param source 数据源
* @param intercept 分页拦截器
* @return Object
*/
protected Object paginate(String dbName, String source, IQuery intercept){
return basepage(dbName, source, intercept);
}

4
src/main/java/com/smallchill/core/interfaces/IGrid.java
View File

@ -24,7 +24,7 @@ public interface IGrid {
/**
* 封装grid返回数据类型
*
* @param slaveName
* @param dbName
* 数据库别名
* @param page
* 当前页号
@ -44,5 +44,5 @@ public interface IGrid {
* 控制器
* @return String
*/
Object paginate(String slaveName, Integer page, Integer rows, String source, String para, String sort, String order, IQuery intercept, BladeController ctrl);
Object paginate(String dbName, Integer page, Integer rows, String source, String para, String sort, String order, IQuery intercept, BladeController ctrl);
}

18
src/main/java/com/smallchill/core/toolbox/grid/BaseGridFactory.java
View File

@ -38,7 +38,7 @@ public abstract class BaseGridFactory implements IGrid{
/**
* 封装grid返回数据类型
*
* @param slaveName
* @param dbName
* 数据库别名
* @param page
* 当前页号
@ -58,20 +58,20 @@ public abstract class BaseGridFactory implements IGrid{
* 控制器
* @return Object
*/
protected Object basePaginate(String slaveName, Integer page, Integer rows, String source, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
protected Object basePaginate(String dbName, Integer page, Integer rows, String source, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
if (source.toLowerCase().indexOf("select") == -1) {
return paginateById(slaveName, page, rows, source, para, sort, order, intercept, ctrl);
return paginateById(dbName, page, rows, source, para, sort, order, intercept, ctrl);
} else {
return paginateBySql(slaveName, page, rows, source, para, sort, order, intercept, ctrl);
return paginateBySql(dbName, page, rows, source, para, sort, order, intercept, ctrl);
}
}
private Object paginateById(String slaveName, Integer page, Integer rows, String sqlId, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
private Object paginateById(String dbName, Integer page, Integer rows, String sqlId, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
String sqlTemplate = Md.getSql(sqlId);
return paginateBySql(slaveName, page, rows, sqlTemplate, para, sort, order, intercept, ctrl);
return paginateBySql(dbName, page, rows, sqlTemplate, para, sort, order, intercept, ctrl);
}
private Object paginateBySql(String slaveName, Integer page, Integer rows, String sqlTemplate, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
private Object paginateBySql(String dbName, Integer page, Integer rows, String sqlTemplate, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
String sqlex = SqlKeyword.getWhere(para);
Map<String, Object> map = getSqlMap(para, sort, order);
String statement = "select * from (" + sqlTemplate + ") blade_statement";
@ -91,8 +91,8 @@ public abstract class BaseGridFactory implements IGrid{
Object list = null;
String orderBy = (Func.isEmpty(map.get(Const.ORDER_BY_STR))) ? " " : (" order by " + Func.toStr(map.get(Const.ORDER_BY_STR)));
if(StrKit.notBlank(slaveName)){
list = Db.init(slaveName).paginate(statement + orderBy, Map.class, map, page, rows);
if(StrKit.notBlank(dbName)){
list = Db.init(dbName).paginate(statement + orderBy, Map.class, map, page, rows);
} else {
list = Db.paginate(statement + orderBy, Map.class, map, page, rows);
}

4
src/main/java/com/smallchill/core/toolbox/grid/EasyGridFactory.java
View File

@ -9,11 +9,11 @@ import com.smallchill.core.interfaces.IQuery;
@SuppressWarnings("unchecked")
public class EasyGridFactory extends BaseGridFactory{
public EasyGrid<Map<String, Object>> paginate(String slaveName, Integer page, Integer rows,
public EasyGrid<Map<String, Object>> paginate(String dbName, Integer page, Integer rows,
String source, String para, String sort, String order,
IQuery intercept, BladeController ctrl) {
BladePage<Map<String, Object>> list = (BladePage<Map<String, Object>>) super.basePaginate(slaveName, page, rows, source, para, sort, order, intercept, ctrl);
BladePage<Map<String, Object>> list = (BladePage<Map<String, Object>>) super.basePaginate(dbName, page, rows, source, para, sort, order, intercept, ctrl);
List<Map<String, Object>> _rows = list.getRows();
long _total = list.getTotal();

4
src/main/java/com/smallchill/core/toolbox/grid/GridManager.java
View File

@ -35,8 +35,8 @@ public class GridManager {
this.defaultGridFactory = defaultGridFactory;
}
public static Object paginate(String slaveName, Integer page, Integer rows, String source, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
return me.defaultGridFactory.paginate(slaveName, page, rows, source, para, sort, order, intercept, ctrl);
public static Object paginate(String dbName, Integer page, Integer rows, String source, String para, String sort, String order, IQuery intercept, BladeController ctrl) {
return me.defaultGridFactory.paginate(dbName, page, rows, source, para, sort, order, intercept, ctrl);
}
}

4
src/main/java/com/smallchill/core/toolbox/grid/JqGridFactory.java
View File

@ -24,11 +24,11 @@ import com.smallchill.core.interfaces.IQuery;
@SuppressWarnings("unchecked")
public class JqGridFactory extends BaseGridFactory {
public JqGrid<Map<String, Object>> paginate(String slaveName, Integer page, Integer rows,
public JqGrid<Map<String, Object>> paginate(String dbName, Integer page, Integer rows,
String source, String para, String sort, String order,
IQuery intercept, BladeController ctrl) {
BladePage<Map<String, Object>> list = (BladePage<Map<String, Object>>) super.basePaginate(slaveName, page, rows, source, para, sort, order, intercept, ctrl);
BladePage<Map<String, Object>> list = (BladePage<Map<String, Object>>) super.basePaginate(dbName, page, rows, source, para, sort, order, intercept, ctrl);
List<Map<String, Object>> _rows = list.getRows();
long _total = list.getTotal();

4
src/main/java/com/smallchill/core/toolbox/grid/LigerGridFactory.java
View File

@ -24,10 +24,10 @@ import com.smallchill.core.interfaces.IQuery;
@SuppressWarnings("unchecked")
public class LigerGridFactory extends BaseGridFactory {
public LigerGrid<Map<String, Object>> paginate(String slaveName, Integer page, Integer rows,
public LigerGrid<Map<String, Object>> paginate(String dbName, Integer page, Integer rows,
String source, String para, String sort, String order,
IQuery intercept, BladeController ctrl) {
BladePage<Map<String, Object>> list = (BladePage<Map<String, Object>>) super.basePaginate(slaveName, page, rows, source, para, sort, order, intercept, ctrl);
BladePage<Map<String, Object>> list = (BladePage<Map<String, Object>>) super.basePaginate(dbName, page, rows, source, para, sort, order, intercept, ctrl);
int _pageNum = (int) list.getPage();
int _pageSize = (int) list.getPageSize();