|
@@ -48,6 +48,11 @@ public class SysJobLogController {
|
|
|
|
|
|
private final SysJobLogService sysJobLogService;
|
|
|
|
|
|
+ private String j27 = "同一用户,连续%s月结算金额相同";
|
|
|
+ private String j28 = "同一企业,给%s个用户支付相同金额";
|
|
|
+ private String j29 = "同一用户,连续%s月没有定位打卡";
|
|
|
+ private String j30 = "同一用户,连续%s月结算金额超过%s金额";
|
|
|
+
|
|
|
/**
|
|
|
* 分页查询
|
|
|
*
|
|
@@ -59,7 +64,6 @@ public class SysJobLogController {
|
|
|
@ApiOperation(value = "分页定时任务日志查询")
|
|
|
public R getSysJobLogPage(Page<SysJobLog> page, SysJobLog sysJobLog) {
|
|
|
|
|
|
-
|
|
|
sysJobLogService.page(page, Wrappers.<SysJobLog>lambdaQuery()
|
|
|
.in(SysJobLog::getJobId, 27, 28, 29, 30)
|
|
|
.like(StrUtil.isNotBlank(sysJobLog.getJobName()), SysJobLog::getJobName, sysJobLog.getJobName())
|
|
@@ -70,9 +74,27 @@ public class SysJobLogController {
|
|
|
);
|
|
|
|
|
|
page.getRecords().forEach(r -> {
|
|
|
+
|
|
|
+ // 匹配
|
|
|
+ String jobName;
|
|
|
+ if (r.getJobId() == 27) {
|
|
|
+ jobName = String.format(j27, r.getMethodParamsValue());
|
|
|
+ } else if (r.getJobId() == 28) {
|
|
|
+ jobName = String.format(j28, r.getMethodParamsValue());
|
|
|
+ } else if (r.getJobId() == 29) {
|
|
|
+ String[] split = r.getMethodParamsValue().split(StrUtil.COMMA);
|
|
|
+ jobName = String.format(j29, split[0]);
|
|
|
+ } else if (r.getJobId() == 30) {
|
|
|
+ String[] split = r.getMethodParamsValue().split(StrUtil.COMMA);
|
|
|
+ jobName = String.format(j30, split[0], split[1]);
|
|
|
+ } else {
|
|
|
+ jobName = r.getJobName();
|
|
|
+ }
|
|
|
+ r.setJobName(jobName);
|
|
|
+
|
|
|
LocalDateTime createTime = r.getCreateTime();
|
|
|
String executeTime = r.getExecuteTime();
|
|
|
- int execTime = StrUtil.isBlank(executeTime)? 0 : Integer.parseInt(executeTime);
|
|
|
+ int execTime = StrUtil.isBlank(executeTime) ? 0 : Integer.parseInt(executeTime);
|
|
|
LocalDateTime plus = createTime.plus(execTime, ChronoUnit.MILLIS);
|
|
|
r.setEndTime(plus);
|
|
|
});
|