ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pre Merge pull request !203 from weiwsy/master

This commit is contained in:
weiwsy 2020-09-22 09:30:51 +08:00 committed by Gitee
parent ffb2d2bc87 1f0d4abee1
commit feb65f4d10
4 changed files with 428 additions and 415 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
View File

@ -52,11 +52,21 @@ public class Constants
*/ */
public static final String PAGE_NUM = "pageNum"; public static final String PAGE_NUM = "pageNum";
/**
* 当前记录起始索引默认值
*/
public static final int PAGE_NUM_DEFAULT_VALUE = 1;
/** /**
* 每页显示记录数 * 每页显示记录数
*/ */
public static final String PAGE_SIZE = "pageSize"; public static final String PAGE_SIZE = "pageSize";
/**
* 每页显示记录数默认值
*/
public static final int PAGE_SIZE_DEFAULT_VALUE = 10;
/** /**
* 排序列 * 排序列
*/ */

7
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
View File

@ -56,11 +56,8 @@ public class BaseController
PageDomain pageDomain = TableSupport.buildPageRequest(); PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum(); Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize(); Integer pageSize = pageDomain.getPageSize();
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
{ PageHelper.startPage(pageNum, pageSize, orderBy);
String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.startPage(pageNum, pageSize, orderBy);
}
} }
/** /**

4
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
View File

@ -16,8 +16,8 @@ public class TableSupport
public static PageDomain getPageDomain() public static PageDomain getPageDomain()
{ {
PageDomain pageDomain = new PageDomain(); PageDomain pageDomain = new PageDomain();
pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGE_NUM)); pageDomain.setPageNum(ServletUtils.getParameterToInt(Constants.PAGE_NUM, Constants.PAGE_NUM_DEFAULT_VALUE));
pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE)); pageDomain.setPageSize(ServletUtils.getParameterToInt(Constants.PAGE_SIZE, Constants.PAGE_SIZE_DEFAULT_VALUE));
pageDomain.setOrderByColumn(ServletUtils.getParameter(Constants.ORDER_BY_COLUMN)); pageDomain.setOrderByColumn(ServletUtils.getParameter(Constants.ORDER_BY_COLUMN));
pageDomain.setIsAsc(ServletUtils.getParameter(Constants.IS_ASC)); pageDomain.setIsAsc(ServletUtils.getParameter(Constants.IS_ASC));
return pageDomain; return pageDomain;

6
ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
View File

@ -374,6 +374,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
} }
if (s.indexOf(SEPARATOR) == -1) if (s.indexOf(SEPARATOR) == -1)
{ {
if (s.length()>0 && Character.isUpperCase(s.charAt(0))) {
StringBuilder sb = new StringBuilder(s.length());
sb.append(Character.toLowerCase(s.charAt(0)));
sb.append(s.substring(1));
return sb.toString();
}
return s; return s;
} }
s = s.toLowerCase(); s = s.toLowerCase();