From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
index b1c8941..416dced 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
@@ -1,11 +1,13 @@
package com.ruoyi.quartz.domain;
-import cn.hutool.core.util.StrUtil;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.annotation.Excel.ColumnType;
+import com.ruoyi.common.annotation.ExcelDictFormat;
import com.ruoyi.common.constant.ScheduleConstants;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.util.CronUtils;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -28,13 +30,14 @@
@NoArgsConstructor
@Accessors(chain = true)
@TableName("sys_job")
+@ExcelIgnoreUnannotated
public class SysJob implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 浠诲姟ID
*/
- @Excel(name = "浠诲姟搴忓彿", cellType = ColumnType.NUMERIC)
+ @ExcelProperty(value = "浠诲姟搴忓彿")
@TableId(value = "job_id", type = IdType.AUTO)
private Long jobId;
@@ -43,13 +46,14 @@
*/
@NotBlank(message = "浠诲姟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 64, message = "浠诲姟鍚嶇О涓嶈兘瓒呰繃64涓瓧绗�")
- @Excel(name = "浠诲姟鍚嶇О")
+ @ExcelProperty(value = "浠诲姟鍚嶇О")
private String jobName;
/**
* 浠诲姟缁勫悕
*/
- @Excel(name = "浠诲姟缁勫悕")
+ @ExcelProperty(value = "浠诲姟缁勫悕", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_job_group")
private String jobGroup;
/**
@@ -57,7 +61,7 @@
*/
@NotBlank(message = "璋冪敤鐩爣瀛楃涓蹭笉鑳戒负绌�")
@Size(min = 0, max = 500, message = "璋冪敤鐩爣瀛楃涓查暱搴︿笉鑳借秴杩�500涓瓧绗�")
- @Excel(name = "璋冪敤鐩爣瀛楃涓�")
+ @ExcelProperty(value = "璋冪敤鐩爣瀛楃涓�")
private String invokeTarget;
/**
@@ -65,25 +69,28 @@
*/
@NotBlank(message = "Cron鎵ц琛ㄨ揪寮忎笉鑳戒负绌�")
@Size(min = 0, max = 255, message = "Cron鎵ц琛ㄨ揪寮忎笉鑳借秴杩�255涓瓧绗�")
- @Excel(name = "鎵ц琛ㄨ揪寮� ")
+ @ExcelProperty(value = "鎵ц琛ㄨ揪寮�")
private String cronExpression;
/**
* cron璁″垝绛栫暐
*/
- @Excel(name = "璁″垝绛栫暐 ", readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓�娆℃墽琛�,3=涓嶈Е鍙戠珛鍗虫墽琛�")
- private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
+ @ExcelProperty(value = "璁″垝绛栫暐 ", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(readConverterExp = "0=榛樿,1=绔嬪嵆瑙﹀彂鎵ц,2=瑙﹀彂涓�娆℃墽琛�,3=涓嶈Е鍙戠珛鍗虫墽琛�")
+ private String misfirePolicy = ScheduleConstants.MISFIRE_DEFAULT;
/**
* 鏄惁骞跺彂鎵ц锛�0鍏佽 1绂佹锛�
*/
- @Excel(name = "骞跺彂鎵ц", readConverterExp = "0=鍏佽,1=绂佹")
+ @ExcelProperty(value = "骞跺彂鎵ц", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(readConverterExp = "0=鍏佽,1=绂佹")
private String concurrent;
/**
* 浠诲姟鐘舵�侊紙0姝ｅ父 1鏆傚仠锛�
*/
- @Excel(name = "浠诲姟鐘舵��", readConverterExp = "0=姝ｅ父,1=鏆傚仠")
+ @ExcelProperty(value = "浠诲姟鐘舵��", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_job_status")
private String status;
/**
@@ -96,7 +103,6 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -109,7 +115,6 @@
* 鏇存柊鏃堕棿
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
@@ -125,7 +130,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
public Date getNextValidTime() {
- if (StrUtil.isNotEmpty(cronExpression)) {
+ if (StringUtils.isNotEmpty(cronExpression)) {
return CronUtils.getNextExecution(cronExpression);
}
return null;
--
Gitblit v1.9.3