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-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java | 67 ++++++++++-----------------------
1 files changed, 21 insertions(+), 46 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 92ba7a9..8c08d54 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,34 +1,33 @@
package com.ruoyi.generator.domain;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
* 浠ｇ爜鐢熸垚涓氬姟瀛楁琛� gen_table_column
*
- * @author ruoyi
+ * @author Lion Li
*/
@Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("gen_table_column")
-public class GenTableColumn implements Serializable {
- private static final long serialVersionUID = 1L;
+public class GenTableColumn extends BaseEntity {
/**
* 缂栧彿
*/
- @TableId(value = "column_id", type = IdType.AUTO)
+ @TableId(value = "column_id")
private Long columnId;
/**
@@ -44,6 +43,7 @@
/**
* 鍒楁弿杩�
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String columnComment;
/**
@@ -65,36 +65,43 @@
/**
* 鏄惁涓婚敭锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isPk;
/**
* 鏄惁鑷锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isIncrement;
/**
* 鏄惁蹇呭～锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isRequired;
/**
* 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isInsert;
/**
* 鏄惁缂栬緫瀛楁锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isEdit;
/**
* 鏄惁鍒楄〃瀛楁锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isList;
/**
* 鏄惁鏌ヨ瀛楁锛�1鏄級
*/
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String isQuery;
/**
@@ -116,38 +123,6 @@
* 鎺掑簭
*/
private Integer sort;
-
- /**
- * 鍒涘缓鑰�
- */
- @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;
-
- /**
- * 璇锋眰鍙傛暟
- */
- @TableField(exist = false)
- private Map<String, Object> params = new HashMap<>();
public String getCapJavaField() {
return StringUtils.uncapitalize(javaField);
@@ -216,9 +191,9 @@
public static boolean isSuperColumn(String javaField) {
return StringUtils.equalsAnyIgnoreCase(javaField,
// BaseEntity
- "createBy", "createTime", "updateBy", "updateTime", "remark",
+ "createBy", "createTime", "updateBy", "updateTime",
// TreeEntity
- "parentName", "parentId", "orderNum", "ancestors");
+ "parentName", "parentId");
}
public boolean isUsableColumn() {
--
Gitblit v1.9.3