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-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 76 ++++++++++++++------------------------
1 files changed, 28 insertions(+), 48 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..3b9fce0 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,43 +1,48 @@
package com.ruoyi.system.domain;
-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.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* 鍙傛暟閰嶇疆琛� sys_config
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("sys_config")
-public class SysConfig {
- private static final long serialVersionUID = 1L;
+@ExcelIgnoreUnannotated
+@ApiModel("鍙傛暟閰嶇疆涓氬姟瀵硅薄")
+public class SysConfig extends BaseEntity {
/**
* 鍙傛暟涓婚敭
*/
- @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
- @TableId(value = "config_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "鍙傛暟涓婚敭")
+ @ExcelProperty(value = "鍙傛暟涓婚敭")
+ @TableId(value = "config_id")
private Long configId;
/**
* 鍙傛暟鍚嶇О
*/
- @Excel(name = "鍙傛暟鍚嶇О")
+ @ApiModelProperty(value = "鍙傛暟鍚嶇О")
+ @ExcelProperty(value = "鍙傛暟鍚嶇О")
@NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
private String configName;
@@ -45,7 +50,8 @@
/**
* 鍙傛暟閿悕
*/
- @Excel(name = "鍙傛暟閿悕")
+ @ApiModelProperty(value = "鍙傛暟閿悕")
+ @ExcelProperty(value = "鍙傛暟閿悕")
@NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
@Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
private String configKey;
@@ -53,7 +59,8 @@
/**
* 鍙傛暟閿��
*/
- @Excel(name = "鍙傛暟閿��")
+ @ApiModelProperty(value = "鍙傛暟閿��")
+ @ExcelProperty(value = "鍙傛暟閿��")
@NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
@Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
private String configValue;
@@ -61,42 +68,15 @@
/**
* 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
*/
- @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄�,N=鍚�")
+ @ApiModelProperty(value = "绯荤粺鍐呯疆锛圷鏄� N鍚︼級")
+ @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
+ @ExcelDictFormat(dictType = "sys_yes_no")
private String configType;
-
- /**
- * 鍒涘缓鑰�
- */
- private String createBy;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鏇存柊鑰�
- */
- private String updateBy;
-
- /**
- * 鏇存柊鏃堕棿
- */
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
/**
* 澶囨敞
*/
+ @ApiModelProperty(value = "澶囨敞")
private String remark;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
}
--
Gitblit v1.9.3