From 7546ef649ca48075febbccdc6860a51b4ff5fc33 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 25 十一月 2021 19:14:52 +0800
Subject: [PATCH] update springboot 2.5.6 => 2.5.7
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 322 +++++++++++++++++++++--------------------------------
1 files changed, 127 insertions(+), 195 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..252f32c 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,268 +1,200 @@
package com.ruoyi.generator.domain;
-import java.util.List;
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import org.apache.commons.lang3.ArrayUtils;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.common.utils.StringUtils;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.ArrayUtils;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import java.util.List;
/**
* 涓氬姟琛� gen_table
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
-public class GenTable extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
- /** 缂栧彿 */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("gen_table")
+public class GenTable extends BaseEntity {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId(value = "table_id")
private Long tableId;
- /** 琛ㄥ悕绉� */
+ /**
+ * 琛ㄥ悕绉�
+ */
@NotBlank(message = "琛ㄥ悕绉颁笉鑳戒负绌�")
private String tableName;
- /** 琛ㄦ弿杩� */
+ /**
+ * 琛ㄦ弿杩�
+ */
@NotBlank(message = "琛ㄦ弿杩颁笉鑳戒负绌�")
private String tableComment;
- /** 瀹炰綋绫诲悕绉�(棣栧瓧姣嶅ぇ鍐�) */
+ /**
+ * 鍏宠仈鐖惰〃鐨勮〃鍚�
+ */
+ private String subTableName;
+
+ /**
+ * 鏈〃鍏宠仈鐖惰〃鐨勫閿悕
+ */
+ private String subTableFkName;
+
+ /**
+ * 瀹炰綋绫诲悕绉�(棣栧瓧姣嶅ぇ鍐�)
+ */
@NotBlank(message = "瀹炰綋绫诲悕绉颁笉鑳戒负绌�")
private String className;
- /** 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔锛� */
+ /**
+ * 浣跨敤鐨勬ā鏉匡紙crud鍗曡〃鎿嶄綔 tree鏍戣〃鎿嶄綔 sub涓诲瓙琛ㄦ搷浣滐級
+ */
private String tplCategory;
- /** 鐢熸垚鍖呰矾寰� */
+ /**
+ * 鐢熸垚鍖呰矾寰�
+ */
@NotBlank(message = "鐢熸垚鍖呰矾寰勪笉鑳戒负绌�")
private String packageName;
- /** 鐢熸垚妯″潡鍚� */
+ /**
+ * 鐢熸垚妯″潡鍚�
+ */
@NotBlank(message = "鐢熸垚妯″潡鍚嶄笉鑳戒负绌�")
private String moduleName;
- /** 鐢熸垚涓氬姟鍚� */
+ /**
+ * 鐢熸垚涓氬姟鍚�
+ */
@NotBlank(message = "鐢熸垚涓氬姟鍚嶄笉鑳戒负绌�")
private String businessName;
- /** 鐢熸垚鍔熻兘鍚� */
+ /**
+ * 鐢熸垚鍔熻兘鍚�
+ */
@NotBlank(message = "鐢熸垚鍔熻兘鍚嶄笉鑳戒负绌�")
private String functionName;
- /** 鐢熸垚浣滆�� */
+ /**
+ * 鐢熸垚浣滆��
+ */
@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 remark;
+
+ /**
+ * 鏍戠紪鐮佸瓧娈�
+ */
+ @TableField(exist = false)
private String treeCode;
- /** 鏍戠埗缂栫爜瀛楁 */
+ /**
+ * 鏍戠埗缂栫爜瀛楁
+ */
+ @TableField(exist = false)
private String treeParentCode;
- /** 鏍戝悕绉板瓧娈� */
+ /**
+ * 鏍戝悕绉板瓧娈�
+ */
+ @TableField(exist = false)
private String treeName;
- public Long getTableId()
- {
- return tableId;
+ /**
+ * 涓婄骇鑿滃崟ID瀛楁
+ */
+ @TableField(exist = false)
+ private String parentMenuId;
+
+ /**
+ * 涓婄骇鑿滃崟鍚嶇О瀛楁
+ */
+ @TableField(exist = false)
+ private String parentMenuName;
+
+ public boolean isSub() {
+ return isSub(this.tplCategory);
}
- public void setTableId(Long tableId)
- {
- this.tableId = tableId;
+ public static boolean isSub(String tplCategory) {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
}
- 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;
- }
-
- public boolean isTree()
- {
+ public boolean isTree() {
return isTree(this.tplCategory);
}
- public static boolean isTree(String tplCategory)
- {
+ public static boolean isTree(String tplCategory) {
return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
}
- public boolean isCrud()
- {
+ public boolean isCrud() {
return isCrud(this.tplCategory);
}
- public static boolean isCrud(String tplCategory)
- {
+ public static boolean isCrud(String tplCategory) {
return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
}
- public boolean isSuperColumn(String javaField)
- {
+ public boolean isSuperColumn(String javaField) {
return isSuperColumn(this.tplCategory, javaField);
}
- public static boolean isSuperColumn(String tplCategory, String javaField)
- {
- if (isTree(tplCategory))
- {
+ public static boolean isSuperColumn(String tplCategory, String javaField) {
+ if (isTree(tplCategory)) {
return StringUtils.equalsAnyIgnoreCase(javaField,
ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
--
Gitblit v1.9.3