diff --git a/doc/new_intall_20180302.sql b/doc/new_intall_20180302.sql index 05f00f4b6..44c3489d3 100644 --- a/doc/new_intall_20180302.sql +++ b/doc/new_intall_20180302.sql @@ -180,8 +180,8 @@ insert into sys_role_menu values ('1', '10'); drop table if exists sys_oper_log; create table sys_oper_log ( oper_id int(11) not null auto_increment comment '日志主键', - title varchar(50) default '' comment '功能请求', - action varchar(100) default '' comment '模块标题', + title varchar(50) default '' comment '模块标题', + action varchar(100) default '' comment '功能请求', method varchar(100) default '' comment '方法名称', channel varchar(20) default '' comment '来源渠道', login_name varchar(50) default '' comment '登录名称', @@ -189,13 +189,13 @@ create table sys_oper_log ( opert_url varchar(255) default '' comment '请求URL', opert_ip varchar(30) default '' comment '操作地址', oper_param varchar(255) default '' comment '请求参数', - status int(1) default 0 comment '状态0正常 1异常', + status int(1) default 0 comment '操作状态 0正常 1异常', error_msg varchar(255) default '' comment '错误消息', oper_time timestamp default current_timestamp comment '操作时间', primary key (oper_id) ) engine=innodb auto_increment=100 default charset=utf8; -insert into sys_oper_log values(1, '监控管理', '在线用户-踢出用户', 'com.ruoyi.xxx.xxx', 'web', 'admin', '研发部门', 'delete.do?id=1', '127.0.0.1', 'JSON参数', 0, '错误描述', '2018-01-01'); +insert into sys_oper_log values(1, '监控管理', '在线用户-踢出用户', 'com.ruoyi.project.monitor.online.controller.UserOnlineController()', 'web', 'admin', '研发部门', 'delete.do?id=1', '127.0.0.1', 'JSON参数', 0, '错误描述', '2018-01-01'); -- ---------------------------- -- 8、数据字典表 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 cf5dde305..cc3a2bfd9 100644 --- a/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java +++ b/src/main/java/com/ruoyi/framework/web/dao/DynamicObjectBaseDao.java @@ -6,15 +6,12 @@ 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.common.exception.base.DaoException; -import lombok.extern.slf4j.Slf4j; /** * 数据DAO层通用数据处理 * * @author ruoyi */ -@Slf4j public class DynamicObjectBaseDao { @Resource(name = "sqlSessionTemplate") @@ -23,78 +20,48 @@ public class DynamicObjectBaseDao /** * 保存对象 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public int save(String str, Object obj) { - int rows; - try - { - rows = sqlSessionTemplate.insert(str, obj); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("插入失败"); - } - return rows; + return sqlSessionTemplate.insert(str, obj); } /** * 批量更新 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public int batchSave(String str, List objs) { - int rows; - try - { - rows = sqlSessionTemplate.insert(str, objs); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("批量更新失败"); - } - return rows; + return sqlSessionTemplate.insert(str, objs); } /** * 修改对象 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public int update(String str, Object obj) { - int rows; - try - { - rows = sqlSessionTemplate.update(str, obj); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("修改失败"); - } - return rows; + return sqlSessionTemplate.update(str, obj); } /** * 批量更新 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public void batchUpdate(String str, List objs) throws Exception @@ -122,118 +89,81 @@ public class DynamicObjectBaseDao } /** - * 批量删除 + * 批量删除 根据对象 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public int batchDelete(String str, List objs) throws Exception { - int rows; - try - { - rows = sqlSessionTemplate.update(str, objs); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("批量删除失败"); - } - return rows; + return sqlSessionTemplate.delete(str, objs); + } + + /** + * 批量删除 根据数组 + * + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 + * @throws Exception + */ + public int batchDelete(String str, Long[] objs) throws Exception + { + return sqlSessionTemplate.delete(str, objs); } /** * 删除对象 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public int delete(String str, Object obj) { - int rows; - try - { - rows = sqlSessionTemplate.delete(str, obj); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("删除失败"); - } - return rows; + return sqlSessionTemplate.delete(str, obj); } /** * 查找单条对象 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public T findForObject(String str, Object obj) { - T t; - try - { - t = sqlSessionTemplate.selectOne(str, obj); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("查找单条对象失败"); - } - return t; + return sqlSessionTemplate.selectOne(str, obj); } /** * 查找对象 - 无条件 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ public List findForList(String str) throws Exception { - List list; - try - { - list = sqlSessionTemplate.selectList(str); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("查找所有对象-无条件。失败"); - } - return list; + return sqlSessionTemplate.selectList(str); } /** * 查找对象 - 有条件 * - * @param str - * @param obj - * @return + * @param str mapper 节点 + * @param obj 对象 + * @return 结果 * @throws Exception */ - public List findForList(String str, Object obj) + public List findForList(String str, Object obj) throws Exception { - List list; - try - { - list = sqlSessionTemplate.selectList(str, obj); - } - catch (Exception e) - { - log.error(e.getMessage()); - throw new DaoException("查找所有对象-有条件。失败"); - } - return list; + return sqlSessionTemplate.selectList(str, obj); } 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 fe406010c..8c5293a45 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 @@ -4,9 +4,13 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; +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.logininfor.domain.Logininfor; @@ -41,4 +45,16 @@ public class LogininforController extends BaseController TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult()); return tableDataInfo; } + + @Log(title = "监控管理", action = "登录日志-批量删除") + @PostMapping("/batchRemove") + @ResponseBody + public JSON batchRemove(@RequestParam("ids[]") Long[] ids) + { + int rows = logininforService.batchDeleteLogininfor(ids); + if (rows > 0) { + return JSON.ok(); + } + return JSON.error(); + } } 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 d4a4ee43b..0c183b3f0 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 @@ -25,4 +25,12 @@ public interface ILogininforDao * @return 登录记录集合 */ public List pageInfoQuery(PageUtilEntity pageUtilEntity); + + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteLogininfor(Long[] ids); } 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 ea1237e37..0ed0db538 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 @@ -46,4 +46,23 @@ public class LogininforDaoImpl extends DynamicObjectBaseDao implements ILogininf return logininforList; } + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteLogininfor(Long[] ids) + { + int rows = 0; + try + { + rows = this.batchDelete("SystemLogininforMapper.batchDeleteLogininfor", ids); + } + catch (Exception e) + { + e.printStackTrace(); + } + return rows; + } } 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 42c38a27f..feb68f2ce 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 @@ -26,4 +26,12 @@ public interface ILogininforService * @return 登录记录集合 */ public List pageInfoQueryLogininfor(PageUtilEntity pageUtilEntity); + + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteLogininfor(Long[] ids); } 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 257e2ed1d..a5f2f8893 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 @@ -40,4 +40,15 @@ public class LogininforServiceImpl implements ILogininforService { return logininforDao.pageInfoQuery(pageUtilEntity); } + + /** + * 批量删除系统登录日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteLogininfor(Long[] ids) + { + return logininforDao.batchDeleteLogininfor(ids); + } } 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 793b5d46f..3a6bd9e8a 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 @@ -54,7 +54,7 @@ public class UserOnlineController extends BaseController return tableDataInfo; } - @Log(title = "监控管理", action = "在线用户-批量踢出用户") + @Log(title = "监控管理", action = "在线用户-批量强退用户") @PostMapping("/batchForceLogout") @ResponseBody public JSON batchForceLogout(@RequestParam("ids[]") String[] ids) 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 c6c8a84d2..bb7cdb35e 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 @@ -53,7 +53,7 @@ public interface IUserOnlineService public List pageInfoQueryUserOnline(PageUtilEntity pageUtilEntity); /** - * 读取Session信息 + * 强退用户 * * @param sessionId 会话ID */ 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 baf1f114e..a8cf05fed 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 @@ -97,7 +97,7 @@ public class UserOnlineServiceImpl implements IUserOnlineService } /** - * 读取Session信息 + * 强退用户 * * @param sessionId 会话ID */ 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 new file mode 100644 index 000000000..ae31b549d --- /dev/null +++ b/src/main/java/com/ruoyi/project/monitor/operlog/controller/OperlogController.java @@ -0,0 +1,61 @@ +package com.ruoyi.project.monitor.operlog.controller; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +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; + +/** + * 操作日志记录 + * + * @author ruoyi + */ +@Controller +@RequestMapping("/monitor/operlog") +public class OperlogController extends BaseController +{ + private String prefix = "monitor/operlog"; + + @Autowired + private IOperLogService operLogService; + + @GetMapping() + public String logininfor() + { + return prefix + "/operlog"; + } + + @GetMapping("/list") + @ResponseBody + public TableDataInfo list() + { + PageUtilEntity pageUtilEntity = this.getPageUtilEntity(); + List list = operLogService.pageInfoQueryOperLog(pageUtilEntity); + TableDataInfo tableDataInfo = new TableDataInfo(list, pageUtilEntity.getTotalResult()); + return tableDataInfo; + } + + @Log(title = "监控管理", action = "操作日志-批量删除") + @PostMapping("/batchRemove") + @ResponseBody + public JSON batchRemove(@RequestParam("ids[]") Long[] ids) + { + int rows = operLogService.batchDeleteOperLog(ids); + if (rows > 0) + { + return JSON.ok(); + } + return JSON.error(); + } +} 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 2c15cd569..19eb266f8 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,5 +1,7 @@ package com.ruoyi.project.monitor.operlog.dao; +import java.util.List; +import com.ruoyi.framework.web.page.PageUtilEntity; import com.ruoyi.project.monitor.operlog.domain.OperLog; /** @@ -15,4 +17,20 @@ public interface IOperLogDao * @param operLog 系统日志对象 */ public void insertOperlog(OperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 操作日志集合 + */ + public List pageInfoQuery(PageUtilEntity pageUtilEntity); + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteOperLog(Long[] ids); } 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 bc97e9953..cf33e7401 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,8 +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.project.monitor.operlog.domain.OperLog; /** @@ -23,4 +24,44 @@ public class OperLogDaoImpl extends DynamicObjectBaseDao implements IOperLogDao { this.save("SystemOperLogMapper.insertOperlog", operLog); } + + /** + * 查询系统操作日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 操作日志集合 + */ + public List pageInfoQuery(PageUtilEntity pageUtilEntity) + { + List logininforList = null; + try + { + logininforList = this.findForList("SystemOperLogMapper.pageInfoQueryOperLog", pageUtilEntity); + } + catch (Exception e) + { + e.printStackTrace(); + } + return logininforList; + } + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteOperLog(Long[] ids) + { + int rows = 0; + try + { + rows = this.batchDelete("SystemOperLogMapper.batchDeleteOperLog", ids); + } + catch (Exception e) + { + e.printStackTrace(); + } + 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 0bc54b4a6..1b5f80ca8 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,5 +1,7 @@ package com.ruoyi.project.monitor.operlog.service; +import java.util.List; +import com.ruoyi.framework.web.page.PageUtilEntity; import com.ruoyi.project.monitor.operlog.domain.OperLog; /** @@ -15,4 +17,20 @@ public interface IOperLogService * @param operLog 系统日志对象 */ public void insertOperlog(OperLog operLog); + + /** + * 查询系统操作日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 操作日志集合 + */ + public List pageInfoQueryOperLog(PageUtilEntity pageUtilEntity); + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteOperLog(Long[] ids); } 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 972941d2a..e24aa0317 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,7 +1,11 @@ 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.project.monitor.operlog.dao.IOperLogDao; import com.ruoyi.project.monitor.operlog.domain.OperLog; @@ -26,4 +30,26 @@ public class OperLogServiceImpl implements IOperLogService { operLogDao.insertOperlog(operLog); } + + /** + * 查询系统操作日志集合 + * + * @param pageUtilEntity 分页参数 + * @return 操作日志集合 + */ + public List pageInfoQueryOperLog(PageUtilEntity pageUtilEntity) + { + return operLogDao.pageInfoQuery(pageUtilEntity); + } + + /** + * 批量删除系统操作日志 + * + * @param ids 需要删除的数据 + * @return + */ + public int batchDeleteOperLog(Long[] ids) + { + return operLogDao.batchDeleteOperLog(ids); + } } diff --git a/src/main/resources/mybatis/system/SystemLogininforMapper.xml b/src/main/resources/mybatis/system/SystemLogininforMapper.xml index 4af95e5a6..f57d18939 100644 --- a/src/main/resources/mybatis/system/SystemLogininforMapper.xml +++ b/src/main/resources/mybatis/system/SystemLogininforMapper.xml @@ -28,5 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + delete from sys_logininfor where info_id in + + #{infoId} + + \ No newline at end of file diff --git a/src/main/resources/mybatis/system/SystemOperLogMapper.xml b/src/main/resources/mybatis/system/SystemOperLogMapper.xml index 1f70593c6..812aa5e58 100644 --- a/src/main/resources/mybatis/system/SystemOperLogMapper.xml +++ b/src/main/resources/mybatis/system/SystemOperLogMapper.xml @@ -24,5 +24,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_oper_log(oper_id, title, action, method, channel, login_name, dept_name, opert_url, opert_ip, oper_param, status, error_msg) values (#{operId}, #{title}, #{action}, #{method}, #{channel}, #{loginName}, #{deptName}, #{opertUrl}, #{opertIp}, #{opertParam}, #{status}, #{errorMsg}) + + + + + delete from sys_oper_log where oper_id in + + #{operId} + + \ No newline at end of file diff --git a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js index 45d63f16a..1aef53e99 100644 --- a/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js +++ b/src/main/resources/static/ruoyi/monitor/logininfor/logininfor.js @@ -1,7 +1,10 @@ var prefix = "/monitor/logininfor" $(function() { - var columns = [{ + var columns = [{ + checkbox: true + }, + { field: 'infoId', // 列字段名 title: '访问编号' // 列标题 @@ -24,7 +27,7 @@ $(function() { }, { field: 'status', - title: '状态', + title: '登录状态', align: 'center', formatter: function(value, row, index) { if (value == 0) { @@ -41,3 +44,26 @@ $(function() { var url = prefix + "/list"; initTable(columns, url); }); + +function batchRemove() { + var rows = getIdSelections("infoId"); + if (rows.length == 0) { + layer.msg("请选择要删除的数据"); + return; + } + layer.confirm("确认要删除选中的" + rows.length + "条数据吗?",{icon: 3, title:'提示'},function(index){ + $.ajax({ + type: 'POST', + data: { "ids": rows }, + url: prefix + '/batchRemove', + success: function(r) { + if (r.code == 0) { + layer.msg(r.msg, { icon: 1, time: 1000 }); + refresh(); + } else { + layer.alert(r.msg, {icon: 2, title:"系统提示"}); + } + } + }); + }); +} diff --git a/src/main/resources/static/ruoyi/monitor/online/online.js b/src/main/resources/static/ruoyi/monitor/online/online.js index 9133c614d..f41cc47e2 100644 --- a/src/main/resources/static/ruoyi/monitor/online/online.js +++ b/src/main/resources/static/ruoyi/monitor/online/online.js @@ -51,7 +51,6 @@ $(function() { }, { title: '操作', - field: 'id', align: 'center', formatter: function(value, row, index) { var d = ' '; diff --git a/src/main/resources/static/ruoyi/monitor/operlog/operlog.js b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js new file mode 100644 index 000000000..08241e089 --- /dev/null +++ b/src/main/resources/static/ruoyi/monitor/operlog/operlog.js @@ -0,0 +1,84 @@ +var prefix = "/monitor/operlog" + +$(function() { + var columns = [{ + checkbox: true + }, + { + field: 'operId', + // 列字段名 + title: '日志编号' // 列标题 + }, + { + field: 'title', + title: '模块' + }, + { + field: 'action', + title: '功能' + }, + { + field: 'loginName', + title: '登录名称' + }, + { + field: 'deptName', + title: '部门名称' + }, + { + field: 'opertIp', + title: '主机' + }, + { + field: 'status', + title: '操作状态', + align: 'center', + formatter: function(value, row, index) { + if (value == 0) { + return '成功'; + } else if (value == 1) { + return '异常'; + } + } + }, + { + field: 'operTime', + title: '操作时间' + }, + { + title: '操作', + align: 'center', + formatter: function(value, row, index) { + var d = ' '; + return d; + } + }]; + var url = prefix + "/list"; + initTable(columns, url); +}); + +function view(id) { +} + +function batchRemove() { + var rows = getIdSelections("operId"); + if (rows.length == 0) { + layer.msg("请选择要删除的数据"); + return; + } + layer.confirm("确认要删除选中的" + rows.length + "条数据吗?",{icon: 3, title:'提示'},function(index){ + $.ajax({ + type: 'POST', + data: { "ids": rows }, + url: prefix + '/batchRemove', + success: function(r) { + if (r.code == 0) { + layer.msg(r.msg, { icon: 1, time: 1000 }); + refresh(); + } else { + layer.alert(r.msg, {icon: 2, title:"系统提示"}); + } + } + }); + }); +} diff --git a/src/main/resources/templates/monitor/logininfor/logininfor.html b/src/main/resources/templates/monitor/logininfor/logininfor.html index a49602a41..0d2251250 100644 --- a/src/main/resources/templates/monitor/logininfor/logininfor.html +++ b/src/main/resources/templates/monitor/logininfor/logininfor.html @@ -5,6 +5,11 @@
+
diff --git a/src/main/resources/templates/monitor/online/online.html b/src/main/resources/templates/monitor/online/online.html index bf0c45521..ca1f3bccc 100644 --- a/src/main/resources/templates/monitor/online/online.html +++ b/src/main/resources/templates/monitor/online/online.html @@ -12,7 +12,7 @@ -->
diff --git a/src/main/resources/templates/monitor/operlog/operlog.html b/src/main/resources/templates/monitor/operlog/operlog.html new file mode 100644 index 000000000..c51f571c1 --- /dev/null +++ b/src/main/resources/templates/monitor/operlog/operlog.html @@ -0,0 +1,21 @@ + + + + + +
+ + + +
+
+
+ + + \ No newline at end of file