From ad7412f9cbee5d851d060d8e9d717b2553d3d4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E6=95=AC?= <1126184155@qq.com> Date: Thu, 9 May 2024 12:06:46 +0000 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/resp/GeneratePreviewResp.java | 13 +-- .../service/impl/GeneratorServiceImpl.java | 96 +++++++++---------- 2 files changed, 54 insertions(+), 55 deletions(-) diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java index a07168a7..71d7b631 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java @@ -16,14 +16,12 @@ package top.continew.admin.generator.model.resp; -import java.io.Serial; -import java.io.Serializable; - +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; - -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serial; +import java.io.Serializable; /** * 生成预览信息 @@ -38,6 +36,9 @@ public class GeneratePreviewResp implements Serializable { @Serial private static final long serialVersionUID = 1L; + @Schema(description = "生成的文件路径", example = "continew-admin\\continew-admin\\continew-admin-generator\\src\\main\\java\\top\\continew\\admin\\generator\\service") + private String path; + /** * 文件名 */ diff --git a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index 573eb64a..2b8da931 100644 --- a/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -88,15 +88,15 @@ public class GeneratorServiceImpl implements GeneratorService { tableList.removeIf(table -> !StrUtil.containsAny(table.getTableName(), tableName)); } tableList.removeIf(table -> StrUtil.equalsAnyIgnoreCase(table.getTableName(), generatorProperties - .getExcludeTables())); + .getExcludeTables())); CollUtil.sort(tableList, Comparator.comparing(Table::getCreateTime) - .thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime())) - .reversed()); + .thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime())) + .reversed()); List tableRespList = BeanUtil.copyToList(tableList, TableResp.class); PageResp pageResp = PageResp.build(pageQuery.getPage(), pageQuery.getSize(), tableRespList); for (TableResp tableResp : pageResp.getList()) { long count = genConfigMapper.selectCount(Wrappers.lambdaQuery(GenConfigDO.class) - .eq(GenConfigDO::getTableName, tableResp.getTableName())); + .eq(GenConfigDO::getTableName, tableResp.getTableName())); tableResp.setIsConfiged(count > 0); } return pageResp; @@ -118,8 +118,8 @@ public class GeneratorServiceImpl implements GeneratorService { } // 默认作者名称（上次保存使用的作者名称） GenConfigDO lastGenConfig = genConfigMapper.selectOne(Wrappers.lambdaQuery(GenConfigDO.class) - .orderByDesc(GenConfigDO::getCreateTime) - .last("LIMIT 1")); + .orderByDesc(GenConfigDO::getCreateTime) + .last("LIMIT 1")); if (null != lastGenConfig) { genConfig.setAuthor(lastGenConfig.getAuthor()); } @@ -148,11 +148,11 @@ public class GeneratorServiceImpl implements GeneratorService { Set>> typeMappingEntrySet = typeMappingMap.entrySet(); // 新增或更新字段配置 Map fieldConfigMap = fieldConfigList.stream() - .collect(Collectors.toMap(FieldConfigDO::getColumnName, Function.identity(), (key1, key2) -> key2)); + .collect(Collectors.toMap(FieldConfigDO::getColumnName, Function.identity(), (key1, key2) -> key2)); int i = 1; for (Column column : columnList) { FieldConfigDO fieldConfig = Optional.ofNullable(fieldConfigMap.get(column.getName())) - .orElseGet(() -> new FieldConfigDO(column)); + .orElseGet(() -> new FieldConfigDO(column)); // 更新已有字段配置 if (null != fieldConfig.getCreateTime()) { String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase(); @@ -160,10 +160,10 @@ public class GeneratorServiceImpl implements GeneratorService { fieldConfig.setColumnSize(Convert.toStr(column.getSize())); } String fieldType = typeMappingEntrySet.stream() - .filter(entry -> entry.getValue().contains(fieldConfig.getColumnType())) - .map(Map.Entry::getKey) - .findFirst() - .orElse(null); + .filter(entry -> entry.getValue().contains(fieldConfig.getColumnType())) + .map(Map.Entry::getKey) + .findFirst() + .orElse(null); fieldConfig.setFieldType(fieldType); fieldConfig.setFieldSort(i++); latestFieldConfigList.add(fieldConfig); @@ -193,7 +193,7 @@ public class GeneratorServiceImpl implements GeneratorService { } // 既不在表单也不在查询中显示，不需要设置表单类型 if (Boolean.FALSE.equals(fieldConfig.getShowInForm()) && Boolean.FALSE.equals(fieldConfig - .getShowInQuery())) { + .getShowInQuery())) { fieldConfig.setFormType(null); } fieldConfig.setTableName(tableName); @@ -222,7 +222,7 @@ public class GeneratorServiceImpl implements GeneratorService { genConfigMap.put("date", DateUtil.date().toString("yyyy/MM/dd HH:mm")); String packageName = genConfig.getPackageName(); String apiModuleName = StrUtil.subSuf(packageName, StrUtil - .lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1); + .lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1); genConfigMap.put("apiModuleName", apiModuleName); genConfigMap.put("apiName", StrUtil.lowerFirst(genConfig.getClassNamePrefix())); // 渲染代码 @@ -243,15 +243,40 @@ public class GeneratorServiceImpl implements GeneratorService { generatePreview.setContent(TemplateUtils.render(templateConfig.getTemplatePath(), genConfigMap)); } else { generatePreview.setFileName(".vue".equals(extension) && "index".equals(templateConfigEntry.getKey()) - ? "index.vue" - : this.getFrontendFileName(classNamePrefix, className, extension)); + ? "index.vue" + : this.getFrontendFileName(classNamePrefix, className, extension)); genConfigMap.put("fieldConfigs", fieldConfigList); generatePreview.setContent(TemplateUtils.render(templateConfig.getTemplatePath(), genConfigMap)); } + setPreviewPath(generatePreview, genConfig, templateConfig); } return generatePreviewList; } + private void setPreviewPath(GeneratePreviewResp generatePreview, GenConfigDO genConfig, GeneratorProperties.TemplateConfig templateConfig) { + // 获取前后端基础路径 + String backendBasicPackagePath = this.buildBackendBasicPackagePath(genConfig); + String frontendBasicPackagePath = String.join(File.separator, projectProperties.getAppName(), projectProperties.getAppName() + "-ui"); + String packageName = genConfig.getPackageName(); + String moduleName = StrUtil.subSuf(packageName, StrUtil + .lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1); + String packagePath; + if (generatePreview.isBackend()) { + // 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system/service/impl + packagePath = String.join(File.separator, backendBasicPackagePath, templateConfig.getPackageName() + .replace(StringConstants.DOT, File.separator)); + } else { + // 例如：continew-admin/continew-admin-ui/src/views/system + packagePath = String.join(File.separator, frontendBasicPackagePath, templateConfig.getPackageName() + .replace(StringConstants.SLASH, File.separator), moduleName); + // 例如：continew-admin/continew-admin-ui/src/views/system/user + packagePath = ".vue".equals(templateConfig.getExtension()) + ? packagePath + File.separator + StrUtil.lowerFirst(genConfig.getClassNamePrefix()) + : packagePath; + } + generatePreview.setPath(packagePath); + } + @Override public void generate(List tableNames, HttpServletRequest request, HttpServletResponse response) { try { @@ -282,37 +307,10 @@ public class GeneratorServiceImpl implements GeneratorService { * @param genConfig 生成配置 */ private void generateCode(List generatePreviewList, GenConfigDO genConfig) { - // 获取前后端基础路径 - String backendBasicPackagePath = this.buildBackendBasicPackagePath(genConfig); - String frontendBasicPackagePath = SystemUtil.getUserInfo().getTempDir() + String - .join(File.separator, projectProperties.getAppName(), projectProperties.getAppName() + "-ui"); - String packageName = genConfig.getPackageName(); - String moduleName = StrUtil.subSuf(packageName, StrUtil - .lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1); - // 生成代码 - Map templateConfigMap = generatorProperties.getTemplateConfigs(); for (GeneratePreviewResp generatePreview : generatePreviewList) { - // 获取对应模板配置 - GeneratorProperties.TemplateConfig templateConfig = templateConfigMap.getOrDefault(StrUtil - .subBefore(generatePreview.getFileName(), StringConstants.DOT, true) - .replace(genConfig.getClassNamePrefix(), StringConstants.EMPTY), templateConfigMap.get("api")); - String packagePath; - if (generatePreview.isBackend()) { - // 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system/service/impl - packagePath = String.join(File.separator, backendBasicPackagePath, templateConfig.getPackageName() - .replace(StringConstants.DOT, File.separator)); - } else { - // 例如：continew-admin/continew-admin-ui/src/views/system - packagePath = String.join(File.separator, frontendBasicPackagePath, templateConfig.getPackageName() - .replace(StringConstants.SLASH, File.separator), moduleName); - // 例如：continew-admin/continew-admin-ui/src/views/system/user - packagePath = ".vue".equals(templateConfig.getExtension()) - ? packagePath + File.separator + StrUtil.lowerFirst(genConfig.getClassNamePrefix()) - : packagePath; - } // 后端：continew-admin/continew-system/src/main/java/top/continew/admin/system/service/impl/XxxServiceImpl.java // 前端：continew-admin/continew-admin-ui/src/views/system/user/index.vue - File file = new File(packagePath, generatePreview.getFileName()); + File file = new File(SystemUtil.getUserInfo().getTempDir() + generatePreview.getPath(), generatePreview.getFileName()); // 如果已经存在，且不允许覆盖，则跳过 if (!file.exists() || Boolean.TRUE.equals(genConfig.getIsOverride())) { FileUtil.writeUtf8String(generatePreview.getContent(), file); @@ -328,8 +326,8 @@ public class GeneratorServiceImpl implements GeneratorService { */ private String buildBackendBasicPackagePath(GenConfigDO genConfig) { // 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system - return SystemUtil.getUserInfo().getTempDir() + String.join(File.separator, projectProperties - .getAppName(), projectProperties.getAppName(), genConfig.getModuleName(), "src", "main", "java", genConfig + return String.join(File.separator, projectProperties + .getAppName(), projectProperties.getAppName(), genConfig.getModuleName(), "src", "main", "java", genConfig .getPackageName() .replace(StringConstants.DOT, File.separator)); } @@ -359,8 +357,8 @@ public class GeneratorServiceImpl implements GeneratorService { GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue(); // 移除需要忽略的字段 List fieldConfigList = originFieldConfigList.stream() - .filter(fieldConfig -> !StrUtil.equalsAny(fieldConfig.getFieldName(), templateConfig.getExcludeFields())) - .toList(); + .filter(fieldConfig -> !StrUtil.equalsAny(fieldConfig.getFieldName(), templateConfig.getExcludeFields())) + .toList(); genConfigMap.put("fieldConfigs", fieldConfigList); // 统计部分特殊字段特征 genConfigMap.put("hasLocalDateTime", false); @@ -380,7 +378,7 @@ public class GeneratorServiceImpl implements GeneratorService { } QueryTypeEnum queryType = fieldConfig.getQueryType(); if (null != queryType && StrUtil.equalsAny(queryType.name(), QueryTypeEnum.IN.name(), QueryTypeEnum.NOT_IN - .name(), QueryTypeEnum.BETWEEN.name())) { + .name(), QueryTypeEnum.BETWEEN.name())) { genConfigMap.put("hasListQueryField", true); } }