From 4d475a7941639a8417bcbbc40b82d0c123c4f5b2 Mon Sep 17 00:00:00 2001
From: sxile <3440626@qq.com>
Date: Tue, 12 Nov 2019 13:33:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E6=A0=B9=E6=8D=AE=E6=A8=A1=E6=9D=BF=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=88=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/constant/GenConstants.java   | 11 +++++++++++
 .../java/com/ruoyi/generator/domain/GenTable.java | 15 +++++++++++++++
 .../src/main/resources/vm/java/domain.java.vm     |  6 +++---
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 2b90ccd..e372316 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -1,5 +1,10 @@
 package com.ruoyi.common.constant;
 
+/**
+ * 代码生成通用常量
+ *
+ * @author ruoyi
+ */
 public class GenConstants
 {
     /** 单表（增删改查） */
@@ -39,6 +44,12 @@ public class GenConstants
     public static final String[] COLUMNNAME_NOT_QUERY = { "id", "create_by", "create_time", "del_flag", "update_by",
             "update_time", "remark" };
 
+    /** Entity基类字段 */
+    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+
+    /** Tree基类字段 */
+    public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };
+
     /** 文本框 */
     public static final String HTML_INPUT = "input";
 
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 e606e27..cd3f73d 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
@@ -252,4 +252,19 @@ public class GenTable extends BaseEntity
     {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
     }
+
+
+    public boolean isSuperColumn(String javaField)
+    {
+        return isSuperColumn(this.tplCategory, javaField);
+    }
+
+    public static boolean isSuperColumn(String tplCategory, String javaField)
+    {
+        if (isTree(tplCategory))
+        {
+            StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.TREE_ENTITY);
+        }
+        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 83aa272..4eb9d9e 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -28,7 +28,7 @@ public class ${ClassName} extends ${Entity}
     private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if(!$column.superColumn)
+#if(!$table.isSuperColumn($column.javaField))
     /** $column.columnComment */
 #if($column.list)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -50,8 +50,8 @@ public class ${ClassName} extends ${Entity}
 #end
 #end
 #foreach ($column in $columns)
-#if(!$column.superColumn)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#if(!$table.isSuperColumn($column.javaField))
+        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
     public void set${AttrName}($column.javaType $column.javaField) 
     {
         this.$column.javaField = $column.javaField;