Skip to content

F
fgqyxxlr
Commit 509f1701 by RuoYi
Options

时间查询&排序支持一波

parent 45d1a161
Showing with 195 additions and 140 deletions
sql/ry_20180709.sql → sql/ry_20180720.sql
......@@ -146,9 +146,9 @@ create table sys_menu (
-- 初始化-菜单信息表数据
-- ----------------------------
-- 一级菜单
insert into sys_menu values('1', '系统管理', '0', '1', '#', 'M', '0', '', 'fa fa-gear', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录');
insert into sys_menu values('2', '系统监控', '0', '2', '#', 'M', '0', '', 'fa fa-video-camera', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录');
insert into sys_menu values('3', '系统工具', '0', '3', '#', 'M', '0', '', 'fa fa-bars', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录');
insert into sys_menu values('1', '系统管理', '0', '1', '#', 'M', '0', '#', 'fa fa-gear', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统管理目录');
insert into sys_menu values('2', '系统监控', '0', '2', '#', 'M', '0', '#', 'fa fa-video-camera', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统监控目录');
insert into sys_menu values('3', '系统工具', '0', '3', '#', 'M', '0', '#', 'fa fa-bars', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '系统工具目录');
-- 二级菜单
insert into sys_menu values('100', '用户管理', '1', '1', '/system/user', 'C', '0', 'system:user:view', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '用户管理菜单');
insert into sys_menu values('101', '角色管理', '1', '2', '/system/role', 'C', '0', 'system:role:view', '#', 'admin', '2018-03-16 11-33-00', 'ry', '2018-03-16 11-33-00', '角色管理菜单');
......@@ -538,7 +538,7 @@ create table sys_job (
job_name varchar(64) default '' comment '任务名称',
job_group varchar(64) default '' comment '任务组名',
method_name varchar(500) default '' comment '任务方法',
params varchar(200) default '' comment '方法参数',
method_params varchar(200) default '' comment '方法参数',
cron_expression varchar(255) default '' comment 'cron执行表达式',
status char(1) default '0' comment '状态（0正常 1暂停）',
create_by varchar(64) default '' comment '创建者',
......@@ -562,7 +562,7 @@ create table sys_job_log (
job_name varchar(64) not null comment '任务名称',
job_group varchar(64) not null comment '任务组名',
method_name varchar(500) comment '任务方法',
params varchar(200) default '' comment '方法参数',
method_params varchar(200) default '' comment '方法参数',
job_message varchar(500) comment '日志信息',
status char(1) default '0' comment '执行状态（0正常 1失败）',
exception_info text comment '异常信息',
......
src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
......@@ -99,7 +99,7 @@ public class LogAspect
{
operLog.setOperName(currentUser.getLoginName());
if (StringUtils.isNotNull(currentUser.getDept())
&& StringUtils.isEmpty(currentUser.getDept().getDeptName()))
&& StringUtils.isNotEmpty(currentUser.getDept().getDeptName()))
{
operLog.setDeptName(currentUser.getDept().getDeptName());
}
......
src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
......@@ -3,8 +3,7 @@ package com.ruoyi.framework.web.domain;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
import com.ruoyi.common.utils.DateUtils;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
* Entity基类
......@@ -22,19 +21,21 @@ public class BaseEntity implements Serializable
private String createBy;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 更新者 */
private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/** 备注 */
private String remark;
/** 请求参数 */
private Map<String, Object> reqParams;
private Map<String, Object> params;
public String getSearchValue()
{
......@@ -61,16 +62,6 @@ public class BaseEntity implements Serializable
return createTime;
}
public String getCreateTimeStr()
{
return createTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, createTime) : "";
}
public String getCreateDateTimeStr()
{
return createTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, createTime) : "";
}
public void setCreateTime(Date createTime)
{
this.createTime = createTime;
......@@ -91,16 +82,6 @@ public class BaseEntity implements Serializable
return updateTime;
}
public String getUpdateTimeStr()
{
return updateTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, updateTime) : "";
}
public String getUpdateDateTimeStr()
{
return updateTime != null ? DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, updateTime) : "";
}
public void setUpdateTime(Date updateTime)
{
this.updateTime = updateTime;
......@@ -116,14 +97,14 @@ public class BaseEntity implements Serializable
this.remark = remark;
}
public Map<String, Object> getReqParams()
public Map<String, Object> getParams()
{
return reqParams;
return params;
}
public void setReqParams(Map<String, Object> reqParams)
public void setParams(Map<String, Object> params)
{
this.reqParams = reqParams;
this.params = params;
}
}
src/main/java/com/ruoyi/project/monitor/job/domain/Job.java
......@@ -32,7 +32,7 @@ public class Job extends BaseEntity implements Serializable
/** 方法参数 */
@Excel(name = "方法参数")
private String params;
private String methodParams;
/** cron执行表达式 */
@Excel(name = "执行表达式 ")
......@@ -82,14 +82,14 @@ public class Job extends BaseEntity implements Serializable
this.methodName = methodName;
}
public String getParams()
public String getMethodParams()
{
return params;
return methodParams;
}
public void setParams(String params)
public void setMethodParams(String methodParams)
{
this.params = params;
this.methodParams = methodParams;
}
public String getCronExpression()
......@@ -116,7 +116,7 @@ public class Job extends BaseEntity implements Serializable
public String toString()
{
return "Job [jobId=" + jobId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName=" + methodName
+ ", params=" + params + ", cronExpression=" + cronExpression + ", status=" + status + "]";
+ ", methodParams=" + methodParams + ", cronExpression=" + cronExpression + ", status=" + status + "]";
}
}
src/main/java/com/ruoyi/project/monitor/job/domain/JobLog.java
......@@ -30,7 +30,7 @@ public class JobLog extends BaseEntity
/** 方法参数 */
@Excel(name = "方法参数")
private String params;
private String methodParams;
/** 日志信息 */
@Excel(name = "日志信息")
......@@ -84,14 +84,14 @@ public class JobLog extends BaseEntity
this.methodName = methodName;
}
public String getParams()
public String getMethodParams()
{
return params;
return methodParams;
}
public void setParams(String params)
public void setMethodParams(String methodParams)
{
this.params = params;
this.methodParams = methodParams;
}
public String getJobMessage()
......@@ -128,7 +128,7 @@ public class JobLog extends BaseEntity
public String toString()
{
return "JobLog [jobLogId=" + jobLogId + ", jobName=" + jobName + ", jobGroup=" + jobGroup + ", methodName="
+ methodName + ", params=" + params + ", jobMessage=" + jobMessage + ", status=" + status
+ methodName + ", methodParams=" + methodParams + ", jobMessage=" + jobMessage + ", status=" + status
+ ", exceptionInfo=" + exceptionInfo + "]";
}
......
src/main/java/com/ruoyi/project/monitor/job/util/ScheduleJob.java
......@@ -41,7 +41,7 @@ public class ScheduleJob extends QuartzJobBean
jobLog.setJobName(job.getJobName());
jobLog.setJobGroup(job.getJobGroup());
jobLog.setMethodName(job.getMethodName());
jobLog.setParams(job.getParams());
jobLog.setMethodParams(job.getMethodParams());
jobLog.setCreateTime(new Date());
long startTime = System.currentTimeMillis();
......@@ -50,7 +50,7 @@ public class ScheduleJob extends QuartzJobBean
{
// 执行任务
log.info("任务开始执行 - 名称：{} 方法：{}", job.getJobName(), job.getMethodName());
ScheduleRunnable task = new ScheduleRunnable(job.getJobName(), job.getMethodName(), job.getParams());
ScheduleRunnable task = new ScheduleRunnable(job.getJobName(), job.getMethodName(), job.getMethodParams());
Future<?> future = service.submit(task);
future.get();
long times = System.currentTimeMillis() - startTime;
......
src/main/resources/mybatis/monitor/JobLogMapper.xml
......@@ -9,15 +9,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" />
<result property="methodName" column="method_name" />
<result property="params" column="params" />
<result property="methodParams" column="method_params" />
<result property="jobMessage" column="job_message" />
<result property="status" column="status" />
<result property="status" column="status" />
<result property="exceptionInfo" column="exception_info" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectJobLogVo">
select job_log_id, job_name, job_group, method_name, params, job_message, status, exception_info, create_time from sys_job_log
select job_log_id, job_name, job_group, method_name, method_params, job_message, status, exception_info, create_time from sys_job_log
</sql>
<select id="selectJobLogList" parameterType="JobLog" resultMap="JobLogResult">
......@@ -32,11 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="methodName != null and methodName != ''">
AND method_name like concat('%', #{methodName}, '%')
</if>
<if test="reqParams != null and reqParams.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{reqParams.beginTime},'%y%m%d')
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="reqParams != null and reqParams.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{reqParams.endTime},'%y%m%d')
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">job_name,</if>
<if test="jobGroup != null and jobGroup != ''">job_group,</if>
<if test="methodName != null and methodName != ''">method_name,</if>
<if test="params != null and params != ''">params,</if>
<if test="methodParams != null and methodParams != ''">method_params,</if>
<if test="jobMessage != null and jobMessage != ''">job_message,</if>
<if test="status != null and status != ''">status,</if>
<if test="exceptionInfo != null and exceptionInfo != ''">exception_info,</if>
......@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">#{jobName},</if>
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
<if test="methodName != null and methodName != ''">#{methodName},</if>
<if test="params != null and params != ''">#{params},</if>
<if test="methodParams != null and methodParams != ''">#{methodParams},</if>
<if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
......
src/main/resources/mybatis/monitor/JobMapper.xml
......@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="jobName" column="job_name" />
<result property="jobGroup" column="job_group" />
<result property="methodName" column="method_name" />
<result property="params" column="params" />
<result property="methodParams" column="method_params" />
<result property="cronExpression" column="cron_expression" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
......@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectJobVo">
select job_id, job_name, job_group, method_name, params, cron_expression, status, create_by, create_time, remark from sys_job
select job_id, job_name, job_group, method_name, method_params, cron_expression, status, create_by, create_time, remark from sys_job
</sql>
<select id="selectJobList" parameterType="Job" resultMap="JobResult">
......@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">job_name = #{jobName},</if>
<if test="jobGroup != null and jobGroup != ''">job_group = #{jobGroup},</if>
<if test="methodName != null and methodName != ''">method_name = #{methodName},</if>
<if test="params != null and params != ''">params = #{params},</if>
<if test="methodParams != null and methodParams != ''">method_params = #{methodParams},</if>
<if test="cronExpression != null and cronExpression != ''">cron_expression = #{cronExpression},</if>
<if test="status !=null">status = #{status},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
......@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">job_name,</if>
<if test="jobGroup != null and jobGroup != ''">job_group,</if>
<if test="methodName != null and methodName != ''">method_name,</if>
<if test="params != null and params != ''">params,</if>
<if test="methodParams != null and methodParams != ''">method_params,</if>
<if test="cronExpression != null and cronExpression != ''">cron_expression,</if>
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
......@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="jobName != null and jobName != ''">#{jobName},</if>
<if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
<if test="methodName != null and methodName != ''">#{methodName},</if>
<if test="params != null and params != ''">#{params},</if>
<if test="methodParams != null and methodParams != ''">#{method_params},</if>
<if test="cronExpression != null and cronExpression != ''">#{cronExpression},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
......
src/main/resources/mybatis/monitor/LogininforMapper.xml
......@@ -33,11 +33,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="loginName != null and loginName != ''">
AND login_name like concat('%', #{loginName}, '%')
</if>
<if test="reqParams != null and reqParams.beginTime != ''"><!-- 开始时间检索 -->
and date_format(login_time,'%y%m%d') &gt;= date_format(#{reqParams.beginTime},'%y%m%d')
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(login_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="reqParams != null and reqParams.endTime != ''"><!-- 结束时间检索 -->
and date_format(login_time,'%y%m%d') &lt;= date_format(#{reqParams.endTime},'%y%m%d')
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(login_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......
src/main/resources/mybatis/monitor/OperLogMapper.xml
......@@ -38,11 +38,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="operName != null and operName != ''">
AND oper_name like concat('%', #{operName}, '%')
</if>
<if test="reqParams != null and reqParams.beginTime != ''"><!-- 开始时间检索 -->
and date_format(oper_time,'%y%m%d') &gt;= date_format(#{reqParams.beginTime},'%y%m%d')
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(oper_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="reqParams != null and reqParams.endTime != ''"><!-- 结束时间检索 -->
and date_format(oper_time,'%y%m%d') &lt;= date_format(#{reqParams.endTime},'%y%m%d')
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(oper_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......
src/main/resources/mybatis/system/ConfigMapper.xml
......@@ -42,6 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="configKey != null and configKey != ''">
AND config_key like concat('%', #{configKey}, '%')
</if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......
src/main/resources/mybatis/system/DictTypeMapper.xml
......@@ -31,6 +31,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="dictType != null and dictType != ''">
AND dict_type like concat('%', #{dictType}, '%')
</if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......
src/main/resources/mybatis/system/RoleMapper.xml
......@@ -33,6 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="roleKey != null and roleKey != ''">
AND role_key like concat('%', #{roleKey}, '%')
</if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</where>
</select>
......
src/main/resources/mybatis/system/UserMapper.xml
......@@ -56,6 +56,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="phonenumber != null and phonenumber != ''">
AND u.phonenumber like concat('%', #{phonenumber}, '%')
</if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<if test="deptId != null and parentId != null and parentId != 0">
AND u.dept_id IN (SELECT t.dept_id FROM sys_dept t WHERE t.dept_id = #{deptId} OR t.parent_id = #{deptId})
</if>
......
src/main/resources/mybatis/tool/GenMapper.xml
......@@ -30,6 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="tableComment != null and tableComment != ''">
AND table_comment like concat('%', #{tableComment}, '%')
</if>
<if test="params != null and params.beginTime != ''"><!-- 开始时间检索 -->
and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if>
<if test="params != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
</select>
<select id="selectTableByName" parameterType="String" resultMap="TableInfoResult">
......
src/main/resources/static/ruoyi/css/ry-ui.css
......@@ -3,7 +3,7 @@
* Author: Ruoyi
*/
/** 用户管理 样式布局 */
/** 用户管理 样式布局 */
.box {
position: relative;
......@@ -92,7 +92,7 @@
margin: 5px 0 5px -25px
}
/** select2 样式修改 */
/** select2 样式修改 */
.select2-container--default .select2-selection--multiple .select2-selection__choice {
background-color: #1AB394;
border-color: #1AB394;
......@@ -113,7 +113,7 @@
padding-right: 10px
}
/** 表单验证 样式布局 */
/** 表单验证 样式布局 */
label.error {
position: absolute;
right: 18px;
......@@ -136,7 +136,7 @@ label.error {
padding-left: 25px
}
/** 遮罩层 */
/** 遮罩层 */
.loaderbox {
display: inline-block;
min-width: 125px;
......@@ -200,7 +200,7 @@ label.error {
}
}
/** 表单查询条件 */
/** 表单查询条件 */
label{
font-weight: normal;
......@@ -306,7 +306,7 @@ label{
cursor: pointer;
}
/** 表格查询数据 */
/** 表格查询数据 */
.table-striped{
min-height:75%;
}
......
src/main/resources/static/ruoyi/js/common.js
......@@ -18,6 +18,13 @@ $(function(){
radioClass: "iradio_square-green",
})
}
if ($(".time").length > 0) {
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
}
});
/** 创建选项卡 */
......
src/main/resources/static/ruoyi/js/ry-ui.js
......@@ -145,7 +145,7 @@
});
return checkeds;
},
// 获取选中复选框项
// 获取选中下拉框项
selectSelects: function(name) {
var selects = "";
$('#' + name + ' option:selected').each(function (i) {
......
src/main/resources/templates/monitor/job/job.html
......@@ -77,18 +77,20 @@
},
{
field: 'jobName',
title: '任务名称'
title: '任务名称',
sortable: true
},
{
field: 'jobGroup',
title: '任务组名'
title: '任务组名',
sortable: true
},
{
field: 'methodName',
title: '方法名称'
},
{
field: 'params',
field: 'methodParams',
title: '方法参数'
},
{
......@@ -108,8 +110,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/monitor/job/jobLog.html
......@@ -25,9 +25,9 @@
</li>
<li class="time">
<label>执行时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
......@@ -73,18 +73,20 @@
},
{
field: 'jobName',
title: '任务名称'
title: '任务名称',
sortable: true
},
{
field: 'jobGroup',
title: '任务组名'
title: '任务组名',
sortable: true
},
{
field: 'methodName',
title: '方法名称'
},
{
field: 'params',
field: 'methodParams',
title: '方法参数'
},
{
......@@ -104,8 +106,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......@@ -119,12 +122,6 @@
};
$.table.init(options);
});
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/monitor/logininfor/logininfor.html
......@@ -25,9 +25,9 @@
</li>
<li class="time">
<label>登录时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
......@@ -72,7 +72,8 @@
},
{
field: 'loginName',
title: '登录名称'
title: '登录名称',
sortable: true
},
{
field: 'ipaddr',
......@@ -108,17 +109,12 @@
},
{
field: 'loginTime',
title: '登录时间'
title: '登录时间',
sortable: true
}]
};
$.table.init(options);
});
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/monitor/online/online.html
......@@ -57,7 +57,8 @@
},
{
field: 'loginName',
title: '登录名称'
title: '登录名称',
sortable: true
},
{
field: 'deptName',
......@@ -93,11 +94,13 @@
},
{
field: 'startTimestamp',
title: '登录时间'
title: '登录时间',
sortable: true
},
{
field: 'lastAccessTime',
title: '最后访问时间'
title: '最后访问时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/monitor/operlog/operlog.html
......@@ -25,9 +25,9 @@
</li>
<li class="time">
<label>操作时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="reqParams[beginTime]"/>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="reqParams[endTime]"/>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
......@@ -105,7 +105,8 @@
},
{
field: 'operName',
title: '操作人员'
title: '操作人员',
sortable: true
},
{
field: 'deptName',
......@@ -133,7 +134,8 @@
},
{
field: 'operTime',
title: '操作时间'
title: '操作时间',
sortable: true
},
{
title: '操作',
......@@ -153,12 +155,6 @@
var url = prefix + '/detail/' + id;
$.modal.open("操作日志详细", url);
}
layui.use('laydate', function() {
var laydate = layui.laydate;
laydate.render({ elem: '#startTime', theme: 'molv' });
laydate.render({ elem: '#endTime', theme: 'molv' });
});
</script>
</body>
</html>
\ No newline at end of file
src/main/resources/templates/system/config/config.html
......@@ -22,6 +22,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
......@@ -94,7 +100,7 @@
}
},
{
field: 'createDateTimeStr',
field: 'createTime',
title: '创建时间'
},
{
......
src/main/resources/templates/system/dept/dept.html
......@@ -79,7 +79,7 @@
}
},
{
field: 'createTimeStr',
field: 'createTime',
title: '创建时间',
align: "center"
},
......
src/main/resources/templates/system/dict/data/data.html
......@@ -104,8 +104,9 @@
title: '备注'
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/system/dict/type/type.html
......@@ -23,6 +23,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
......@@ -102,8 +108,9 @@
title: '备注'
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/system/notice/notice.html
......@@ -98,8 +98,9 @@
title : '创建者'
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/system/post/post.html
......@@ -98,8 +98,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/system/role/role.html
......@@ -23,6 +23,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
......@@ -99,7 +105,8 @@
},
{
field: 'createTime',
title: '创建时间'
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/system/user/profile/profile.html
......@@ -46,7 +46,7 @@
<p><i class="fa fa-group"></i> [[${user.dept.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]</p>
<p><i class="fa fa-transgender"></i> [[${user.sex}]]</p>
<p><i class="fa fa-envelope-o"></i> [[${user.email}]]</p>
<p><i class="fa fa-calendar"></i> [[${user.createTimeStr}]]</p>
<p><i class="fa fa-calendar"></i> [[${#dates.format(user.createTime, 'yyyy-MM-dd HH:mm:ss')}]]</p>
</div>
<div class="clearfix"></div>
</a>
......
src/main/resources/templates/system/user/user.html
......@@ -48,6 +48,12 @@
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel($('form').attr('id'))"><i class="fa fa-download"></i>&nbsp;下载</a>
......@@ -139,8 +145,9 @@
}
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
sortable: true
},
{
title: '操作',
......
src/main/resources/templates/tool/gen/gen.html
......@@ -16,6 +16,12 @@
<li>
表描述：<input type="text" name="tableComment"/>
</li>
<li class="time">
<label>创建时间： </label>
<input type="text" class="layui-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="layui-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search($('form').attr('id'))"><i class="fa fa-search"></i>&nbsp;搜索</a>
</li>
......@@ -50,22 +56,31 @@
},
{
field: 'tableName',
title: '表名称'
title: '表名称',
width: '20%',
sortable: true
},
{
field: 'tableComment',
title: '表描述'
title: '表描述',
width: '20%',
sortable: true
},
{
field: 'createDateTimeStr',
title: '创建时间'
field: 'createTime',
title: '创建时间',
width: '20%',
sortable: true
},
{
field: 'updateDateTimeStr',
title: '更新时间'
field: 'updateTime',
title: '更新时间',
width: '20%',
sortable: true
},
{
title: '操作',
width: '20%',
align: 'center',
formatter: function(value, row, index) {
var msg = '<a class="btn btn-primary btn-xs" href="#" onclick="genCode(\'' + row.tableName + '\')"><i class="fa fa-bug"></i>生成代码</a> ';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment