diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/GenController.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/GenController.java index 13382de7..52f78ecd 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/GenController.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/ruoyi/generator/controller/GenController.java @@ -41,8 +41,8 @@ public class GenController extends BaseController { * * @param tableNameStr 表名 */ - @GetMapping("/batchGenCode/{tableNameStr}") - public R batchGenCode(@PathVariable("tableNameStr") String tableNameStr) { + @GetMapping("/batchGenCode") + public R batchGenCode(@NotNull(message = "表名不能为空") String tableNameStr) { genTableService.generateCodeToClasspathByTableNames(tableNameStr); return R.ok("代码生成成功"); } diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index 81cf1798..df44fef7 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; #foreach ($import in $importList) import ${import}; +import java.io.Serializable; #end /** @@ -17,32 +18,32 @@ import ${import}; * @date ${datetime} */ @Data -@EqualsAndHashCode(callSuper = true) + @AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false) -public class ${ClassName}Bo extends BaseEntity { - - #foreach ($column in $columns) - #if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit)) - /** - * $column.columnComment - */ - #if($column.insert && $column.edit) - #set($Group="AddGroup.class, EditGroup.class") - #elseif($column.insert) - #set($Group="AddGroup.class") - #elseif($column.edit) - #set($Group="EditGroup.class") - #end - #if($column.required) - #if($column.javaType == 'String') - @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) - #else - @NotNull(message = "$column.columnComment不能为空", groups = { $Group }) - #end - #end - private $column.javaType $column.javaField; +public class ${ClassName}Bo implements Serializable { +#foreach ($column in $columns) + #if(!$table.isSuperColumn($column.javaField) && ($column.isPk || $column.query || $column.insert || $column.edit)) + /** + * $column.columnComment + */ + #if($column.insert && $column.edit) + #set($Group="AddGroup.class, EditGroup.class") + #elseif($column.insert) + #set($Group="AddGroup.class") + #elseif($column.edit) + #set($Group="EditGroup.class") #end + #if($column.required) + #if($column.javaType == 'String') + @NotBlank(message = "$column.columnComment不能为空", groups = { $Group }) + #else + @NotNull(message = "$column.columnComment不能为空", groups = { $Group }) + #end + #end + private $column.javaType $column.javaField; + #end +#end }