half-a-me
/
ruoyi-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix commit 

代码生成器remark字段添加
master
玉安君 2024-04-22 22:30:39 +08:00
parent f1ae64f4da
commit 0a4e225593
1 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
View File

@ -29,56 +29,56 @@ import com.ruoyi.common.core.domain.TreeEntity;
* @date ${datetime} * @date ${datetime}
*/ */
#if($table.crud) #if($table.crud)
#set($Entity="BaseEntity") #set($Entity="BaseEntity")
#elseif($table.tree) #elseif($table.tree)
#set($Entity="TreeEntity") #set($Entity="TreeEntity")
#end #end
@Data @Data
@SuperBuilder @SuperBuilder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@TableName("${tableName}") @TableName("${tableName}" )
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ApiModel(value = "${ClassName}", description = "${functionName}") @ApiModel(value = "${ClassName}" , description = "${functionName}" )
public class ${ClassName} extends ${Entity} { public class ${ClassName} extends ${Entity} {
private static final long serialVersionUID = 1L; private static final long serialVersionUID=1L;
#foreach ($column in $columns) #foreach ($column in $columns)
#if(!$table.isSuperColumn($column.javaField)) #if(!$table.isSuperColumn($column.javaField))
/** $column.columnComment */ /** $column.columnComment */
#if($column.list) #if($column.list)
#set($parentheseIndex=$column.columnComment.indexOf("（")) #set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
#set($comment=$column.columnComment.substring(0, $parentheseIndex)) #set($comment=$column.columnComment.substring(0, $parentheseIndex))
#else #else
#set($comment=$column.columnComment) #set($comment=$column.columnComment)
#end #end
#if($parentheseIndex != -1) #if($parentheseIndex != -1)
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") @Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()" )
#elseif($column.javaType == 'Date') #elseif($column.javaType == 'Date')
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd" )
@Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") @Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd" )
#else #else
@Excel(name = "${comment}") @Excel(name = "${comment}" )
#end #end
#end #end
#if($column.javaField == $pkColumn.javaField) #if($column.javaField == $pkColumn.javaField)
@TableId(value = "${pkColumn.columnName}",type = IdType.AUTO) @TableId(value = "${pkColumn.columnName}" , type = IdType.AUTO)
#end #end
#set($comment='') #set($comment='')
#if($column.isRequired == '1') #if($column.isRequired == '1')
#set($comment=', required = true') #set($comment=', required = true')
#end #end
@ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$comment) @ApiModelProperty(name = "${column.columnComment}" , value = "${column.columnComment}"$comment)
private $column.javaType $column.javaField; private $column.javaType $column.javaField;
#end
#end #end
#end /**
/** * 查询构造器
* 查询构造器 */
*/ public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){
public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){
return ${ClassName}.builder() return ${ClassName}.builder()
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isQuery == '1') #if($column.isQuery == '1')
@ -88,52 +88,54 @@ public class ${ClassName} extends ${Entity} {
#else #else
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#end #end
.${column.javaField}(${className}QueryReq.get${AttrName}()) .${column.javaField}(${className}QueryReq.get${AttrName}())
#end #end
#end #end
#end #end
.build(); .build();
} }
/** /**
* 添加构造器 * 添加构造器
*/ */
public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){ public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){
return ${ClassName}.builder() return ${ClassName}.builder()
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isEdit == '1') #if($column.isEdit == '1')
#if(!$table.isSuperColumn($column.javaField)) #if(!$table.isSuperColumn($column.javaField))
#if($column.javaField.length() > 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) #set($AttrName=$column.javaField)
#else #else
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#end
.${column.javaField}(${className}SaveReq.get${AttrName}())
#end #end
.${column.javaField}(${className}SaveReq.get${AttrName}())
#end
#end #end
#end #end
.build(); .remark(${ClassName}.getRemark())
} .build();
}
/** /**
* 修改构造器 * 修改构造器
*/ */
public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){ public static ${ClassName} editBuild(${pkColumn.javaType} ${pkColumn.javaField}, ${ClassName}EditReq ${className}EditReq){
return ${ClassName}.builder() return ${ClassName}.builder()
.${pkColumn.javaField}(${pkColumn.javaField}) .${pkColumn.javaField}(${pkColumn.javaField})
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.isEdit == '1') #if($column.isEdit == '1')
#if(!$table.isSuperColumn($column.javaField)) #if(!$table.isSuperColumn($column.javaField))
#if($column.javaField.length() > 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) #set($AttrName=$column.javaField)
#else #else
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
#end
.${column.javaField}(${className}EditReq.get${AttrName}())
#end
#end #end
.${column.javaField}(${className}EditReq.get${AttrName}())
#end #end
#end .remark(${ClassName}.getRemark())
#end .build();
.build(); }
}
} }