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

Pre Merge pull request !208 from 瘦八爷/master

This commit is contained in:
瘦八爷 2020-09-09 10:22:54 +08:00 committed by Gitee
parent 7b3517f699 33f6b709a5
commit 1f48a60623
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@ -35,7 +35,7 @@ public class SysIndexController extends BaseController
private ISysConfigService configService; private ISysConfigService configService;
// 系统首页 // 系统首页
@GetMapping("/index") @GetMapping({"/index","/"})
public String index(ModelMap mmap) public String index(ModelMap mmap)
{ {
// 取身份信息 // 取身份信息

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;
/** /**
* 排序列 * 排序列
*/ */

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

@ -56,12 +56,9 @@ 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()); String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
PageHelper.startPage(pageNum, pageSize, orderBy); 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;