From 7c8d062d5821a77e14077c5116868d79ca63fa99 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 14 二月 2020 13:27:55 +0800
Subject: [PATCH] 修改 代码生成器 适配 MybatisPlus
---
ruoyi/src/main/resources/vm/java/domain.java.vm | 71 ++++++++++++++---------------------
1 files changed, 28 insertions(+), 43 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index 23240c8..0ea5a60 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -1,26 +1,39 @@
package ${packageName}.domain;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import lombok.experimental.Accessors;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
+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;
#foreach ($import in $importList)
import ${import};
#end
/**
* ${functionName}瀵硅薄 ${tableName}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
-#set($Entity="BaseEntity")
-public class ${ClassName} extends ${Entity}
-{
- private static final long serialVersionUID = 1L;
+@Data
+@ToString
+@EqualsAndHashCode
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("${tableName}")
+public class ${ClassName} implements Serializable {
+
+private static final long serialVersionUID=1L;
#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
+
/** $column.columnComment */
#if($column.list)
#set($parentheseIndex=$column.columnComment.indexOf("锛�"))
@@ -30,47 +43,19 @@
#set($comment=$column.columnComment)
#end
#if($parentheseIndex != -1)
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+ @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
- @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#else
@Excel(name = "${comment}")
#end
#end
+#if($column.isPk==1)
+ @TableId(value = "$column.columnName", type = IdType.AUTO)
private $column.javaType $column.javaField;
-
-#end
-#end
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
- public void set${AttrName}($column.javaType $column.javaField)
- {
- this.$column.javaField = $column.javaField;
- }
-
- public $column.javaType get${AttrName}()
- {
- return $column.javaField;
- }
+ private $column.javaType $column.javaField;
#end
#end
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
- .append("${column.javaField}", get${AttrName}())
-#end
- .toString();
- }
}
--
Gitblit v1.9.3