diff --git a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java index 5f29fd31..ec37b813 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/cnadmin/tool/service/impl/GeneratorServiceImpl.java @@ -259,11 +259,11 @@ public class GeneratorServiceImpl implements GeneratorService { } // 1、生成 api 代码 // 例如:D:/continew-admin/continew-admin-ui + genConfigMap.put("fieldConfigs", fieldConfigList); List frontendSubPathList = StrUtil.split(frontendPath, "src"); String frontendModulePath = frontendSubPathList.get(0); // 例如:D:/continew-admin/continew-admin-ui/src/api/tool/xxx.ts - String moduleSimpleName = new File(frontendPath).getName(); - File apiParentFile = FileUtil.file(frontendModulePath, "src", "api", moduleSimpleName); + File apiParentFile = FileUtil.file(frontendModulePath, "src", "api", apiModuleName); String apiFileName = classNamePrefix.toLowerCase() + ".ts"; File apiFile = new File(apiParentFile, apiFileName); if (apiFile.exists() && !isOverride) { @@ -273,7 +273,8 @@ public class GeneratorServiceImpl implements GeneratorService { FileUtil.writeString(apiContent, apiFile, StandardCharsets.UTF_8); // 2、生成 view 代码 // 例如:D:/continew-admin/continew-admin-ui/src/views/tool/xxx/index.vue - File indexFile = FileUtil.file(frontendPath, classNamePrefix, "index.vue"); + File indexFile = + FileUtil.file(frontendPath, apiModuleName, StrUtil.lowerFirst(classNamePrefix), "index.vue"); if (indexFile.exists() && !isOverride) { return; } diff --git a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl index 77296bff..b7effafe 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/Query.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/Query.ftl @@ -54,7 +54,7 @@ public class ${className} implements Serializable { */ @Schema(description = "${fieldConfig.comment}") @Query(type = QueryTypeEnum.${fieldConfig.queryType}) - <#if fieldConfig.queryType == 'IN' || fieldConfig.queryType == 'NOT_IN' || fieldConfig.queryType == 'BETWEEN'> + <#if fieldConfig.queryType = 'IN' || fieldConfig.queryType = 'NOT_IN' || fieldConfig.queryType = 'BETWEEN'> private List<${fieldConfig.fieldType}> ${fieldConfig.fieldName}; <#else> private ${fieldConfig.fieldType} ${fieldConfig.fieldName}; diff --git a/continew-admin-tool/src/main/resources/templates/generator/api.ftl b/continew-admin-tool/src/main/resources/templates/generator/api.ftl index 5e1baa7e..a23e5253 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/api.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/api.ftl @@ -3,17 +3,17 @@ import qs from 'query-string'; const BASE_URL = '/${apiModuleName}/${apiName}'; -export interface ${classNamePrefix}Record { +export interface DataRecord { <#if fieldConfigs??> <#list fieldConfigs as fieldConfig> - <#if fieldConfig.showInList> - ${fieldConfig.fieldName}: string; - + ${fieldConfig.fieldName}?: string; + createUserString?: string; + updateUserString?: string; } -export interface ${classNamePrefix}Param { +export interface ListParam { <#if fieldConfigs??> <#list fieldConfigs as fieldConfig> <#if fieldConfig.showInQuery> @@ -26,13 +26,13 @@ export interface ${classNamePrefix}Param { sort?: Array; } -export interface ${classNamePrefix}ListRes { - list: ${classNamePrefix}Record[]; +export interface ListRes { + list: DataRecord[]; total: number; } -export function list${classNamePrefix}(params: ${classNamePrefix}Param) { - return axios.get<${classNamePrefix}ListRes>(`${BASE_URL}`, { +export function list(params: ListParam) { + return axios.get(`${'$'}{BASE_URL}`, { params, paramsSerializer: (obj) => { return qs.stringify(obj); @@ -40,18 +40,18 @@ export function list${classNamePrefix}(params: ${classNamePrefix}Param) { }); } -export function get${classNamePrefix}(id: string) { - return axios.get<${classNamePrefix}Record>(`${BASE_URL}/${id}`); +export function get(id: string) { + return axios.get(`${'$'}{BASE_URL}/${'$'}{id}`); } -export function add${classNamePrefix}(req: ${classNamePrefix}Record) { +export function add(req: DataRecord) { return axios.post(BASE_URL, req); } -export function update${classNamePrefix}(req: ${classNamePrefix}Record, id: string) { - return axios.put(`${BASE_URL}/${id}`, req); +export function update(req: DataRecord, id: string) { + return axios.put(`${'$'}{BASE_URL}/${'$'}{id}`, req); } -export function delete${classNamePrefix}(ids: string | Array) { - return axios.delete(`${BASE_URL}/${ids}`); +export function del(ids: string | Array) { + return axios.delete(`${'$'}{BASE_URL}/${'$'}{ids}`); } diff --git a/continew-admin-tool/src/main/resources/templates/generator/index.ftl b/continew-admin-tool/src/main/resources/templates/generator/index.ftl index 737aeecd..2d1ace6e 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/index.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/index.ftl @@ -89,7 +89,7 @@ - + <#if fieldConfig_index = 0> + + + + <#else> + <#if fieldConfig.showInList> + + + <#if fieldConfig.showInForm> - <#if fieldConfig.formType == 'TEXT'> + <#if fieldConfig.formType = 'TEXT'> - <#elseif fieldConfig.formType == 'TEXT_AREA'> + <#elseif fieldConfig.formType = 'TEXT_AREA'> - <#elseif fieldConfig.formType == 'SELECT'> + <#elseif fieldConfig.formType = 'SELECT'> <#----> - <#elseif fieldConfig.formType == 'RADIO'> + <#elseif fieldConfig.formType = 'RADIO'> <#-- --> - <#elseif fieldConfig.formType == 'DATE'> + <#elseif fieldConfig.formType = 'DATE'> - <#elseif fieldConfig.formType == 'DATE_TIME'> + <#elseif fieldConfig.formType = 'DATE_TIME'> - {{ ${apiName}.${fieldConfig.fieldName} }} + <#if fieldConfig.fieldName = 'createUser'> + {{ detail.createUserString }} + <#elseif fieldConfig.fieldName = 'updateUser'> + {{ detail.updateUserString }} + <#else> + {{ detail.${fieldConfig.fieldName} }} + @@ -237,22 +251,24 @@