From 4088463adf5a33a43b7fddf3f66d65c220acf93d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 16 七月 2020 16:54:14 +0800
Subject: [PATCH] 定时任务cron表达式验证
---
ruoyi/src/main/resources/vm/java/domain.java.vm | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index 1377278..c943c1b 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -1,11 +1,15 @@
package ${packageName}.domain;
+#foreach ($import in $importList)
+import ${import};
+#end
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+#if($table.crud)
import com.ruoyi.framework.web.domain.BaseEntity;
-#foreach ($import in $importList)
-import ${import};
+#elseif($table.tree)
+import com.ruoyi.framework.web.domain.TreeEntity;
#end
/**
@@ -14,7 +18,11 @@
* @author ${author}
* @date ${datetime}
*/
+#if($table.crud)
#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
public class ${ClassName} extends ${Entity}
{
private static final long serialVersionUID = 1L;
@@ -32,6 +40,7 @@
#if($parentheseIndex != -1)
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
#elseif($column.javaType == 'Date')
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
#else
@Excel(name = "${comment}")
@@ -43,7 +52,7 @@
#end
#foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#if($column.javaField.length() > 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)})
@@ -64,7 +73,7 @@
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]"))
+#if($column.javaField.length() > 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)})
--
Gitblit v1.9.2