From 551a04258232223ed9e7ca200b4d2b56250bfad6 Mon Sep 17 00:00:00 2001
From: TinyAnts <tinyants@163.com>
Date: Mon, 26 Sep 2022 11:11:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=99=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/java/serviceImpl.java.vm        | 10 +++++-----
 .../src/main/resources/java/validate.java.vm           |  6 ++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/server/like-generator/src/main/resources/java/serviceImpl.java.vm b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
index 444114d3..67e8d411 100644
--- a/server/like-generator/src/main/resources/java/serviceImpl.java.vm
+++ b/server/like-generator/src/main/resources/java/serviceImpl.java.vm
@@ -325,14 +325,14 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
     public void add(${EntityName}Param ${entityName}Param) {
         ${EntityName} model = new ${EntityName}();
     #foreach ($column in $columns)
-    #if($column.isInsert)
+    #if($column.isInsert || $column.columnName.equals("create_time") || $column.columnName.equals("update_time"))
         #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
         #if($column.javaField.equals("image") || $column.javaField.equals("avatar") || $column.javaField.equals("logo") || $column.javaField.equals("img"))
         model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}()));
         #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete"))
         model.set${AttrName}(${entityName}Param.get${AttrName}());
         #elseif($column.htmlType=="datetime")
-        model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}()));
+        model.set${AttrName}(System.currentTimeMillis() / 1000);
         #end
     #end
     #end
@@ -361,14 +361,14 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
         Assert.notNull(model, "数据不存在!");
 
     #foreach ($column in $columns)
-    #if($column.isEdit==1)
+    #if($column.isEdit==1 || $column.columnName.equals("update_time"))
         #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
         #if($column.javaField.equals("image") || $column.javaField.equals("avatar") || $column.javaField.equals("logo") || $column.javaField.equals("img"))
         model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}()));
         #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete"))
         model.set${AttrName}(${entityName}Param.get${AttrName}());
-        #elseif($column.htmlType=="datetime")
-        model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}()));
+        #elseif($column.htmlType=="datetime" && $column.columnName.equals("update_time"))
+        model.set${AttrName}(System.currentTimeMillis() / 1000);
         #end
     #end
     #end
diff --git a/server/like-generator/src/main/resources/java/validate.java.vm b/server/like-generator/src/main/resources/java/validate.java.vm
index ca9e8187..519be972 100644
--- a/server/like-generator/src/main/resources/java/validate.java.vm
+++ b/server/like-generator/src/main/resources/java/validate.java.vm
@@ -39,12 +39,10 @@ public class ${EntityName}Param extends BaseParam {
     #if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer"))
     @IntegerContains(values = {0, 1}, message = "${column.javaField}参数值不在符合范围", groups = {#if($column.isInsert)create.class#end#if($column.isInsert&&$column.isEdit), #end#if($column.isEdit)update.class#end})
     #end
-    #if($column.htmlType=="datetime")
-    private String ${column.javaField};
-    #else
+    #if(!$column.columnName.equals("create_time") && !$column.columnName.equals("update_time") && !$column.columnName.equals("delete_time"))
     private ${column.javaType} ${column.javaField};
-    #end
 
+    #end
   #end
 #end
 }