From 7c9903e0579f6dfd54b6de93496e39b3b6c3ea7f Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 23 Feb 2023 12:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=B4=A2=E5=BC=95=E6=8F=90=E5=8D=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=80=A7=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/system/SysLogininforMapper.xml | 4 ++-- .../main/resources/mapper/system/SysOperLogMapper.xml | 4 ++-- ruoyi-ui/src/views/system/logininfor/index.vue | 5 +++-- ruoyi-ui/src/views/system/operlog/index.vue | 3 ++- sql/{ry_20230221.sql => ry_20230223.sql} | 9 +++++++-- 5 files changed, 16 insertions(+), 9 deletions(-) rename sql/{ry_20230221.sql => ry_20230223.sql} (99%) diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml index 4f400694..67a4b1c6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -31,10 +31,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND user_name like concat('%', #{userName}, '%') - and date_format(access_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + AND access_time >= #{params.beginTime} - and date_format(access_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + AND access_time <= #{params.endTime} order by info_id desc diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 9c1e374e..9474091e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -55,10 +55,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND oper_name like concat('%', #{operName}, '%') - and date_format(oper_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') + AND oper_time >= #{params.beginTime} - and date_format(oper_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + AND oper_time <= #{params.endTime} order by oper_id desc diff --git a/ruoyi-ui/src/views/system/logininfor/index.vue b/ruoyi-ui/src/views/system/logininfor/index.vue index 4a1a4fa7..f13f789e 100644 --- a/ruoyi-ui/src/views/system/logininfor/index.vue +++ b/ruoyi-ui/src/views/system/logininfor/index.vue @@ -38,11 +38,12 @@ @@ -152,7 +153,7 @@ export default { // 日期范围 dateRange: [], // 默认排序 - defaultSort: {prop: 'loginTime', order: 'descending'}, + defaultSort: {prop: 'accessTime', order: 'descending'}, // 查询参数 queryParams: { pageNum: 1, diff --git a/ruoyi-ui/src/views/system/operlog/index.vue b/ruoyi-ui/src/views/system/operlog/index.vue index 6504fe52..4f1888bb 100644 --- a/ruoyi-ui/src/views/system/operlog/index.vue +++ b/ruoyi-ui/src/views/system/operlog/index.vue @@ -53,11 +53,12 @@ diff --git a/sql/ry_20230221.sql b/sql/ry_20230223.sql similarity index 99% rename from sql/ry_20230221.sql rename to sql/ry_20230223.sql index ed1aa939..00069891 100644 --- a/sql/ry_20230221.sql +++ b/sql/ry_20230223.sql @@ -433,7 +433,10 @@ create table sys_oper_log ( error_msg varchar(2000) default '' comment '错误消息', oper_time datetime comment '操作时间', cost_time bigint(20) default 0 comment '消耗时间', - primary key (oper_id) + primary key (oper_id), + key idx_sys_oper_log_bt (business_type), + key idx_sys_oper_log_s (status), + key idx_sys_oper_log_ot (oper_time) ) engine=innodb auto_increment=100 comment = '操作日志记录'; @@ -558,7 +561,9 @@ create table sys_logininfor ( status char(1) default '0' comment '登录状态（0成功 1失败）', msg varchar(255) default '' comment '提示信息', access_time datetime comment '访问时间', - primary key (info_id) + primary key (info_id), + key idx_sys_logininfor_s (status), + key idx_sys_logininfor_lt (access_time) ) engine=innodb auto_increment=100 comment = '系统访问记录';