From 0c9398776a3338d7fe7f2194c19c22c7dcb0f0aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 26 七月 2022 20:20:20 +0800
Subject: [PATCH] fix 修复 幂等组件 逻辑问题导致线程变量未清除

---
 ruoyi-generator/src/main/resources/vm/java/domain.java.vm |   62 ++++++++++++-------------------
 1 files changed, 24 insertions(+), 38 deletions(-)

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 022a1ef..28ca34c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -1,19 +1,16 @@
 package ${packageName}.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-import lombok.experimental.Accessors;
-import com.ruoyi.common.annotation.Excel;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
-#if($table.crud)
+
+#foreach ($import in $importList)
+import ${import};
+#end
+#if($table.crud || $table.sub)
 import com.ruoyi.common.core.domain.BaseEntity;
 #elseif($table.tree)
 import com.ruoyi.common.core.domain.TreeEntity;
@@ -21,49 +18,38 @@
 
 /**
  * ${functionName}瀵硅薄 ${tableName}
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
-#if($table.crud)
-#set($Entity="BaseEntity")
+#if($table.crud || $table.sub)
+    #set($Entity="BaseEntity")
 #elseif($table.tree)
-#set($Entity="TreeEntity")
+    #set($Entity="TreeEntity<${ClassName}>")
 #end
 @Data
-@ToString
-@EqualsAndHashCode
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
 @TableName("${tableName}")
-public class ${ClassName} implements Serializable {
+public class ${ClassName} extends ${Entity} {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
-
-    /** $column.columnComment */
-#if($column.list)
-#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
+#if(!$table.isSuperColumn($column.javaField))
+    /**
+     * $column.columnComment
+     */
+#if($column.javaField=='delFlag')
+    @TableLogic
 #end
-#if($parentheseIndex != -1)
-    @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
-#elseif($column.javaType == 'Date')
-    @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#else
-    @Excel(name = "${comment}")
-#end
+#if($column.javaField=='version')
+    @Version
 #end
 #if($column.isPk==1)
-    @TableId(value = "$column.columnName", type = IdType.AUTO)
-    private $column.javaType $column.javaField;
-#else
+    @TableId(value = "$column.columnName")
+#end
     private $column.javaType $column.javaField;
 #end
 #end
+
 }

--
Gitblit v1.9.3