From d69d1fbfe8412c7919f86a65166bc811508a17ca Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 四月 2021 17:49:56 +0800
Subject: [PATCH] update 更新任务调度模块 与 代码生成模块 MP lombok 化

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java |  214 +++++++++-------------------------------------------
 1 files changed, 39 insertions(+), 175 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index 0b9ffb9..e04d459 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -1,20 +1,34 @@
 package com.ruoyi.generator.domain;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 浠g爜鐢熸垚涓氬姟瀛楁琛� gen_table_column
  * 
  * @author ruoyi
  */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("gen_table_column")
 public class GenTableColumn extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 缂栧彿 */
+    @TableId(value = "column_id", type = IdType.AUTO)
     private Long columnId;
 
     /** 褰掑睘琛ㄧ紪鍙� */
@@ -69,89 +83,39 @@
     /** 鎺掑簭 */
     private Integer sort;
 
-    public void setColumnId(Long columnId)
-    {
-        this.columnId = columnId;
-    }
+    /**
+     * 鍒涘缓鑰�
+     */
+    private String createBy;
 
-    public Long getColumnId()
-    {
-        return columnId;
-    }
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
 
-    public void setTableId(Long tableId)
-    {
-        this.tableId = tableId;
-    }
+    /**
+     * 鏇存柊鑰�
+     */
+    private String updateBy;
 
-    public Long getTableId()
-    {
-        return tableId;
-    }
+    /**
+     * 鏇存柊鏃堕棿
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
 
-    public void setColumnName(String columnName)
-    {
-        this.columnName = columnName;
-    }
-
-    public String getColumnName()
-    {
-        return columnName;
-    }
-
-    public void setColumnComment(String columnComment)
-    {
-        this.columnComment = columnComment;
-    }
-
-    public String getColumnComment()
-    {
-        return columnComment;
-    }
-
-    public void setColumnType(String columnType)
-    {
-        this.columnType = columnType;
-    }
-
-    public String getColumnType()
-    {
-        return columnType;
-    }
-
-    public void setJavaType(String javaType)
-    {
-        this.javaType = javaType;
-    }
-
-    public String getJavaType()
-    {
-        return javaType;
-    }
-
-    public void setJavaField(String javaField)
-    {
-        this.javaField = javaField;
-    }
-
-    public String getJavaField()
-    {
-        return javaField;
-    }
+    /**
+     * 璇锋眰鍙傛暟
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
 
     public String getCapJavaField()
     {
         return StrUtil.upperFirst(javaField);
-    }
-
-    public void setIsPk(String isPk)
-    {
-        this.isPk = isPk;
-    }
-
-    public String getIsPk()
-    {
-        return isPk;
     }
 
     public boolean isPk()
@@ -164,16 +128,6 @@
         return isPk != null && StrUtil.equals("1", isPk);
     }
 
-    public String getIsIncrement()
-    {
-        return isIncrement;
-    }
-
-    public void setIsIncrement(String isIncrement)
-    {
-        this.isIncrement = isIncrement;
-    }
-
     public boolean isIncrement()
     {
         return isIncrement(this.isIncrement);
@@ -182,16 +136,6 @@
     public boolean isIncrement(String isIncrement)
     {
         return isIncrement != null && StrUtil.equals("1", isIncrement);
-    }
-
-    public void setIsRequired(String isRequired)
-    {
-        this.isRequired = isRequired;
-    }
-
-    public String getIsRequired()
-    {
-        return isRequired;
     }
 
     public boolean isRequired()
@@ -204,16 +148,6 @@
         return isRequired != null && StrUtil.equals("1", isRequired);
     }
 
-    public void setIsInsert(String isInsert)
-    {
-        this.isInsert = isInsert;
-    }
-
-    public String getIsInsert()
-    {
-        return isInsert;
-    }
-
     public boolean isInsert()
     {
         return isInsert(this.isInsert);
@@ -222,16 +156,6 @@
     public boolean isInsert(String isInsert)
     {
         return isInsert != null && StrUtil.equals("1", isInsert);
-    }
-
-    public void setIsEdit(String isEdit)
-    {
-        this.isEdit = isEdit;
-    }
-
-    public String getIsEdit()
-    {
-        return isEdit;
     }
 
     public boolean isEdit()
@@ -244,16 +168,6 @@
         return isEdit != null && StrUtil.equals("1", isEdit);
     }
 
-    public void setIsList(String isList)
-    {
-        this.isList = isList;
-    }
-
-    public String getIsList()
-    {
-        return isList;
-    }
-
     public boolean isList()
     {
         return isList(this.isList);
@@ -264,16 +178,6 @@
         return isList != null && StrUtil.equals("1", isList);
     }
 
-    public void setIsQuery(String isQuery)
-    {
-        this.isQuery = isQuery;
-    }
-
-    public String getIsQuery()
-    {
-        return isQuery;
-    }
-
     public boolean isQuery()
     {
         return isQuery(this.isQuery);
@@ -282,46 +186,6 @@
     public boolean isQuery(String isQuery)
     {
         return isQuery != null && StrUtil.equals("1", isQuery);
-    }
-
-    public void setQueryType(String queryType)
-    {
-        this.queryType = queryType;
-    }
-
-    public String getQueryType()
-    {
-        return queryType;
-    }
-
-    public String getHtmlType()
-    {
-        return htmlType;
-    }
-
-    public void setHtmlType(String htmlType)
-    {
-        this.htmlType = htmlType;
-    }
-
-    public void setDictType(String dictType)
-    {
-        this.dictType = dictType;
-    }
-
-    public String getDictType()
-    {
-        return dictType;
-    }
-
-    public void setSort(Integer sort)
-    {
-        this.sort = sort;
-    }
-
-    public Integer getSort()
-    {
-        return sort;
     }
 
     public boolean isSuperColumn()

--
Gitblit v1.9.3