feat: 日志条件查询

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/controller/SysJobLogController.java

@@ -17,6 +17,8 @@
 
 package com.qunzhixinxi.hnqz.daemon.quartz.controller;
 
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qunzhixinxi.hnqz.common.core.util.R;
@@ -44,14 +46,24 @@ public class SysJobLogController {
 
 	/**
 	 * 分页查询
-	 * @param page 分页对象
+	 *
+	 * @param page      分页对象
 	 * @param sysJobLog 定时任务执行日志表
 	 * @return
 	 */
 	@GetMapping("/page")
 	@ApiOperation(value = "分页定时任务日志查询")
 	public R getSysJobLogPage(Page page, SysJobLog sysJobLog) {
-		return R.ok(sysJobLogService.page(page, Wrappers.query(sysJobLog)));
+
+
+		sysJobLogService.page(page, Wrappers.<SysJobLog>lambdaQuery()
+				.in(SysJobLog::getJobId, 27, 28, 29, 30)
+				.like(StrUtil.isNotBlank(sysJobLog.getJobName()), SysJobLog::getJobName, sysJobLog.getJobName())
+				.like(StrUtil.isNotBlank(sysJobLog.getJobMessage()), SysJobLog::getJobMessage, sysJobLog.getJobMessage())
+				.between(sysJobLog.getStartTime() != null && sysJobLog.getEndTime() != null, SysJobLog::getCreateTime, sysJobLog.getStartTime(), sysJobLog.getEndTime())
+		);
+
+		return R.ok(page);
 	}
 
 }

hnqz-visual/hnqz-daemon-quartz/src/main/java/com/qunzhixinxi/hnqz/daemon/quartz/entity/SysJobLog.java

@@ -18,6 +18,7 @@
 package com.qunzhixinxi.hnqz.daemon.quartz.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
@@ -129,4 +130,16 @@ public class SysJobLog extends Model<SysJobLog> {
 	 */
 	private Integer tenantId;
 
+	/**
+	 * 查询时间
+	 */
+	@TableField(exist = false)
+	private LocalDateTime startTime;
+
+	/**
+	 * 查询时间
+	 */
+	@TableField(exist = false)
+	private LocalDateTime endTime;
+
 }