From b0bfc1df2283f27c993086a45d16a46c98516770 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 5 Mar 2018 17:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...l_20180304.sql => new_intall_20180305.sql} | 2 +- .../web/dao/DynamicObjectBaseDao.java | 20 +++++++++++++++++++ .../controller/LogininforController.java | 8 +------- .../logininfor/dao/ILogininforDao.java | 4 ++-- .../logininfor/dao/LogininforDaoImpl.java | 15 +++----------- .../service/ILogininforService.java | 4 ++-- .../service/LogininforServiceImpl.java | 4 ++-- .../controller/UserOnlineController.java | 10 ++-------- .../monitor/online/dao/IUserOnlineDao.java | 4 ++-- .../monitor/online/dao/UserOnlineDaoImpl.java | 14 +++---------- .../online/service/IUserOnlineService.java | 4 ++-- .../online/service/UserOnlineServiceImpl.java | 5 ++--- .../operlog/controller/OperlogController.java | 10 ++-------- .../monitor/operlog/dao/IOperLogDao.java | 4 ++-- .../monitor/operlog/dao/OperLogDaoImpl.java | 17 ++++------------ .../operlog/service/IOperLogService.java | 4 ++-- .../operlog/service/OperLogServiceImpl.java | 6 ++---- .../user/controller/UserController.java | 7 +++---- .../project/system/user/dao/IUserDao.java | 5 ++--- .../project/system/user/dao/UserDaoImpl.java | 17 +++------------- .../system/user/service/IUserService.java | 5 ++--- .../system/user/service/UserServiceImpl.java | 5 ++--- 22 files changed, 66 insertions(+), 108 deletions(-) rename doc/{new_intall_20180304.sql => new_intall_20180305.sql} (97%) diff --git a/doc/new_intall_20180304.sql b/doc/new_intall_20180305.sql similarity index 97% rename from doc/new_intall_20180304.sql rename to doc/new_intall_20180305.sql index 4b26e4ef0..984f512dd 100644 --- a/doc/new_intall_20180304.sql +++ b/doc/new_intall_20180305.sql @@ -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', ''); diff --git a/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java b/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java index 8a4f75914..e7f4b2a5c 100644 --- a/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java +++ b/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java @@ -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层通用数据处理 * @@ -178,6 +183,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 { diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java b/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java index 78e18c49c..d14e7a34a 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/controller/LogininforController.java @@ -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 list = logininforService.pageInfoQueryLogininfor(pageUtilEntity); - TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult()); + TableDataInfo tableDataInfo = logininforService.pageInfoQueryLogininfor(getPageUtilEntity()); return tableDataInfo; } diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java index 0c183b3f0..e86c8abad 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/ILogininforDao.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity); /** * 批量删除系统登录日志 diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java index 0ed0db538..8e12da2c2 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/dao/LogininforDaoImpl.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity) { - List logininforList = null; - try - { - logininforList = this.findForList("SystemLogininforMapper.pageInfoQueryLogininfor", pageUtilEntity); - } - catch (Exception e) - { - e.printStackTrace(); - } - return logininforList; + return this.findForList("SystemLogininforMapper.pageInfoQueryLogininfor", pageUtilEntity); } /** diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java index feb68f2ce..bf843177d 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/ILogininforService.java @@ -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 pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity); /** * 批量删除系统登录日志 diff --git a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java index a5f2f8893..5c67ce98c 100644 --- a/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/logininfor/service/LogininforServiceImpl.java @@ -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 pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity) { return logininforDao.pageInfoQuery(pageUtilEntity); } diff --git a/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java index 39a05ca38..819e0b2bb 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java +++ b/src/main/java/com/ruoyi/project/monitor/online/controller/UserOnlineController.java @@ -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 list = userOnlineService.pageInfoQueryUserOnline(pageUtilEntity); - TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult()); - return tableDataInfo; + TableDataInfo rows = userOnlineService.pageInfoQueryUserOnline(getPageUtilEntity()); + return rows; } @RequiresPermissions("monitor:online:batchForceLogout") diff --git a/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java b/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java index ec8c9715f..5c5502fc2 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java +++ b/src/main/java/com/ruoyi/project/monitor/online/dao/IUserOnlineDao.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity); /** * 查询过期会话集合 diff --git a/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java index 5b34f9f57..479a33d6e 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/online/dao/UserOnlineDaoImpl.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity) { - List userOnlineList = null; - try - { - userOnlineList = this.findForList("SystemOnlineMapper.pageInfoQueryUserOnline", pageUtilEntity); - } - catch (Exception e) - { - e.printStackTrace(); - } - return userOnlineList; + return findForList("SystemOnlineMapper.pageInfoQueryUserOnline", pageUtilEntity); } /** diff --git a/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java b/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java index 51b43db89..48090663d 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java +++ b/src/main/java/com/ruoyi/project/monitor/online/service/IUserOnlineService.java @@ -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 pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity); /** * 强退用户 diff --git a/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java index 08063688d..e5b475cf7 100644 --- a/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/online/service/UserOnlineServiceImpl.java @@ -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 pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity) { return userOnlineDao.pageInfoQuery(pageUtilEntity); } diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java b/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java index fb97abbe1..49a347b62 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java @@ -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 list = operLogService.pageInfoQueryOperLog(pageUtilEntity); - TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult()); - return tableDataInfo; + TableDataInfo rows = operLogService.pageInfoQueryOperLog(getPageUtilEntity()); + return rows; } @RequiresPermissions("monitor:operlog:batchRemove") diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java b/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java index 09608867a..86bffb053 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/dao/IOperLogDao.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity); /** * 批量删除系统操作日志 diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java b/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java index 243f1ee6f..6e89d5b15 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/dao/OperLogDaoImpl.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity) { - List logininforList = null; - try - { - logininforList = this.findForList("SystemOperLogMapper.pageInfoQueryOperLog", pageUtilEntity); - } - catch (Exception e) - { - e.printStackTrace(); - } - return logininforList; + return this.findForList("SystemOperLogMapper.pageInfoQueryOperLog", pageUtilEntity); } /** @@ -64,7 +55,7 @@ public class OperLogDaoImpl extends DynamicObjectBaseDao implements IOperLogDao } return rows; } - + /** * 查询操作日志详细 * diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java b/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java index 0f8a38cbc..4ab57eb54 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/service/IOperLogService.java @@ -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 pageInfoQueryOperLog(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQueryOperLog(PageUtilEntity pageUtilEntity); /** * 批量删除系统操作日志 diff --git a/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java b/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java index 2682b3910..595a7977c 100644 --- a/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java +++ b/src/main/java/com/ruoyi/project/monitor/operlog/service/OperLogServiceImpl.java @@ -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 pageInfoQueryOperLog(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQueryOperLog(PageUtilEntity pageUtilEntity) { return operLogDao.pageInfoQuery(pageUtilEntity); } diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java index 998ab1dc7..3154feded 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java @@ -32,11 +32,10 @@ public class UserController extends BaseController @GetMapping("/getUserlist") @ResponseBody - public TableDataInfo queryUserlist(@RequestParam Map params) + public TableDataInfo queryUserlist() { - List list = userService.pageInfoQuery(null); - TableDataInfo tableDataInfo = new TableDataInfo(list, 12); - return tableDataInfo; + TableDataInfo rows = userService.pageInfoQuery(getPageUtilEntity()); + return rows; } @RequiresPermissions("system:user:list") diff --git a/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java b/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java index e7f4655fb..5cb7782fc 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/IUserDao.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity); /** * 通过用户名查询用户 diff --git a/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java b/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java index b66ae18cf..a43f2226e 100644 --- a/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/dao/UserDaoImpl.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity) { - List userPageInfo = null; - try - { - userPageInfo = this.findForList("SystemUserMapper.queryUserListByCond", pageUtilEntity); - } - catch (Exception e) - { - e.printStackTrace(); - } - return userPageInfo; + return this.findForList("SystemUserMapper.queryUserListByCond", pageUtilEntity); } /** diff --git a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java index 35f97ae8a..e11d5548e 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/IUserService.java +++ b/src/main/java/com/ruoyi/project/system/user/service/IUserService.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity); + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity); /** * 通过用户名查询用户 diff --git a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java index 1c518deb6..727716e1d 100644 --- a/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java @@ -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 pageInfoQuery(PageUtilEntity pageUtilEntity) + public TableDataInfo pageInfoQuery(PageUtilEntity pageUtilEntity) { return userDao.pageInfoQuery(pageUtilEntity); }