diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java index 0603dba..7ccd994 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/model/entity/ColumnMetaData.java @@ -1,5 +1,6 @@ package com.auth.module.generator.model.entity; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -9,30 +10,31 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@Schema(name = "ColumnMetaData列属性数据", title = "字段列属性") public class ColumnMetaData { - /* 列名称 */ + @Schema(name = "columnName", title = "列名称") private String columnName; - /* 字段名称,小驼峰名称 */ + @Schema(name = "lowercaseName", title = "字段名称,小驼峰名称") private String lowercaseName; - /* 大驼峰名称 */ + @Schema(name = "uppercaseName", title = "大驼峰名称") private String uppercaseName; - /* 数据库字段类型 */ + @Schema(name = "jdbcType", title = "数据库字段类型") private String jdbcType; - /* Java类型 */ + @Schema(name = "javaType", title = "Java类型") private String javaType; - /* Javascript类型 */ + @Schema(name = "javascriptType", title = "Javascript类型") private String javascriptType; - /* 是否为主键 */ + @Schema(name = "isPrimaryKey", title = "是否为主键") private Boolean isPrimaryKey; - /* 字段注释 */ + @Schema(name = "comment", title = "字段注释") private String comment; } \ No newline at end of file diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/helper/VmsGeneratorPathHelper.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/helper/VmsGeneratorPathHelper.java index 9e44b2d..3c60c8b 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/helper/VmsGeneratorPathHelper.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/helper/VmsGeneratorPathHelper.java @@ -56,11 +56,18 @@ public class VmsGeneratorPathHelper { String upperCamelCase = MysqlTypeConvertUtil.convertToCamelCase(tableName, true); String lowerCamelCase = MysqlTypeConvertUtil.convertToCamelCase(tableName, false); + // ========================== + // 💡Java // 如果包含Java和xml需要进行处理 + // ========================== if (filename.contains("java") || filename.contains("xml")) { return upperCamelCase + FILE_TYPE_SUFFIXES.getOrDefault(baseName, "") + "." + extension; } + // ========================== + // 💡前端 + // 前端配置 + // ========================== if (filename.equals("api.ts") || filename.equals("store.ts")) { return lowerCamelCase + ".ts"; } diff --git a/auth-module/module-generator-code/src/main/resources/vms/web/api/api.ts.vm b/auth-module/module-generator-code/src/main/resources/vms/web/api/api.ts.vm index 2a62475..c7751de 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/web/api/api.ts.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/web/api/api.ts.vm @@ -1,5 +1,5 @@ -import {http} from '@/api/service/request'; -import type {BaseResult, ResultTable} from '@/api/service/types'; +import type { PageResult, Result } from "@/types/common/Result"; +import { http } from "@/utils/http"; /** ${comment}---获取${comment}列表 */ export const fetchGet${classUppercaseName}List = (data: any) => { diff --git a/auth-module/module-generator-code/src/main/resources/vms/web/types/$className/types.ts.vm b/auth-module/module-generator-code/src/main/resources/vms/web/types/$className/types.ts.vm new file mode 100644 index 0000000..f9bae4c --- /dev/null +++ b/auth-module/module-generator-code/src/main/resources/vms/web/types/$className/types.ts.vm @@ -0,0 +1,17 @@ +/** +* ${comment} +* 数据库表:${tableName} +* +* @author ${author} +* @since ${date} +*/ +export type ${classUppercaseName}Result = { +#foreach($field in $columnInfoList) + /* $field.comment */ + #if($field.javascriptType == "object") + $field.columnName: any + #else + $field.columnName: $field.javascriptType +#end +#end +}; \ No newline at end of file diff --git a/auth-module/module-generator-code/src/main/resources/vms/web/views/$className/utils/types.ts.vm b/auth-module/module-generator-code/src/main/resources/vms/web/views/$className/utils/types.ts.vm deleted file mode 100644 index 23b2b29..0000000 --- a/auth-module/module-generator-code/src/main/resources/vms/web/views/$className/utils/types.ts.vm +++ /dev/null @@ -1,16 +0,0 @@ -// 添加或者修改表单元素 -export interface FormItemProps { - #foreach($field in $columnInfoList) - // $field.comment - #if($field.javascriptType == "object") - $field.columnName: any - #else - $field.columnName: $field.javascriptType - #end - #end -} - -// 添加或修改表单Props -export interface FormProps { - formInline: FormItemProps; -}