From 94be46d065691d45d95527d748d85d5496af6b79 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 26 八月 2021 18:03:33 +0800
Subject: [PATCH] fix 修复定时器工具编写错误问题

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index a931490..cdd7810 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -1,15 +1,17 @@
 package com.ruoyi.system.domain;
 
+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.convert.ExcelDictConvert;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -24,20 +26,21 @@
 @NoArgsConstructor
 @Accessors(chain = true)
 @TableName("sys_config")
-public class SysConfig {
+@ExcelIgnoreUnannotated
+public class SysConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
      * 鍙傛暟涓婚敭
      */
-    @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
+    @ExcelProperty(value = "鍙傛暟涓婚敭")
     @TableId(value = "config_id", type = IdType.AUTO)
     private Long configId;
 
     /**
      * 鍙傛暟鍚嶇О
      */
-    @Excel(name = "鍙傛暟鍚嶇О")
+    @ExcelProperty(value = "鍙傛暟鍚嶇О")
     @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
     private String configName;
@@ -45,7 +48,7 @@
     /**
      * 鍙傛暟閿悕
      */
-    @Excel(name = "鍙傛暟閿悕")
+    @ExcelProperty(value = "鍙傛暟閿悕")
     @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
     @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
     private String configKey;
@@ -53,7 +56,7 @@
     /**
      * 鍙傛暟閿��
      */
-    @Excel(name = "鍙傛暟閿��")
+    @ExcelProperty(value = "鍙傛暟閿��")
     @NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
     @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
     private String configValue;
@@ -61,31 +64,32 @@
     /**
      * 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
      */
-    @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄�,N=鍚�")
+    @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
+	@ExcelDictFormat(dictType = "sys_yes_no")
     private String configType;
 
     /**
      * 鍒涘缓鑰�
      */
+    @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
     /**
      * 鍒涘缓鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
      * 鏇存柊鑰�
      */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
     /**
      * 鏇存柊鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

--
Gitblit v1.9.3