mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复代码生成器bug

This commit is contained in:
TinyAnts 2022-09-26 11:11:58 +08:00
parent eb0ab251d5
commit 551a042582
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/like-generator/src/main/resources/java/serviceImpl.java.vm
View File

@ -325,14 +325,14 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
public void add(${EntityName}Param ${entityName}Param) { public void add(${EntityName}Param ${entityName}Param) {
${EntityName} model = new ${EntityName}(); ${EntityName} model = new ${EntityName}();
#foreach ($column in $columns) #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)}) #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")) #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}())); model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}()));
#elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete"))
model.set${AttrName}(${entityName}Param.get${AttrName}()); model.set${AttrName}(${entityName}Param.get${AttrName}());
#elseif($column.htmlType=="datetime") #elseif($column.htmlType=="datetime")
model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}())); model.set${AttrName}(System.currentTimeMillis() / 1000);
#end #end
#end #end
#end #end
@ -361,14 +361,14 @@ public class ${EntityName}ServiceImpl implements I${EntityName}Service {
Assert.notNull(model, "数据不存在!"); Assert.notNull(model, "数据不存在!");
#foreach ($column in $columns) #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)}) #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")) #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}())); model.set${AttrName}(UrlUtil.toRelativeUrl(${entityName}Param.get${AttrName}()));
#elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete")) #elseif(!$dateFields.contains($column.columnName) and !$column.javaField.equals("isDelete"))
model.set${AttrName}(${entityName}Param.get${AttrName}()); model.set${AttrName}(${entityName}Param.get${AttrName}());
#elseif($column.htmlType=="datetime") #elseif($column.htmlType=="datetime" && $column.columnName.equals("update_time"))
model.set${AttrName}(TimeUtil.dateToTimestamp(${entityName}Param.get${AttrName}())); model.set${AttrName}(System.currentTimeMillis() / 1000);
#end #end
#end #end
#end #end

6
server/like-generator/src/main/resources/java/validate.java.vm
View File

@ -39,12 +39,10 @@ public class ${EntityName}Param extends BaseParam {
#if(!$column.isPk && $column.javaField.substring(0,2)=="is" && $column.javaType.equals("Integer")) #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}) @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 #end
#if($column.htmlType=="datetime") #if(!$column.columnName.equals("create_time") && !$column.columnName.equals("update_time") && !$column.columnName.equals("delete_time"))
private String ${column.javaField};
#else
private ${column.javaType} ${column.javaField}; private ${column.javaType} ${column.javaField};
#end
#end #end
#end
#end #end
} }