时间查询&排序支持一波

This commit is contained in:
RuoYi
2018-07-19 21:17:17 +08:00
parent 45d1a161bf
commit 509f17018a
33 changed files with 195 additions and 137 deletions

View File

@ -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());
}

View File

@ -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;
}
}

View File

@ -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 + "]";
}
}

View File

@ -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 + "]";
}

View File

@ -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;