diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/core/template/VmsArgumentDtoBaseVmsGeneratorTemplate.java b/generator-code-server/generator-code/src/main/java/cn/bunny/core/template/VmsArgumentDtoBaseVmsGeneratorTemplate.java index 8214cc3..08a9e34 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/core/template/VmsArgumentDtoBaseVmsGeneratorTemplate.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/core/template/VmsArgumentDtoBaseVmsGeneratorTemplate.java @@ -1,6 +1,7 @@ package cn.bunny.core.template; import cn.bunny.domain.dto.VmsArgumentDto; +import cn.bunny.domain.entity.TableMetaData; import cn.bunny.utils.TypeConvertUtil; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -18,17 +19,17 @@ public class VmsArgumentDtoBaseVmsGeneratorTemplate extends AbstractVmsGenerator private final VmsArgumentDto dto; private final String path; - private final String tableName; + private final TableMetaData tableMetaData; /** - * @param dto 类名称可以自定义,格式为 xxx_xxx - * @param path 当前路径 - * @param tableName 表名称 + * @param dto 类名称可以自定义,格式为 xxx_xxx + * @param path 当前路径 + * @param tableMetaData 表名称 */ - public VmsArgumentDtoBaseVmsGeneratorTemplate(VmsArgumentDto dto, String path, String tableName) { + public VmsArgumentDtoBaseVmsGeneratorTemplate(VmsArgumentDto dto, String path, TableMetaData tableMetaData) { this.dto = dto; this.path = path; - this.tableName = tableName; + this.tableMetaData = tableMetaData; } /** @@ -38,6 +39,11 @@ public class VmsArgumentDtoBaseVmsGeneratorTemplate extends AbstractVmsGenerator */ @Override void addContext(VelocityContext context) { + // 当前的表名 + String tableName = tableMetaData.getTableName(); + // 表的注释内容 + String comment = tableMetaData.getComment(); + // 当前日期 String date = new SimpleDateFormat(dto.getSimpleDateFormat()).format(new Date()); context.put("date", date); @@ -49,7 +55,7 @@ public class VmsArgumentDtoBaseVmsGeneratorTemplate extends AbstractVmsGenerator context.put("requestMapping", dto.getRequestMapping()); // 表字段的注释内容 - context.put("comment", dto.getComment()); + context.put("comment", comment); // 设置包名称 context.put("package", dto.getPackageName()); diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java index 3d710cc..95e96db 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/domain/dto/VmsArgumentDto.java @@ -36,9 +36,6 @@ public class VmsArgumentDto { @Schema(name = "tablePrefixes", description = "去除表前缀") private String tablePrefixes; - @Schema(name = "comment", description = "注释内容") - private String comment; - @Schema(name = "path", description = "路径") private List path; diff --git a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/vms/VmsCodeGeneratorService.java b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/vms/VmsCodeGeneratorService.java index 967dc31..736f777 100644 --- a/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/vms/VmsCodeGeneratorService.java +++ b/generator-code-server/generator-code/src/main/java/cn/bunny/service/impl/vms/VmsCodeGeneratorService.java @@ -44,7 +44,7 @@ public class VmsCodeGeneratorService { return dto.getPath().stream() .map(path -> { - VmsArgumentDtoBaseVmsGeneratorTemplate generator = new VmsArgumentDtoBaseVmsGeneratorTemplate(dto, path, tableName); + VmsArgumentDtoBaseVmsGeneratorTemplate generator = new VmsArgumentDtoBaseVmsGeneratorTemplate(dto, path, tableMetaData); StringWriter writer = generator.generatorCodeTemplate(tableMetaData, columnInfoList); String processedPath = VmsUtil.handleVmFilename(path, tableMetaData.getTableName()); diff --git a/generator-code-server/generator-code/src/main/resources/static/src/views/home/MainForm.js b/generator-code-server/generator-code/src/main/resources/static/src/views/home/MainForm.js index c69d5bb..b7a8b11 100644 --- a/generator-code-server/generator-code/src/main/resources/static/src/views/home/MainForm.js +++ b/generator-code-server/generator-code/src/main/resources/static/src/views/home/MainForm.js @@ -18,12 +18,12 @@ const MainForm = {
- - + +
- {{ errors.authorName || '请输入作者名称' }} + {{ errors.author || '请输入作者名称' }}
@@ -62,13 +62,13 @@ const MainForm = { {{ errors.tablePrefixes || '请输入去除开头前缀' }}
-
- - -
+ + + + +
- + {{item}}
@@ -166,7 +166,7 @@ const MainForm = { webList: ref([]), // 错误信息对象 errors: { - authorName: '', + author: '', requestMapping: '', packageName: '', simpleDateFormat: '', @@ -217,7 +217,7 @@ const MainForm = { let isValid = true; // 验证文本字段 - const textFields = ['authorName', 'requestMapping', 'packageName', 'simpleDateFormat', 'tablePrefixes']; + const textFields = ['author', 'requestMapping', 'packageName', 'simpleDateFormat', 'tablePrefixes']; textFields.forEach(field => { if (!this.validateField(field)) { isValid = false; diff --git a/generator-code-server/generator-code/src/main/resources/templates/home.html b/generator-code-server/generator-code/src/main/resources/templates/home.html index 2f308cd..9a59590 100644 --- a/generator-code-server/generator-code/src/main/resources/templates/home.html +++ b/generator-code-server/generator-code/src/main/resources/templates/home.html @@ -116,7 +116,7 @@ // 提交的表单 form: ref({ // 作者名称 - authorName: "Bunny", + author: "Bunny", // requestMapping名称 requestMapping: "/api", // 表名称 @@ -128,7 +128,7 @@ // 去除开头前缀 tablePrefixes: "t_,sys_,qrtz_,log_", // 生成代码路径 - path: [] + path: [], }), // 是否显示生成页面 generatorPageFlag: ref(false),