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/GenTable.java | 260 ++++++++++++++++++---------------------------------
1 files changed, 94 insertions(+), 166 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
index fd3ee83..53f9f64 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
@@ -1,23 +1,37 @@
package com.ruoyi.generator.domain;
-import java.util.List;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.constant.GenConstants;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.ArrayUtils;
+
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
-import com.ruoyi.common.constant.GenConstants;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.utils.StringUtils;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 涓氬姟琛� gen_table
*
* @author ruoyi
*/
-public class GenTable extends BaseEntity
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("gen_table")
+public class GenTable
{
private static final long serialVersionUID = 1L;
/** 缂栧彿 */
+ @TableId(value = "table_id", type = IdType.AUTO)
private Long tableId;
/** 琛ㄥ悕绉� */
@@ -28,11 +42,17 @@
@NotBlank(message = "琛ㄦ弿杩颁笉鑳戒负绌�")
private String tableComment;
+ /** 鍏宠仈鐖惰〃鐨勮〃鍚� */
+ private String subTableName;
+
+ /** 鏈〃鍏宠仈鐖惰〃鐨勫閿悕 */
+ private String subTableFkName;
+
/** 瀹炰綋绫诲悕绉�(棣栧瓧姣嶅ぇ鍐�) */
@NotBlank(message = "瀹炰綋绫诲悕绉颁笉鑳戒负绌�")
private String className;
- /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔锛� */
+ /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級 */
private String tplCategory;
/** 鐢熸垚鍖呰矾寰� */
@@ -55,183 +75,91 @@
@NotBlank(message = "浣滆�呬笉鑳戒负绌�")
private String functionAuthor;
+ /** 鐢熸垚浠ｇ爜鏂瑰紡锛�0zip鍘嬬缉鍖� 1鑷畾涔夎矾寰勶級 */
+ private String genType;
+
+ /** 鐢熸垚璺緞锛堜笉濉粯璁ら」鐩矾寰勶級 */
+ private String genPath;
+
/** 涓婚敭淇℃伅 */
+ @TableField(exist = false)
private GenTableColumn pkColumn;
+
+ /** 瀛愯〃淇℃伅 */
+ @TableField(exist = false)
+ private GenTable subTable;
/** 琛ㄥ垪淇℃伅 */
@Valid
+ @TableField(exist = false)
private List<GenTableColumn> columns;
/** 鍏跺畠鐢熸垚閫夐」 */
private String options;
+ /**
+ * 鍒涘缓鑰�
+ */
+ 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;
+
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+ /**
+ * 璇锋眰鍙傛暟
+ */
+ @TableField(exist = false)
+ private Map<String, Object> params = new HashMap<>();
+
/** 鏍戠紪鐮佸瓧娈� */
+ @TableField(exist = false)
private String treeCode;
/** 鏍戠埗缂栫爜瀛楁 */
+ @TableField(exist = false)
private String treeParentCode;
/** 鏍戝悕绉板瓧娈� */
+ @TableField(exist = false)
private String treeName;
- public Long getTableId()
+ /** 涓婄骇鑿滃崟ID瀛楁 */
+ @TableField(exist = false)
+ private String parentMenuId;
+
+ /** 涓婄骇鑿滃崟鍚嶇О瀛楁 */
+ @TableField(exist = false)
+ private String parentMenuName;
+
+ public boolean isSub()
{
- return tableId;
+ return isSub(this.tplCategory);
}
- public void setTableId(Long tableId)
+ public static boolean isSub(String tplCategory)
{
- this.tableId = tableId;
- }
-
- public String getTableName()
- {
- return tableName;
- }
-
- public void setTableName(String tableName)
- {
- this.tableName = tableName;
- }
-
- public String getTableComment()
- {
- return tableComment;
- }
-
- public void setTableComment(String tableComment)
- {
- this.tableComment = tableComment;
- }
-
- public String getClassName()
- {
- return className;
- }
-
- public void setClassName(String className)
- {
- this.className = className;
- }
-
- public String getTplCategory()
- {
- return tplCategory;
- }
-
- public void setTplCategory(String tplCategory)
- {
- this.tplCategory = tplCategory;
- }
-
- public String getPackageName()
- {
- return packageName;
- }
-
- public void setPackageName(String packageName)
- {
- this.packageName = packageName;
- }
-
- public String getModuleName()
- {
- return moduleName;
- }
-
- public void setModuleName(String moduleName)
- {
- this.moduleName = moduleName;
- }
-
- public String getBusinessName()
- {
- return businessName;
- }
-
- public void setBusinessName(String businessName)
- {
- this.businessName = businessName;
- }
-
- public String getFunctionName()
- {
- return functionName;
- }
-
- public void setFunctionName(String functionName)
- {
- this.functionName = functionName;
- }
-
- public String getFunctionAuthor()
- {
- return functionAuthor;
- }
-
- public void setFunctionAuthor(String functionAuthor)
- {
- this.functionAuthor = functionAuthor;
- }
-
- public GenTableColumn getPkColumn()
- {
- return pkColumn;
- }
-
- public void setPkColumn(GenTableColumn pkColumn)
- {
- this.pkColumn = pkColumn;
- }
-
- public List<GenTableColumn> getColumns()
- {
- return columns;
- }
-
- public void setColumns(List<GenTableColumn> columns)
- {
- this.columns = columns;
- }
-
- public String getOptions()
- {
- return options;
- }
-
- public void setOptions(String options)
- {
- this.options = options;
- }
-
- public String getTreeCode()
- {
- return treeCode;
- }
-
- public void setTreeCode(String treeCode)
- {
- this.treeCode = treeCode;
- }
-
- public String getTreeParentCode()
- {
- return treeParentCode;
- }
-
- public void setTreeParentCode(String treeParentCode)
- {
- this.treeParentCode = treeParentCode;
- }
-
- public String getTreeName()
- {
- return treeName;
- }
-
- public void setTreeName(String treeName)
- {
- this.treeName = treeName;
+ return tplCategory != null && StrUtil.equals(GenConstants.TPL_SUB, tplCategory);
}
public boolean isTree()
@@ -241,7 +169,7 @@
public static boolean isTree(String tplCategory)
{
- return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+ return tplCategory != null && StrUtil.equals(GenConstants.TPL_TREE, tplCategory);
}
public boolean isCrud()
@@ -251,7 +179,7 @@
public static boolean isCrud(String tplCategory)
{
- return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+ return tplCategory != null && StrUtil.equals(GenConstants.TPL_CRUD, tplCategory);
}
public boolean isSuperColumn(String javaField)
@@ -263,9 +191,9 @@
{
if (isTree(tplCategory))
{
- return StringUtils.equalsAnyIgnoreCase(javaField,
+ return StrUtil.equalsAnyIgnoreCase(javaField,
ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
- return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+ return StrUtil.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3