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 | 245 +++++++++++--------------------------------------
1 files changed, 55 insertions(+), 190 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 d1733b6..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,19 +1,34 @@
package com.ruoyi.generator.domain;
-import javax.validation.constraints.NotBlank;
+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 com.ruoyi.common.utils.StringUtils;
+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;
/**
* 浠ｇ爜鐢熸垚涓氬姟瀛楁琛� 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;
/** 褰掑睘琛ㄧ紪鍙� */
@@ -68,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 StringUtils.capitalize(javaField);
- }
-
- public void setIsPk(String isPk)
- {
- this.isPk = isPk;
- }
-
- public String getIsPk()
- {
- return isPk;
+ return StrUtil.upperFirst(javaField);
}
public boolean isPk()
@@ -160,17 +125,7 @@
public boolean isPk(String isPk)
{
- return isPk != null && StringUtils.equals("1", isPk);
- }
-
- public String getIsIncrement()
- {
- return isIncrement;
- }
-
- public void setIsIncrement(String isIncrement)
- {
- this.isIncrement = isIncrement;
+ return isPk != null && StrUtil.equals("1", isPk);
}
public boolean isIncrement()
@@ -180,17 +135,7 @@
public boolean isIncrement(String isIncrement)
{
- return isIncrement != null && StringUtils.equals("1", isIncrement);
- }
-
- public void setIsRequired(String isRequired)
- {
- this.isRequired = isRequired;
- }
-
- public String getIsRequired()
- {
- return isRequired;
+ return isIncrement != null && StrUtil.equals("1", isIncrement);
}
public boolean isRequired()
@@ -200,17 +145,7 @@
public boolean isRequired(String isRequired)
{
- return isRequired != null && StringUtils.equals("1", isRequired);
- }
-
- public void setIsInsert(String isInsert)
- {
- this.isInsert = isInsert;
- }
-
- public String getIsInsert()
- {
- return isInsert;
+ return isRequired != null && StrUtil.equals("1", isRequired);
}
public boolean isInsert()
@@ -220,17 +155,7 @@
public boolean isInsert(String isInsert)
{
- return isInsert != null && StringUtils.equals("1", isInsert);
- }
-
- public void setIsEdit(String isEdit)
- {
- this.isEdit = isEdit;
- }
-
- public String getIsEdit()
- {
- return isEdit;
+ return isInsert != null && StrUtil.equals("1", isInsert);
}
public boolean isEdit()
@@ -240,17 +165,7 @@
public boolean isEdit(String isEdit)
{
- return isEdit != null && StringUtils.equals("1", isEdit);
- }
-
- public void setIsList(String isList)
- {
- this.isList = isList;
- }
-
- public String getIsList()
- {
- return isList;
+ return isEdit != null && StrUtil.equals("1", isEdit);
}
public boolean isList()
@@ -260,17 +175,7 @@
public boolean isList(String isList)
{
- return isList != null && StringUtils.equals("1", isList);
- }
-
- public void setIsQuery(String isQuery)
- {
- this.isQuery = isQuery;
- }
-
- public String getIsQuery()
- {
- return isQuery;
+ return isList != null && StrUtil.equals("1", isList);
}
public boolean isQuery()
@@ -280,47 +185,7 @@
public boolean isQuery(String isQuery)
{
- return isQuery != null && StringUtils.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;
+ return isQuery != null && StrUtil.equals("1", isQuery);
}
public boolean isSuperColumn()
@@ -330,7 +195,7 @@
public static boolean isSuperColumn(String javaField)
{
- return StringUtils.equalsAnyIgnoreCase(javaField,
+ return StrUtil.equalsAnyIgnoreCase(javaField,
// BaseEntity
"createBy", "createTime", "updateBy", "updateTime", "remark",
// TreeEntity
@@ -345,18 +210,18 @@
public static boolean isUsableColumn(String javaField)
{
// isSuperColumn()涓殑鍚嶅崟鐢ㄤ簬閬垮厤鐢熸垚澶氫綑Domain灞炴�э紝鑻ユ煇浜涘睘鎬у湪鐢熸垚椤甸潰鏃堕渶瑕佺敤鍒颁笉鑳藉拷鐣ワ紝鍒欐斁鍦ㄦ澶勭櫧鍚嶅崟
- return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+ return StrUtil.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
}
public String readConverterExp()
{
- String remarks = StringUtils.substringBetween(this.columnComment, "锛�", "锛�");
+ String remarks = StrUtil.subBetween(this.columnComment, "锛�", "锛�");
StringBuffer sb = new StringBuffer();
- if (StringUtils.isNotEmpty(remarks))
+ if (StrUtil.isNotEmpty(remarks))
{
for (String value : remarks.split(" "))
{
- if (StringUtils.isNotEmpty(value))
+ if (StrUtil.isNotEmpty(value))
{
Object startStr = value.subSequence(0, 1);
String endStr = value.substring(1);
--
Gitblit v1.9.3