From fcfbd244423dbfd23765256129f36f12a70ea624 Mon Sep 17 00:00:00 2001 From: XyJava Date: Fri, 15 Mar 2024 09:34:25 +0000 Subject: [PATCH 01/20] update README.md. Signed-off-by: XyJava --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 956c0705..9577159c 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,7 @@ application.yml中的tenant.enabled改为true则代表开启多租户模式；fa ### 技术交流 -QQ交流群号： **717574596** +QQ交流群号： **717574596（已满员）** **562654879** ### 注意事项 -- Gitee From ad20fb1303702d9dccb6c98c7b683b8fa7982dc1 Mon Sep 17 00:00:00 2001 From: lframework Date: Mon, 3 Jun 2024 00:21:03 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E8=87=B3vue3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/gen/enums/GenDataType.java | 18 +- .../template/gen/generate/Generator.java | 151 ++++++++++++++- .../generate/templates/CreateTemplate.java | 5 + .../generate/templates/DetailTemplate.java | 10 + .../templates/QueryParamsTemplate.java | 5 + .../gen/generate/templates/QueryTemplate.java | 10 + .../generate/templates/UpdateTemplate.java | 10 + .../src/main/resources/templates/add.vue.ftl | 67 +++---- .../src/main/resources/templates/api.js.ftl | 83 -------- .../src/main/resources/templates/api.ts.ftl | 113 +++++++++++ .../main/resources/templates/createvo.ts.ftl | 10 + .../main/resources/templates/detail.vue.ftl | 55 +++--- .../src/main/resources/templates/getbo.ts.ftl | 29 +++ .../main/resources/templates/index.vue.ftl | 178 +++++++++--------- .../resources/templates/input-components.ftl | 30 +-- .../main/resources/templates/modify.vue.ftl | 81 ++++---- .../main/resources/templates/querybo.ts.ftl | 22 +++ .../main/resources/templates/queryvo.ts.ftl | 25 +++ .../main/resources/templates/updatevo.ts.ftl | 17 ++ 19 files changed, 625 insertions(+), 294 deletions(-) delete mode 100644 xingyun-template/src/main/resources/templates/api.js.ftl create mode 100644 xingyun-template/src/main/resources/templates/api.ts.ftl create mode 100644 xingyun-template/src/main/resources/templates/createvo.ts.ftl create mode 100644 xingyun-template/src/main/resources/templates/getbo.ts.ftl create mode 100644 xingyun-template/src/main/resources/templates/querybo.ts.ftl create mode 100644 xingyun-template/src/main/resources/templates/queryvo.ts.ftl create mode 100644 xingyun-template/src/main/resources/templates/updatevo.ts.ftl diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java index 2172a7db..ec3fa812 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/enums/GenDataType.java @@ -9,9 +9,12 @@ import java.time.LocalTime; public enum GenDataType implements BaseEnum { - STRING(0, String.class, "String"), INTEGER(1, Integer.class, "Integer"), SHORT(2, Short.class, "Short"), LONG(3, Long.class, "Long"), DOUBLE(4, - Double.class, "Double"), LOCAL_DATE(5, LocalDate.class, "LocalDate"), LOCAL_DATE_TIME(6, LocalDateTime.class, "LocalDateTime"), LOCAL_TIME(7, - LocalTime.class, "LocalTime"), BOOLEAN(8, Boolean.class, "Boolean"), BIG_DECIMAL(9, BigDecimal.class, "BigDecimal"), + STRING(0, String.class, "String", "string"), INTEGER(1, Integer.class, "Integer", + "number"), SHORT(2, Short.class, "Short", "number"), LONG(3, Long.class, "Long", "number"), DOUBLE(4, + Double.class, "Double", "number"), LOCAL_DATE(5, LocalDate.class, "LocalDate", "string"), LOCAL_DATE_TIME(6, + LocalDateTime.class, "LocalDateTime", "string"), LOCAL_TIME(7, + LocalTime.class, "LocalTime", "string"), BOOLEAN(8, Boolean.class, "Boolean", "boolean"), BIG_DECIMAL(9, + BigDecimal.class, "BigDecimal", "number"), ; @EnumValue @@ -21,11 +24,14 @@ public enum GenDataType implements BaseEnum { private final String desc; - GenDataType(Integer code, Class clazz, String desc) { + private final String frontDesc; + + GenDataType(Integer code, Class clazz, String desc, String frontDesc) { this.code = code; this.clazz = clazz; this.desc = desc; + this.frontDesc = frontDesc; } /** @@ -73,4 +79,8 @@ public enum GenDataType implements BaseEnum { public Class getClazz() { return clazz; } + + public String getFrontDesc() { + return frontDesc; + } } diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java index 1dcbef44..ae34d3df 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/Generator.java @@ -161,6 +161,11 @@ public class Generator { GenerateDto addVue = this.generateAddVue(); GenerateDto modifyVue = this.generateModifyVue(); GenerateDto detailVue = this.generateDetailVue(); + GenerateDto createVoVue = this.generateCreateVoVue(); + GenerateDto queryVoVue = this.generateQueryVoVue(); + GenerateDto updateVoVue = this.generateUpdateVoVue(); + GenerateDto queryBoVue = this.generateQueryBoVue(); + GenerateDto getBoVue = this.generateGetBoVue(); results.add(apiJs); results.add(indexVue); @@ -173,6 +178,21 @@ public class Generator { if (detailVue != null) { results.add(detailVue); } + if (createVoVue != null) { + results.add(createVoVue); + } + if (queryVoVue != null) { + results.add(queryVoVue); + } + if (updateVoVue != null) { + results.add(updateVoVue); + } + if (queryBoVue != null) { + results.add(queryBoVue); + } + if (getBoVue != null) { + results.add(getBoVue); + } // sql GenerateDto sql = this.generateSql(); @@ -421,12 +441,12 @@ public class Generator { ControllerTemplate template = this.getControllerTemplate(); - String content = this.generate("api.js.ftl", template); + String content = this.generate("api.ts.ftl", template); return this.buildGenerateResult( - "vue" + File.separator + "src" + File.separator + "api" + File.separator + "modules" - + File.separator - + template.getModuleName(), template.getBizName() + ".js", content); + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName(), "index.ts", + content); } /** @@ -631,6 +651,115 @@ public class Generator { return entityTemplate; } + /** + * 生成CreateVo.ts代码 + * + * @return + */ + public GenerateDto generateCreateVoVue() { + + CreateTemplate template = this.getCreateTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("createvo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "create" + template.getClassName() + "Vo.ts", + content); + } + + /** + * 生成QueryVo.ts代码 + * + * @return + */ + public GenerateDto generateQueryVoVue() { + + QueryParamsTemplate template = this.getQueryParamsTemplate(); + if (template == null) { + return null; + } + + String content = this.generate("queryvo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "query" + template.getClassName() + "Vo.ts", + content); + } + + /** + * 生成UpdateVo.ts代码 + * + * @return + */ + public GenerateDto generateUpdateVoVue() { + + UpdateTemplate template = this.getUpdateTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("updatevo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "update" + template.getClassName() + "Vo.ts", + content); + } + + /** + * 生成QueryBo.ts代码 + * + * @return + */ + public GenerateDto generateQueryBoVue() { + + QueryTemplate template = this.getQueryTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("querybo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "query" + template.getClassName() + "Bo.ts", + content); + } + + /** + * 生成GetBo.ts代码 + * + * @return + */ + public GenerateDto generateGetBoVue() { + + DetailTemplate template = this.getDetailTemplate(); + + if (template == null) { + return null; + } + + String content = this.generate("getbo.ts.ftl", template); + + return this.buildGenerateResult( + "vue" + File.separator + "src" + File.separator + "api" + File.separator + + template.getModuleName() + File.separator + template.getBizName() + File.separator + + "model", "get" + template.getClassName() + "Bo.ts", + content); + } + /** * Mapper.java模板数据 * @@ -800,12 +929,14 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); columnObj.setViewType(column.getViewType().getCode()); columnObj.setEnumCodeType(column.getDataType().getDesc()); importPackages.add(column.getEnumBack()); importPackages.add(IsEnum.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setViewType(column.getViewType().getCode()); } // 以下类型需要单独引包 @@ -880,7 +1011,6 @@ public class Generator { importPackages.add(TypeMismatch.class.getName()); importPackages.add(BaseVo.class.getName()); - List columns = new ArrayList<>(); for (DataEntityColumn column : targetColumns) { CreateTemplate.Column columnObj = new CreateTemplate.Column(); @@ -891,12 +1021,14 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); columnObj.setViewType(column.getViewType().getCode()); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); columnObj.setViewType(column.getViewType().getCode()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); } if (column.getViewType() == GenViewType.DATE_RANGE) { if (column.getDataType() == GenDataType.LOCAL_DATE_TIME) { @@ -1036,10 +1168,12 @@ public class Generator { column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); columnObj.setViewType(column.getViewType().getCode()); + columnObj.setFrontDataType("number"); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setViewType(column.getViewType().getCode()); } if (column.getViewType() == GenViewType.DATE_RANGE) { @@ -1135,6 +1269,7 @@ public class Generator { UpdateTemplate.Key key = new UpdateTemplate.Key(); // 主键不会是枚举 key.setDataType(t.getDataType().getDesc()); + key.setFrontDataType(t.getDataType().getFrontDesc()); key.setName(t.getColumnName()); key.setNameProperty( t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); @@ -1184,11 +1319,13 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); columnObj.setViewType(column.getViewType().getCode()); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setIsNumberType(GenDataType.isNumberType(column.getDataType())); columnObj.setViewType(column.getViewType().getCode()); columnObj.setHasAvailableTag( @@ -1241,6 +1378,7 @@ public class Generator { QueryTemplate.Key key = new QueryTemplate.Key(); // 主键不会是枚举 key.setDataType(t.getDataType().getDesc()); + key.setFrontDataType(t.getDataType().getFrontDesc()); key.setName(t.getColumnName()); key.setNameProperty( t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); @@ -1286,10 +1424,12 @@ public class Generator { columnObj.setDataType( column.getEnumBack().substring(column.getEnumBack().lastIndexOf(".") + 1)); columnObj.setFrontType(column.getEnumFront()); + columnObj.setFrontDataType("number"); importPackages.add(column.getEnumBack()); importPackages.add(EnumUtil.class.getName()); } else { columnObj.setDataType(column.getDataType().getDesc()); + columnObj.setFrontDataType(column.getDataType().getFrontDesc()); columnObj.setHasAvailableTag( column.getViewType() == GenViewType.SELECT && column.getDataType() == GenDataType.BOOLEAN @@ -1342,6 +1482,7 @@ public class Generator { DetailTemplate.Key key = new DetailTemplate.Key(); // 主键不会是枚举 key.setDataType(t.getDataType().getDesc()); + key.setFrontDataType(t.getDataType().getFrontDesc()); key.setName(t.getColumnName()); key.setNameProperty( t.getColumnName().substring(0, 1).toUpperCase() + t.getColumnName().substring(1)); diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java index 0d16e15d..6409297e 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/CreateTemplate.java @@ -132,6 +132,11 @@ public class CreateTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java index 76646cf0..dfd38ca0 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/DetailTemplate.java @@ -78,6 +78,11 @@ public class DetailTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 字段名称 */ @@ -112,6 +117,11 @@ public class DetailTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java index f7886261..51a54434 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryParamsTemplate.java @@ -73,6 +73,11 @@ public class QueryParamsTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java index 46db2ed9..0ce6dc48 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/QueryTemplate.java @@ -68,6 +68,11 @@ public class QueryTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 字段名称 */ @@ -102,6 +107,11 @@ public class QueryTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java index 47923350..938b4c46 100644 --- a/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java +++ b/xingyun-template/src/main/java/com/lframework/xingyun/template/gen/generate/templates/UpdateTemplate.java @@ -63,6 +63,11 @@ public class UpdateTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 字段名称 */ @@ -122,6 +127,11 @@ public class UpdateTemplate { */ private String dataType; + /** + * 前端字段类型 + */ + private String frontDataType; + /** * 前端字段类型 只有字段是枚举时生效，此值为前端枚举类型 */ diff --git a/xingyun-template/src/main/resources/templates/add.vue.ftl b/xingyun-template/src/main/resources/templates/add.vue.ftl index 4ec64609..984c2fea 100644 --- a/xingyun-template/src/main/resources/templates/add.vue.ftl +++ b/xingyun-template/src/main/resources/templates/add.vue.ftl @@ -1,12 +1,12 @@ diff --git a/xingyun-template/src/main/resources/templates/api.js.ftl b/xingyun-template/src/main/resources/templates/api.js.ftl deleted file mode 100644 index 2cf1ba7f..00000000 --- a/xingyun-template/src/main/resources/templates/api.js.ftl +++ /dev/null @@ -1,83 +0,0 @@ -import { request } from '@/utils/request' - -export default { - -<#if query??> - /** - * 查询列表 - * @param params - * @returns {AxiosPromise} - */ - query: (params) => { - return request({ - url: '/${moduleName}/${bizName}/query', - method: 'get', - params: params - }) - }, - - -<#if detail??> - /** - * 根据ID查询 - * @param ${keys[0].name} - * @returns {AxiosPromise} - */ - get: (${keys[0].name}) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'get', - params: { - ${keys[0].name}: ${keys[0].name} - } - }) - }, - - -<#if create??> - /** - * 新增 - * @param params - * @returns {AxiosPromise} - */ - create: (params) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'post', - data: params - }) - }, - - -<#if update??> - /** - * 修改 - * @param params - * @returns {AxiosPromise} - */ - modify: (params) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'put', - data: params - }) - }, - - -<#if hasDelete> - /** - * 删除 - * @param params - * @returns {AxiosPromise} - */ - deleteById: (${keys[0].name}) => { - return request({ - url: '/${moduleName}/${bizName}', - method: 'delete', - data: { - ${keys[0].name}: ${keys[0].name} - } - }) - }, - -} \ No newline at end of file diff --git a/xingyun-template/src/main/resources/templates/api.ts.ftl b/xingyun-template/src/main/resources/templates/api.ts.ftl new file mode 100644 index 00000000..417c881d --- /dev/null +++ b/xingyun-template/src/main/resources/templates/api.ts.ftl @@ -0,0 +1,113 @@ +import { defHttp } from '/@/utils/http/axios'; +import { PageResult } from '@/api/model/pageResult'; +import { ContentTypeEnum } from '@/enums/httpEnum'; +<#if query??>import { Query${className}Vo } from '@/api/${moduleName}/${bizName}/model/query${className}Vo'; +<#if query??>import { Query${className}Bo } from '@/api/${moduleName}/${bizName}/model/query${className}Bo'; +<#if detail??>import { ${r"Get"}${className}${r"Bo"} } from '@/api/${moduleName}/${bizName}/model/${r"get"}${className}${r"Bo"}'; +<#if create??>import { Create${className}Vo } from '@/api/${moduleName}/${bizName}/model/create${className}Vo'; +<#if update??>import { Update${className}Vo } from '@/api/${moduleName}/${bizName}/model/update${className}Vo'; + +const baseUrl = '/${moduleName}/${bizName}'; +const region = 'cloud-api'; + +<#if query??> +/** + * 查询列表 + * @param params + * @returns {Promise} + */ +export function query(params: Query${className}Vo): ${r"Promise>"} { + return defHttp.get<${r"PageResult<"}Query${className}${r"Bo>"}>( + { + url: baseUrl + '/query', + params: params, + }, + { + region, + }, + ); +} + + +<#if detail??> +/** + * 根据ID查询 + * @param ${keys[0].name} + * @returns {Promise} + */ +export function get(${keys[0].name}: ${keys[0].dataType}): ${r"Promise"} { + return defHttp.get<${r"Get"}${className}${r"Bo"}>( + { + url: baseUrl, + params: { + ${keys[0].name}, + } + }, + { + region, + }, + ); +} + + +<#if create??> +/** + * 新增 + * @param params + * @returns {Promise} + */ +export function create(params: Create${className}Vo): ${r"Promise"} { + return defHttp.post( + { + url: baseUrl, + data: params, + }, + { + contentType: ContentTypeEnum.FORM_URLENCODED, + region, + }, + ); +} + + +<#if update??> +/** + * 修改 + * @param params + * @returns {Promise} + */ +export function update(params: Update${className}Vo): ${r"Promise"} { + return defHttp.put( + { + url: baseUrl, + data: params, + }, + { + contentType: ContentTypeEnum.FORM_URLENCODED, + region, + }, + ); +} + + +<#if hasDelete> +/** + * 删除 + * @param params + * @returns {Promise} + */ +export function deleteById(${keys[0].name}: ${keys[0].dataType}): ${r"Promise"} { + return defHttp.delete( + { + url: baseUrl, + data: { + ${keys[0].name}, + }, + }, + { + region, + contentType: ContentTypeEnum.FORM_URLENCODED, + }, + ); +} + \ No newline at end of file diff --git a/xingyun-template/src/main/resources/templates/createvo.ts.ftl b/xingyun-template/src/main/resources/templates/createvo.ts.ftl new file mode 100644 index 00000000..0ce281e2 --- /dev/null +++ b/xingyun-template/src/main/resources/templates/createvo.ts.ftl @@ -0,0 +1,10 @@ +export interface Create${className}Vo { + + <#list columns as column> + /** + * ${column.description} + */ + ${column.name}<#if !column.required>?: ${column.frontDataType}; + + +} diff --git a/xingyun-template/src/main/resources/templates/detail.vue.ftl b/xingyun-template/src/main/resources/templates/detail.vue.ftl index f30a27bd..c054164e 100644 --- a/xingyun-template/src/main/resources/templates/detail.vue.ftl +++ b/xingyun-template/src/main/resources/templates/detail.vue.ftl @@ -1,5 +1,5 @@ diff --git a/xingyun-template/src/main/resources/templates/getbo.ts.ftl b/xingyun-template/src/main/resources/templates/getbo.ts.ftl new file mode 100644 index 00000000..d4908caa --- /dev/null +++ b/xingyun-template/src/main/resources/templates/getbo.ts.ftl @@ -0,0 +1,29 @@ +/** + * ${classDescription} GetBo + * +<#if author??> + * @author ${author} + + */ +export interface Get${className}Bo { + + /** + * ${keys[0].description} + */ + ${keys[0].name}: ${keys[0].frontDataType}; + + <#list columns as column> + /** + * ${column.description} + */ + ${column.name}: ${column.frontDataType}; + + <#if column.dataDicCode??> + /** + * ${column.description}字典值 + */ + ${column.name}DicValue: string; + + + +} diff --git a/xingyun-template/src/main/resources/templates/index.vue.ftl b/xingyun-template/src/main/resources/templates/index.vue.ftl index cc68b49c..a7cdf533 100644 --- a/xingyun-template/src/main/resources/templates/index.vue.ftl +++ b/xingyun-template/src/main/resources/templates/index.vue.ftl @@ -1,70 +1,73 @@