From 0a4e225593ce09b8206b4a0a42da18772287b611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=89=E5=AE=89=E5=90=9B?= <2746727141@qq.com> Date: Mon, 22 Apr 2024 22:30:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20commit=20=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8remark=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/java/domain.java.vm | 140 +++++++++--------- 1 file changed, 71 insertions(+), 69 deletions(-) diff --git a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm index 96a65a2..11c54d8 100644 --- a/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/ruoyi-basic/ruoyi-plugin/ruoyi-generator/src/main/resources/vm/java/domain.java.vm @@ -29,56 +29,56 @@ import com.ruoyi.common.core.domain.TreeEntity; * @date ${datetime} */ #if($table.crud) -#set($Entity="BaseEntity") + #set($Entity="BaseEntity") #elseif($table.tree) -#set($Entity="TreeEntity") + #set($Entity="TreeEntity") #end @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@TableName("${tableName}") +@TableName("${tableName}" ) @EqualsAndHashCode(callSuper = true) -@ApiModel(value = "${ClassName}", description = "${functionName}") +@ApiModel(value = "${ClassName}" , description = "${functionName}" ) public class ${ClassName} extends ${Entity} { - private static final long serialVersionUID = 1L; +private static final long serialVersionUID=1L; #foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) + #if(!$table.isSuperColumn($column.javaField)) /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#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}") -#end -#end -#if($column.javaField == $pkColumn.javaField) - @TableId(value = "${pkColumn.columnName}",type = IdType.AUTO) -#end -#set($comment='') -#if($column.isRequired == '1') - #set($comment=', required = true') -#end - @ApiModelProperty(name = "${column.columnComment}", value = "${column.columnComment}"$comment) + #if($column.list) + #set($parentheseIndex=$column.columnComment.indexOf("（")) + #if($parentheseIndex != -1) + #set($comment=$column.columnComment.substring(0, $parentheseIndex)) + #else + #set($comment=$column.columnComment) + #end + #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}" ) + #end + #end + #if($column.javaField == $pkColumn.javaField) + @TableId(value = "${pkColumn.columnName}" , type = IdType.AUTO) + #end + #set($comment='') + #if($column.isRequired == '1') + #set($comment=', required = true') + #end + @ApiModelProperty(name = "${column.columnComment}" , value = "${column.columnComment}"$comment) private $column.javaType $column.javaField; + #end #end -#end - /** - * 查询构造器 - */ - public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){ +/** +* 查询构造器 +*/ +public static ${ClassName} queryBuild( ${ClassName}QueryReq ${className}QueryReq){ return ${ClassName}.builder() #foreach ($column in $columns) #if($column.isQuery == '1') @@ -88,52 +88,54 @@ public class ${ClassName} extends ${Entity} { #else #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) #end - .${column.javaField}(${className}QueryReq.get${AttrName}()) + .${column.javaField}(${className}QueryReq.get${AttrName}()) #end #end #end - .build(); - } + .build(); + } - /** - * 添加构造器 - */ - public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){ +/** +* 添加构造器 +*/ +public static ${ClassName} saveBuild(${ClassName}SaveReq ${className}SaveReq){ return ${ClassName}.builder() #foreach ($column in $columns) #if($column.isEdit == '1') - #if(!$table.isSuperColumn($column.javaField)) - #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)}) + #if(!$table.isSuperColumn($column.javaField)) + #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)}) + #end + .${column.javaField}(${className}SaveReq.get${AttrName}()) #end - .${column.javaField}(${className}SaveReq.get${AttrName}()) - #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() - .${pkColumn.javaField}(${pkColumn.javaField}) -#foreach ($column in $columns) - #if($column.isEdit == '1') - #if(!$table.isSuperColumn($column.javaField)) - #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)}) + .${pkColumn.javaField}(${pkColumn.javaField}) + #foreach ($column in $columns) + #if($column.isEdit == '1') + #if(!$table.isSuperColumn($column.javaField)) + #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)}) + #end + .${column.javaField}(${className}EditReq.get${AttrName}()) + #end #end - .${column.javaField}(${className}EditReq.get${AttrName}()) #end - #end -#end - .build(); - } + .remark(${ClassName}.getRemark()) + .build(); + } -} + }