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/SysPost.java |   79 +++++++++++++++------------------------
 1 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
index 5957ed9..b0b8a11 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -1,44 +1,49 @@
 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.TableField;
+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.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 宀椾綅琛� sys_post
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_post")
-public class SysPost implements Serializable {
-    private static final long serialVersionUID = 1L;
+@ExcelIgnoreUnannotated
+@ApiModel("宀椾綅淇℃伅涓氬姟瀵硅薄")
+public class SysPost extends BaseEntity {
 
     /**
      * 宀椾綅搴忓彿
      */
-    @Excel(name = "宀椾綅搴忓彿", cellType = ColumnType.NUMERIC)
-    @TableId(value = "post_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "宀椾綅搴忓彿")
+    @ExcelProperty(value = "宀椾綅搴忓彿")
+    @TableId(value = "post_id")
     private Long postId;
 
     /**
      * 宀椾綅缂栫爜
      */
-    @Excel(name = "宀椾綅缂栫爜")
+    @ApiModelProperty(value = "宀椾綅缂栫爜")
+    @ExcelProperty(value = "宀椾綅缂栫爜")
     @NotBlank(message = "宀椾綅缂栫爜涓嶈兘涓虹┖")
     @Size(min = 0, max = 64, message = "宀椾綅缂栫爜闀垮害涓嶈兘瓒呰繃64涓瓧绗�")
     private String postCode;
@@ -46,7 +51,8 @@
     /**
      * 宀椾綅鍚嶇О
      */
-    @Excel(name = "宀椾綅鍚嶇О")
+    @ApiModelProperty(value = "宀椾綅鍚嶇О")
+    @ExcelProperty(value = "宀椾綅鍚嶇О")
     @NotBlank(message = "宀椾綅鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 50, message = "宀椾綅鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
     private String postName;
@@ -54,54 +60,29 @@
     /**
      * 宀椾綅鎺掑簭
      */
-    @Excel(name = "宀椾綅鎺掑簭")
+    @ApiModelProperty(value = "宀椾綅鎺掑簭")
+    @ExcelProperty(value = "宀椾綅鎺掑簭")
     @NotBlank(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
     private String postSort;
 
     /**
      * 鐘舵�侊紙0姝e父 1鍋滅敤锛�
      */
-    @Excel(name = "鐘舵��", readConverterExp = "0=姝e父,1=鍋滅敤")
+    @ApiModelProperty(value = "鐘舵�侊紙0姝e父 1鍋滅敤锛�")
+	@ExcelProperty(value = "鐘舵��", converter = ExcelDictConvert.class)
+	@ExcelDictFormat(dictType = "sys_common_status")
     private String status;
-
-    /**
-     * 鍒涘缓鑰�
-     */
-    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<>();
 
     /**
      * 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�
      */
+    @ApiModelProperty(value = "鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦�")
     @TableField(exist = false)
     private boolean flag = false;
 

--
Gitblit v1.9.3