From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java | 238 ++++++++++++++++++++--------------------------------------
1 files changed, 83 insertions(+), 155 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
index 63c4cd6..5e09c80 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java
@@ -1,155 +1,83 @@
-package com.ruoyi.quartz.domain;
-
-import java.util.Date;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-
-/**
- * 瀹氭椂浠诲姟璋冨害鏃ュ織琛� sys_job_log
- *
- * @author ruoyi
- */
-public class SysJobLog extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** ID */
- @Excel(name = "鏃ュ織搴忓彿")
- private Long jobLogId;
-
- /** 浠诲姟鍚嶇О */
- @Excel(name = "浠诲姟鍚嶇О")
- private String jobName;
-
- /** 浠诲姟缁勫悕 */
- @Excel(name = "浠诲姟缁勫悕")
- private String jobGroup;
-
- /** 璋冪敤鐩爣瀛楃涓� */
- @Excel(name = "璋冪敤鐩爣瀛楃涓�")
- private String invokeTarget;
-
- /** 鏃ュ織淇℃伅 */
- @Excel(name = "鏃ュ織淇℃伅")
- private String jobMessage;
-
- /** 鎵ц鐘舵�侊紙0姝ｅ父 1澶辫触锛� */
- @Excel(name = "鎵ц鐘舵��", readConverterExp = "0=姝ｅ父,1=澶辫触")
- private String status;
-
- /** 寮傚父淇℃伅 */
- @Excel(name = "寮傚父淇℃伅")
- private String exceptionInfo;
-
- /** 寮�濮嬫椂闂� */
- private Date startTime;
-
- /** 鍋滄鏃堕棿 */
- private Date stopTime;
-
- public Long getJobLogId()
- {
- return jobLogId;
- }
-
- public void setJobLogId(Long jobLogId)
- {
- this.jobLogId = jobLogId;
- }
-
- public String getJobName()
- {
- return jobName;
- }
-
- public void setJobName(String jobName)
- {
- this.jobName = jobName;
- }
-
- public String getJobGroup()
- {
- return jobGroup;
- }
-
- public void setJobGroup(String jobGroup)
- {
- this.jobGroup = jobGroup;
- }
-
- public String getInvokeTarget()
- {
- return invokeTarget;
- }
-
- public void setInvokeTarget(String invokeTarget)
- {
- this.invokeTarget = invokeTarget;
- }
-
- public String getJobMessage()
- {
- return jobMessage;
- }
-
- public void setJobMessage(String jobMessage)
- {
- this.jobMessage = jobMessage;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getExceptionInfo()
- {
- return exceptionInfo;
- }
-
- public void setExceptionInfo(String exceptionInfo)
- {
- this.exceptionInfo = exceptionInfo;
- }
-
- public Date getStartTime()
- {
- return startTime;
- }
-
- public void setStartTime(Date startTime)
- {
- this.startTime = startTime;
- }
-
- public Date getStopTime()
- {
- return stopTime;
- }
-
- public void setStopTime(Date stopTime)
- {
- this.stopTime = stopTime;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("jobLogId", getJobLogId())
- .append("jobName", getJobName())
- .append("jobGroup", getJobGroup())
- .append("jobMessage", getJobMessage())
- .append("status", getStatus())
- .append("exceptionInfo", getExceptionInfo())
- .append("startTime", getStartTime())
- .append("stopTime", getStopTime())
- .toString();
- }
-}
+package com.ruoyi.quartz.domain;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 瀹氭椂浠诲姟璋冨害鏃ュ織琛� sys_job_log
+ *
+ * @deprecated 3.5.0鍒犻櫎 杩佺Щ鑷硏xl-job
+ * @author ruoyi
+ */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("sys_job_log")
+@ExcelIgnoreUnannotated
+public class SysJobLog
+{
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ @ExcelProperty(value = "鏃ュ織搴忓彿")
+ @TableId(value = "job_log_id", type = IdType.AUTO)
+ private Long jobLogId;
+
+ /** 浠诲姟鍚嶇О */
+ @ExcelProperty(value = "浠诲姟鍚嶇О")
+ private String jobName;
+
+ /** 浠诲姟缁勫悕 */
+ @ExcelProperty(value = "浠诲姟缁勫悕", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_job_group")
+ private String jobGroup;
+
+ /** 璋冪敤鐩爣瀛楃涓� */
+ @ExcelProperty(value = "璋冪敤鐩爣瀛楃涓�")
+ private String invokeTarget;
+
+ /** 鏃ュ織淇℃伅 */
+ @ExcelProperty(value = "鏃ュ織淇℃伅")
+ private String jobMessage;
+
+ /** 鎵ц鐘舵�侊紙0姝ｅ父 1澶辫触锛� */
+ @ExcelProperty(value = "鎵ц鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_common_status")
+ private String status;
+
+ /** 寮傚父淇℃伅 */
+ @ExcelProperty(value = "寮傚父淇℃伅")
+ private String exceptionInfo;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @TableField(fill = FieldFill.INSERT)
+ private Date createTime;
+
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
+ /** 寮�濮嬫椂闂� */
+ @TableField(exist = false)
+ private Date startTime;
+
+ /** 鍋滄鏃堕棿 */
+ @TableField(exist = false)
+ private Date stopTime;
+
+}
--
Gitblit v1.9.3