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

分页优化

This commit is contained in:
RuoYi 2018-03-05 17:07:46 +08:00
parent 84397ee181
commit b0bfc1df22
22 changed files with 66 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/new_intall_20180304.sql → doc/new_intall_20180305.sql
View File

@ -112,7 +112,7 @@ insert into sys_menu values('6', '部门管理', '1', '3', '/system/dept',
insert into sys_menu values('7', '操作日志', '2', '1', '/monitor/operlog', 'C', '0', 'monitor:operlog:view', '#', '2018-03-01', '', 'admin', '操作日志菜单');
insert into sys_menu values('8', '登录日志', '2', '2', '/monitor/logininfor', 'C', '0', 'monitor:logininfor:view', '#', '2018-03-01', '', 'admin', '登录日志菜单');
insert into sys_menu values('9', '在线用户', '2', '3', '/monitor/online', 'C', '0', 'monitor:online:view', '#', '2018-03-01', '', 'admin', '在线用户菜单');
insert into sys_menu values('10', '数据监控', '2', '4', '/monitor/data', 'C', '0', 'monitor:data:xxxx', '#', '2018-03-01', '', 'admin', '数据监控菜单');
insert into sys_menu values('10', '数据监控', '2', '4', '/monitor/data', 'C', '0', 'monitor:data:view', '#', '2018-03-01', '', 'admin', '数据监控菜单');
-- 部门管理按钮
insert into sys_menu values('11', '部门新增', '6', '1', '/system/dept/add', 'F', '0', 'system:dept:add', '#', '2018-03-01', '', 'admin', '');
insert into sys_menu values('12', '部门修改', '6', '2', '/system/dept/edit', 'F', '0', 'system:dept:edit', '#', '2018-03-01', '', 'admin', '');

20
src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java
View File

@ -1,12 +1,17 @@
package com.ruoyi.framework.web.dao;
import java.util.List;
import javax.annotation.Resource;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
import org.mybatis.spring.SqlSessionTemplate;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
/**
* 数据DAO层通用数据处理
*
@ -179,6 +184,21 @@ public class DynamicObjectBaseDao
return sqlSessionTemplate.selectList(str, obj);
}
/**
* 自定义分页方法
*
* @param str mapper 节点
* @param obj 对象
* @return 结果
* @throws Exception
*/
public TableDataInfo findForList(String str, PageUtilEntity pageUtilEntity)
{
List<?> pageList = sqlSessionTemplate.selectList(str, pageUtilEntity);
TableDataInfo tableDataInfo = new TableDataInfo(pageList, pageUtilEntity.getTotalResult());
return tableDataInfo;
}
public Object findForMap(String str, Object obj, String key, String value) throws Exception
{
return sqlSessionTemplate.selectMap(str, obj, key);

8
src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java
View File

@ -1,7 +1,5 @@
package com.ruoyi.project.monitor.logininfor.controller;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -13,9 +11,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.JSON;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
import com.ruoyi.project.monitor.logininfor.service.ILogininforService;
/**
@ -44,9 +40,7 @@ public class LogininforController extends BaseController
@ResponseBody
public TableDataInfo list()
{
PageUtilEntity pageUtilEntity = this.getPageUtilEntity();
List<Logininfor> list = logininforService.pageInfoQueryLogininfor(pageUtilEntity);
TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult());
TableDataInfo tableDataInfo = logininforService.pageInfoQueryLogininfor(getPageUtilEntity());
return tableDataInfo;
}

4
src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.logininfor.dao;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
/**
@ -24,7 +24,7 @@ public interface ILogininforDao
* @param pageUtilEntity 分页参数
* @return 登录记录集合
*/
public List<Logininfor> pageInfoQuery(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity);
/**
* 批量删除系统登录日志

15
src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.project.monitor.logininfor.dao;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.ruoyi.framework.web.dao.DynamicObjectBaseDao;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
/**
@ -32,18 +32,9 @@ public class LogininforDaoImpl extends DynamicObjectBaseDao implements ILogininf
* @return 登录记录集合
*/
@Override
public List<Logininfor> pageInfoQuery(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity)
{
List<Logininfor> logininforList = null;
try
{
logininforList = this.findForList("SystemLogininforMapper.pageInfoQueryLogininfor", pageUtilEntity);
}
catch (Exception e)
{
e.printStackTrace();
}
return logininforList;
return this.findForList("SystemLogininforMapper.pageInfoQueryLogininfor", pageUtilEntity);
}
/**

4
src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.logininfor.service;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
/**
@ -25,7 +25,7 @@ public interface ILogininforService
* @param pageUtilEntity 分页参数
* @return 登录记录集合
*/
public List<Logininfor> pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity);
/**
* 批量删除系统登录日志

4
src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.project.monitor.logininfor.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.logininfor.dao.ILogininforDao;
import com.ruoyi.project.monitor.logininfor.domain.Logininfor;
@ -36,7 +36,7 @@ public class LogininforServiceImpl implements ILogininforService
* @param pageUtilEntity 分页参数
* @return 登录记录集合
*/
public List<Logininfor> pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity)
{
return logininforDao.pageInfoQuery(pageUtilEntity);
}

10
src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java
View File

@ -1,7 +1,5 @@
package com.ruoyi.project.monitor.online.controller;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -11,12 +9,10 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.JSON;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.online.domain.OnlineSession;
import com.ruoyi.project.monitor.online.domain.UserOnline;
@ -51,10 +47,8 @@ public class UserOnlineController extends BaseController
@ResponseBody
public TableDataInfo list()
{
PageUtilEntity pageUtilEntity = this.getPageUtilEntity();
List<UserOnline> list = userOnlineService.pageInfoQueryUserOnline(pageUtilEntity);
TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult());
return tableDataInfo;
TableDataInfo rows = userOnlineService.pageInfoQueryUserOnline(getPageUtilEntity());
return rows;
}
@RequiresPermissions("monitor:online:batchForceLogout")

4
src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.project.monitor.online.dao;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.online.domain.UserOnline;
/**
@ -42,7 +42,7 @@ public interface IUserOnlineDao
* @param pageUtilEntity 分页参数
* @return 会话集合
*/
public List<UserOnline> pageInfoQuery(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity);
/**
* 查询过期会话集合

14
src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import org.springframework.stereotype.Repository;
import com.ruoyi.framework.web.dao.DynamicObjectBaseDao;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.online.domain.UserOnline;
/**
@ -55,18 +56,9 @@ public class UserOnlineDaoImpl extends DynamicObjectBaseDao implements IUserOnli
* @param pageUtilEntity 分页参数
*/
@Override
public List<UserOnline> pageInfoQuery(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity)
{
List<UserOnline> userOnlineList = null;
try
{
userOnlineList = this.findForList("SystemOnlineMapper.pageInfoQueryUserOnline", pageUtilEntity);
}
catch (Exception e)
{
e.printStackTrace();
}
return userOnlineList;
return findForList("SystemOnlineMapper.pageInfoQueryUserOnline", pageUtilEntity);
}
/**

4
src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java
View File

@ -2,8 +2,8 @@ package com.ruoyi.project.monitor.online.service;
import java.util.Date;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.online.domain.UserOnline;
/**
@ -50,7 +50,7 @@ public interface IUserOnlineService
* @param pageUtilEntity 分页参数
* @return 会话集合
*/
public List<UserOnline> pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity);
/**
* 强退用户

5
src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java
View File

@ -2,14 +2,13 @@ package com.ruoyi.project.monitor.online.service;
import java.util.Date;
import java.util.List;
import org.apache.shiro.session.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.framework.shiro.session.OnlineSessionDAO;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.online.dao.IUserOnlineDao;
import com.ruoyi.project.monitor.online.domain.UserOnline;
@ -91,7 +90,7 @@ public class UserOnlineServiceImpl implements IUserOnlineService
* @param pageUtilEntity 分页参数
*/
@Override
public List<UserOnline> pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity)
{
return userOnlineDao.pageInfoQuery(pageUtilEntity);
}

10
src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java
View File

@ -1,7 +1,5 @@
package com.ruoyi.project.monitor.operlog.controller;
import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -12,11 +10,9 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.JSON;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.operlog.domain.OperLog;
import com.ruoyi.project.monitor.operlog.service.IOperLogService;
@ -47,10 +43,8 @@ public class OperlogController extends BaseController
@ResponseBody
public TableDataInfo list()
{
PageUtilEntity pageUtilEntity = this.getPageUtilEntity();
List<OperLog> list = operLogService.pageInfoQueryOperLog(pageUtilEntity);
TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult());
return tableDataInfo;
TableDataInfo rows = operLogService.pageInfoQueryOperLog(getPageUtilEntity());
return rows;
}
@RequiresPermissions("monitor:operlog:batchRemove")

4
src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.operlog.dao;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.operlog.domain.OperLog;
/**
@ -24,7 +24,7 @@ public interface IOperLogDao
* @param pageUtilEntity 分页参数
* @return 操作日志集合
*/
public List<OperLog> pageInfoQuery(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity);
/**
* 批量删除系统操作日志

15
src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.project.monitor.operlog.dao;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.ruoyi.framework.web.dao.DynamicObjectBaseDao;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.operlog.domain.OperLog;
/**
@ -31,18 +31,9 @@ public class OperLogDaoImpl extends DynamicObjectBaseDao implements IOperLogDao
* @param pageUtilEntity 分页参数
* @return 操作日志集合
*/
public List<OperLog> pageInfoQuery(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity)
{
List<OperLog> logininforList = null;
try
{
logininforList = this.findForList("SystemOperLogMapper.pageInfoQueryOperLog", pageUtilEntity);
}
catch (Exception e)
{
e.printStackTrace();
}
return logininforList;
return this.findForList("SystemOperLogMapper.pageInfoQueryOperLog", pageUtilEntity);
}
/**

4
src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.project.monitor.operlog.service;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.operlog.domain.OperLog;
/**
@ -24,7 +24,7 @@ public interface IOperLogService
* @param pageUtilEntity 分页参数
* @return 操作日志集合
*/
public List<OperLog> pageInfoQueryOperLog(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQueryOperLog(PageUtilEntity pageUtilEntity);
/**
* 批量删除系统操作日志

6
src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java
View File

@ -1,11 +1,9 @@
package com.ruoyi.project.monitor.operlog.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.monitor.operlog.dao.IOperLogDao;
import com.ruoyi.project.monitor.operlog.domain.OperLog;
@ -37,7 +35,7 @@ public class OperLogServiceImpl implements IOperLogService
* @param pageUtilEntity 分页参数
* @return 操作日志集合
*/
public List<OperLog> pageInfoQueryOperLog(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQueryOperLog(PageUtilEntity pageUtilEntity)
{
return operLogDao.pageInfoQuery(pageUtilEntity);
}

7
src/main/java/com/ruoyi/project/system/user/controller/UserController.java
View File

@ -32,11 +32,10 @@ public class UserController extends BaseController
@GetMapping("/getUserlist")
@ResponseBody
public TableDataInfo queryUserlist(@RequestParam Map<String, Object> params)
public TableDataInfo queryUserlist()
{
List<User> list = userService.pageInfoQuery(null);
TableDataInfo tableDataInfo = new TableDataInfo(list, 12);
return tableDataInfo;
TableDataInfo rows = userService.pageInfoQuery(getPageUtilEntity());
return rows;
}
@RequiresPermissions("system:user:list")

5
src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java
View File

@ -1,8 +1,7 @@
package com.ruoyi.project.system.user.dao;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.user.domain.User;
/**
@ -19,7 +18,7 @@ public interface IUserDao
* @param pageUtilEntity 分页对象
* @return 用户信息集合信息
*/
public List<User> pageInfoQuery(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity);
/**
* 通过用户名查询用户

17
src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java
View File

@ -1,11 +1,9 @@
package com.ruoyi.project.system.user.dao;
import java.util.List;
import org.springframework.stereotype.Repository;
import com.ruoyi.framework.web.dao.DynamicObjectBaseDao;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.user.domain.User;
/**
@ -24,18 +22,9 @@ public class UserDaoImpl extends DynamicObjectBaseDao implements IUserDao
* @return 用户对象信息
*/
@Override
public List<User> pageInfoQuery(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity)
{
List<User> userPageInfo = null;
try
{
userPageInfo = this.findForList("SystemUserMapper.queryUserListByCond", pageUtilEntity);
}
catch (Exception e)
{
e.printStackTrace();
}
return userPageInfo;
return this.findForList("SystemUserMapper.queryUserListByCond", pageUtilEntity);
}
/**

5
src/main/java/com/ruoyi/project/system/user/service/IUserService.java
View File

@ -1,8 +1,7 @@
package com.ruoyi.project.system.user.service;
import java.util.List;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.user.domain.User;
/**
@ -19,7 +18,7 @@ public interface IUserService
* @param pageUtilEntity 分页对象
* @return 用户信息集合信息
*/
public List<User> pageInfoQuery(PageUtilEntity pageUtilEntity);
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity);
/**
* 通过用户名查询用户

5
src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java
View File

@ -1,10 +1,9 @@
package com.ruoyi.project.system.user.service;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.framework.web.page.PageUtilEntity;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.project.system.user.dao.IUserDao;
import com.ruoyi.project.system.user.domain.User;
@ -28,7 +27,7 @@ public class UserServiceImpl implements IUserService
* @return 用户信息集合信息
*/
@Override
public List<User> pageInfoQuery(PageUtilEntity pageUtilEntity)
public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity)
{
return userDao.pageInfoQuery(pageUtilEntity);
}