From 56a943bf48e204f24d0e1bbbf2cb7e82f3eb2662 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 24 五月 2021 11:24:54 +0800
Subject: [PATCH] 升级druid到最新版本v1.2.6
---
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 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 aa05e70..2abb94f 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
@@ -28,11 +28,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,8 +61,17 @@
@NotBlank(message = "作者不能为空")
private String functionAuthor;
+ /** 生成代码方式（0zip压缩包 1自定义路径） */
+ private String genType;
+
+ /** 生成路径（不填默认项目路径） */
+ private String genPath;
+
/** 主键信息 */
private GenTableColumn pkColumn;
+
+ /** 子表信息 */
+ private GenTable subTable;
/** 表列信息 */
@Valid
@@ -108,6 +123,26 @@
public void setTableComment(String tableComment)
{
this.tableComment = tableComment;
+ }
+
+ public String getSubTableName()
+ {
+ return subTableName;
+ }
+
+ public void setSubTableName(String subTableName)
+ {
+ this.subTableName = subTableName;
+ }
+
+ public String getSubTableFkName()
+ {
+ return subTableFkName;
+ }
+
+ public void setSubTableFkName(String subTableFkName)
+ {
+ this.subTableFkName = subTableFkName;
}
public String getClassName()
@@ -180,6 +215,26 @@
this.functionAuthor = functionAuthor;
}
+ public String getGenType()
+ {
+ return genType;
+ }
+
+ public void setGenType(String genType)
+ {
+ this.genType = genType;
+ }
+
+ public String getGenPath()
+ {
+ return genPath;
+ }
+
+ public void setGenPath(String genPath)
+ {
+ this.genPath = genPath;
+ }
+
public GenTableColumn getPkColumn()
{
return pkColumn;
@@ -188,6 +243,16 @@
public void setPkColumn(GenTableColumn pkColumn)
{
this.pkColumn = pkColumn;
+ }
+
+ public GenTable getSubTable()
+ {
+ return subTable;
+ }
+
+ public void setSubTable(GenTable subTable)
+ {
+ this.subTable = subTable;
}
public List<GenTableColumn> getColumns()
@@ -260,6 +325,16 @@
this.parentMenuName = parentMenuName;
}
+ public boolean isSub()
+ {
+ return isSub(this.tplCategory);
+ }
+
+ public static boolean isSub(String tplCategory)
+ {
+ return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
+ }
+
public boolean isTree()
{
return isTree(this.tplCategory);
--
Gitblit v1.9.2