ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-10 20:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化代码生成预览

Browse Source
This commit is contained in:
罗敬
2024-05-09 12:06:46 +00:00
committed by Charles7c
parent 8caad16ef2
commit ad7412f9cb
2 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java
View File

@@ -16,14 +16,12 @@
package top.continew.admin.generator.model.resp; package top.continew.admin.generator.model.resp;
import java.io.Serial; import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serial;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnore;
/** /**
* 生成预览信息 * 生成预览信息
@@ -38,6 +36,9 @@ public class GeneratePreviewResp implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; 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;
/** /**
* 文件名 * 文件名
*/ */

96
continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java
View File

@@ -88,15 +88,15 @@ public class GeneratorServiceImpl implements GeneratorService {
tableList.removeIf(table -> !StrUtil.containsAny(table.getTableName(), tableName)); tableList.removeIf(table -> !StrUtil.containsAny(table.getTableName(), tableName));
} }
tableList.removeIf(table -> StrUtil.equalsAnyIgnoreCase(table.getTableName(), generatorProperties tableList.removeIf(table -> StrUtil.equalsAnyIgnoreCase(table.getTableName(), generatorProperties
.getExcludeTables())); .getExcludeTables()));
CollUtil.sort(tableList, Comparator.comparing(Table::getCreateTime) CollUtil.sort(tableList, Comparator.comparing(Table::getCreateTime)
.thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime())) .thenComparing(table -> Optional.ofNullable(table.getUpdateTime()).orElse(table.getCreateTime()))
.reversed()); .reversed());
List<TableResp> tableRespList = BeanUtil.copyToList(tableList, TableResp.class); List<TableResp> tableRespList = BeanUtil.copyToList(tableList, TableResp.class);
PageResp<TableResp> pageResp = PageResp.build(pageQuery.getPage(), pageQuery.getSize(), tableRespList); PageResp<TableResp> pageResp = PageResp.build(pageQuery.getPage(), pageQuery.getSize(), tableRespList);
for (TableResp tableResp : pageResp.getList()) { for (TableResp tableResp : pageResp.getList()) {
long count = genConfigMapper.selectCount(Wrappers.lambdaQuery(GenConfigDO.class) long count = genConfigMapper.selectCount(Wrappers.lambdaQuery(GenConfigDO.class)
.eq(GenConfigDO::getTableName, tableResp.getTableName())); .eq(GenConfigDO::getTableName, tableResp.getTableName()));
tableResp.setIsConfiged(count > 0); tableResp.setIsConfiged(count > 0);
} }
return pageResp; return pageResp;
@@ -118,8 +118,8 @@ public class GeneratorServiceImpl implements GeneratorService {
} }
// 默认作者名称（上次保存使用的作者名称） // 默认作者名称（上次保存使用的作者名称）
GenConfigDO lastGenConfig = genConfigMapper.selectOne(Wrappers.lambdaQuery(GenConfigDO.class) GenConfigDO lastGenConfig = genConfigMapper.selectOne(Wrappers.lambdaQuery(GenConfigDO.class)
.orderByDesc(GenConfigDO::getCreateTime) .orderByDesc(GenConfigDO::getCreateTime)
.last("LIMIT 1")); .last("LIMIT 1"));
if (null != lastGenConfig) { if (null != lastGenConfig) {
genConfig.setAuthor(lastGenConfig.getAuthor()); genConfig.setAuthor(lastGenConfig.getAuthor());
} }
@@ -148,11 +148,11 @@ public class GeneratorServiceImpl implements GeneratorService {
Set<Map.Entry<String, List<String>>> typeMappingEntrySet = typeMappingMap.entrySet(); Set<Map.Entry<String, List<String>>> typeMappingEntrySet = typeMappingMap.entrySet();
// 新增或更新字段配置 // 新增或更新字段配置
Map<String, FieldConfigDO> fieldConfigMap = fieldConfigList.stream() Map<String, FieldConfigDO> 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; int i = 1;
for (Column column : columnList) { for (Column column : columnList) {
FieldConfigDO fieldConfig = Optional.ofNullable(fieldConfigMap.get(column.getName())) FieldConfigDO fieldConfig = Optional.ofNullable(fieldConfigMap.get(column.getName()))
.orElseGet(() -> new FieldConfigDO(column)); .orElseGet(() -> new FieldConfigDO(column));
// 更新已有字段配置 // 更新已有字段配置
if (null != fieldConfig.getCreateTime()) { if (null != fieldConfig.getCreateTime()) {
String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase(); 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())); fieldConfig.setColumnSize(Convert.toStr(column.getSize()));
} }
String fieldType = typeMappingEntrySet.stream() String fieldType = typeMappingEntrySet.stream()
.filter(entry -> entry.getValue().contains(fieldConfig.getColumnType())) .filter(entry -> entry.getValue().contains(fieldConfig.getColumnType()))
.map(Map.Entry::getKey) .map(Map.Entry::getKey)
.findFirst() .findFirst()
.orElse(null); .orElse(null);
fieldConfig.setFieldType(fieldType); fieldConfig.setFieldType(fieldType);
fieldConfig.setFieldSort(i++); fieldConfig.setFieldSort(i++);
latestFieldConfigList.add(fieldConfig); latestFieldConfigList.add(fieldConfig);
@@ -193,7 +193,7 @@ public class GeneratorServiceImpl implements GeneratorService {
} }
// 既不在表单也不在查询中显示，不需要设置表单类型 // 既不在表单也不在查询中显示，不需要设置表单类型
if (Boolean.FALSE.equals(fieldConfig.getShowInForm()) && Boolean.FALSE.equals(fieldConfig if (Boolean.FALSE.equals(fieldConfig.getShowInForm()) && Boolean.FALSE.equals(fieldConfig
.getShowInQuery())) { .getShowInQuery())) {
fieldConfig.setFormType(null); fieldConfig.setFormType(null);
} }
fieldConfig.setTableName(tableName); fieldConfig.setTableName(tableName);
@@ -222,7 +222,7 @@ public class GeneratorServiceImpl implements GeneratorService {
genConfigMap.put("date", DateUtil.date().toString("yyyy/MM/dd HH:mm")); genConfigMap.put("date", DateUtil.date().toString("yyyy/MM/dd HH:mm"));
String packageName = genConfig.getPackageName(); String packageName = genConfig.getPackageName();
String apiModuleName = StrUtil.subSuf(packageName, StrUtil String apiModuleName = StrUtil.subSuf(packageName, StrUtil
.lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1); .lastIndexOfIgnoreCase(packageName, StringConstants.DOT) + 1);
genConfigMap.put("apiModuleName", apiModuleName); genConfigMap.put("apiModuleName", apiModuleName);
genConfigMap.put("apiName", StrUtil.lowerFirst(genConfig.getClassNamePrefix())); genConfigMap.put("apiName", StrUtil.lowerFirst(genConfig.getClassNamePrefix()));
// 渲染代码 // 渲染代码
@@ -243,15 +243,40 @@ public class GeneratorServiceImpl implements GeneratorService {
generatePreview.setContent(TemplateUtils.render(templateConfig.getTemplatePath(), genConfigMap)); generatePreview.setContent(TemplateUtils.render(templateConfig.getTemplatePath(), genConfigMap));
} else { } else {
generatePreview.setFileName(".vue".equals(extension) && "index".equals(templateConfigEntry.getKey()) generatePreview.setFileName(".vue".equals(extension) && "index".equals(templateConfigEntry.getKey())
? "index.vue" ? "index.vue"
: this.getFrontendFileName(classNamePrefix, className, extension)); : this.getFrontendFileName(classNamePrefix, className, extension));
genConfigMap.put("fieldConfigs", fieldConfigList); genConfigMap.put("fieldConfigs", fieldConfigList);
generatePreview.setContent(TemplateUtils.render(templateConfig.getTemplatePath(), genConfigMap)); generatePreview.setContent(TemplateUtils.render(templateConfig.getTemplatePath(), genConfigMap));
} }
setPreviewPath(generatePreview, genConfig, templateConfig);
} }
return generatePreviewList; 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 @Override
public void generate(List<String> tableNames, HttpServletRequest request, HttpServletResponse response) { public void generate(List<String> tableNames, HttpServletRequest request, HttpServletResponse response) {
try { try {
@@ -282,37 +307,10 @@ public class GeneratorServiceImpl implements GeneratorService {
* @param genConfig 生成配置 * @param genConfig 生成配置
*/ */
private void generateCode(List<GeneratePreviewResp> generatePreviewList, GenConfigDO genConfig) { private void generateCode(List<GeneratePreviewResp> 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<String, GeneratorProperties.TemplateConfig> templateConfigMap = generatorProperties.getTemplateConfigs();
for (GeneratePreviewResp generatePreview : generatePreviewList) { 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-system/src/main/java/top/continew/admin/system/service/impl/XxxServiceImpl.java
// 前端：continew-admin/continew-admin-ui/src/views/system/user/index.vue // 前端：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())) { if (!file.exists() || Boolean.TRUE.equals(genConfig.getIsOverride())) {
FileUtil.writeUtf8String(generatePreview.getContent(), file); FileUtil.writeUtf8String(generatePreview.getContent(), file);
@@ -328,8 +326,8 @@ public class GeneratorServiceImpl implements GeneratorService {
*/ */
private String buildBackendBasicPackagePath(GenConfigDO genConfig) { private String buildBackendBasicPackagePath(GenConfigDO genConfig) {
// 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system // 例如：continew-admin/continew-system/src/main/java/top/continew/admin/system
return SystemUtil.getUserInfo().getTempDir() + String.join(File.separator, projectProperties return String.join(File.separator, projectProperties
.getAppName(), projectProperties.getAppName(), genConfig.getModuleName(), "src", "main", "java", genConfig .getAppName(), projectProperties.getAppName(), genConfig.getModuleName(), "src", "main", "java", genConfig
.getPackageName() .getPackageName()
.replace(StringConstants.DOT, File.separator)); .replace(StringConstants.DOT, File.separator));
} }
@@ -359,8 +357,8 @@ public class GeneratorServiceImpl implements GeneratorService {
GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue(); GeneratorProperties.TemplateConfig templateConfig = templateConfigEntry.getValue();
// 移除需要忽略的字段 // 移除需要忽略的字段
List<FieldConfigDO> fieldConfigList = originFieldConfigList.stream() List<FieldConfigDO> fieldConfigList = originFieldConfigList.stream()
.filter(fieldConfig -> !StrUtil.equalsAny(fieldConfig.getFieldName(), templateConfig.getExcludeFields())) .filter(fieldConfig -> !StrUtil.equalsAny(fieldConfig.getFieldName(), templateConfig.getExcludeFields()))
.toList(); .toList();
genConfigMap.put("fieldConfigs", fieldConfigList); genConfigMap.put("fieldConfigs", fieldConfigList);
// 统计部分特殊字段特征 // 统计部分特殊字段特征
genConfigMap.put("hasLocalDateTime", false); genConfigMap.put("hasLocalDateTime", false);
@@ -380,7 +378,7 @@ public class GeneratorServiceImpl implements GeneratorService {
} }
QueryTypeEnum queryType = fieldConfig.getQueryType(); QueryTypeEnum queryType = fieldConfig.getQueryType();
if (null != queryType && StrUtil.equalsAny(queryType.name(), QueryTypeEnum.IN.name(), QueryTypeEnum.NOT_IN 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); genConfigMap.put("hasListQueryField", true);
} }
} }