From 41917686b12032d384388b136d6403a2c56442f9 Mon Sep 17 00:00:00 2001 From: "Ray.Hao" <1490493387@qq.com> Date: Fri, 26 Jul 2024 23:05:33 +0800 Subject: [PATCH] =?UTF-8?q?wip:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GeneratorController.java | 6 ++ .../system/converter/GenConfigConverter.java | 12 +-- .../com/youlai/system/enums/FormTypeEnum.java | 14 ++++ .../system/model/entity/GenFieldConfig.java | 1 + .../system/model/form/GenConfigForm.java | 25 +++++-- .../service/impl/GeneratorServiceImpl.java | 74 +++++++++---------- 6 files changed, 79 insertions(+), 53 deletions(-) diff --git a/src/main/java/com/youlai/system/controller/GeneratorController.java b/src/main/java/com/youlai/system/controller/GeneratorController.java index e217de96..cdf35a58 100644 --- a/src/main/java/com/youlai/system/controller/GeneratorController.java +++ b/src/main/java/com/youlai/system/controller/GeneratorController.java @@ -17,6 +17,12 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * 代码生成器控制层 + * + * @author Ray + * @since 2.10.0 + */ @Tag(name = "09.代码生成") @RestController @RequestMapping("/api/v1/generator") diff --git a/src/main/java/com/youlai/system/converter/GenConfigConverter.java b/src/main/java/com/youlai/system/converter/GenConfigConverter.java index 3a4d5377..0ab99507 100644 --- a/src/main/java/com/youlai/system/converter/GenConfigConverter.java +++ b/src/main/java/com/youlai/system/converter/GenConfigConverter.java @@ -18,7 +18,7 @@ import java.util.List; public interface GenConfigConverter { @Mapping(source = "genConfig.tableName", target = "tableName") - @Mapping(source = "genConfig.comment", target = "comment") + @Mapping(source = "genConfig.businessName", target = "businessName") @Mapping(source = "genConfig.moduleName", target = "moduleName") @Mapping(source = "genConfig.packageName", target = "packageName") @Mapping(source = "genConfig.entityName", target = "entityName") @@ -31,14 +31,10 @@ public interface GenConfigConverter { GenConfigForm.FieldConfig toGenFieldConfigForm(GenFieldConfig genFieldConfig); + GenConfig toGenConfig(GenConfigForm formData); - @Mapping(source = "formData", target = "genConfig") - @Mapping(source = "formData.fieldConfigs", target = "fieldConfigs") - GenConfig toGenConfigEntity(GenConfigForm formData); + List toGenFieldConfig(List fieldConfigs); - @Mapping(source = "formData.fieldConfigs", target = "fieldConfigs") - List toGenFieldConfigEntity(List fieldConfigs); - - GenFieldConfig toGenFieldConfigEntity(GenConfigForm.FieldConfig fieldConfig); + GenFieldConfig toGenFieldConfig(GenConfigForm.FieldConfig fieldConfig); } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/enums/FormTypeEnum.java b/src/main/java/com/youlai/system/enums/FormTypeEnum.java index 8a0aa8b8..6383934a 100644 --- a/src/main/java/com/youlai/system/enums/FormTypeEnum.java +++ b/src/main/java/com/youlai/system/enums/FormTypeEnum.java @@ -1,6 +1,8 @@ package com.youlai.system.enums; import com.baomidou.mybatisplus.annotation.EnumValue; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -63,8 +65,20 @@ public enum FormTypeEnum implements IBaseEnum { // Mybatis-Plus 提供注解表示插入数据库时插入该值 @EnumValue + @JsonValue private final Integer value; // @JsonValue // 表示对枚举序列化时返回此字段 private final String label; + + + @JsonCreator + public static QueryTypeEnum fromValue(Integer value) { + for (QueryTypeEnum type : QueryTypeEnum.values()) { + if (type.getValue().equals(value)) { + return type; + } + } + throw new IllegalArgumentException("No enum constant with value " + value); + } } diff --git a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java index 9c789670..ee48674b 100644 --- a/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java +++ b/src/main/java/com/youlai/system/model/entity/GenFieldConfig.java @@ -19,6 +19,7 @@ import lombok.Setter; @Setter public class GenFieldConfig extends BaseEntity { + /** * 关联的配置ID */ diff --git a/src/main/java/com/youlai/system/model/form/GenConfigForm.java b/src/main/java/com/youlai/system/model/form/GenConfigForm.java index 36e6e6ea..c212c0a2 100644 --- a/src/main/java/com/youlai/system/model/form/GenConfigForm.java +++ b/src/main/java/com/youlai/system/model/form/GenConfigForm.java @@ -7,29 +7,35 @@ import lombok.Data; import java.util.List; +/** + * 代码生成配置表单 + * + * @author Ray + * @since 2.10.0 + */ @Schema(description = "代码生成配置表单") @Data public class GenConfigForm { - @Schema(description = "主键") + @Schema(description = "主键",example = "1") private Long id; - @Schema(description = "表名") + @Schema(description = "表名",example = "sys_user") private String tableName; - @Schema(description = "类描述") - private String comment; + @Schema(description = "业务名",example = "用户") + private String businessName; - @Schema(description = "模块名") + @Schema(description = "模块名",example = "system") private String moduleName; - @Schema(description = "包名") + @Schema(description = "包名",example = "com.youlai.system") private String packageName; - @Schema(description = "实体名") + @Schema(description = "实体名",example = "User") private String entityName; - @Schema(description = "作者") + @Schema(description = "作者",example = "youlaitech") private String author; @Schema(description = "字段配置列表") @@ -39,6 +45,9 @@ public class GenConfigForm { @Data public static class FieldConfig { + @Schema(description = "主键") + private Long id; + @Schema(description = "列名") private String columnName; diff --git a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java index 8f3105f7..0c2e41cc 100644 --- a/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/GeneratorServiceImpl.java @@ -14,15 +14,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.youlai.system.SystemApplication; import com.youlai.system.config.property.GeneratorProperties; import com.youlai.system.converter.GenConfigConverter; +import com.youlai.system.enums.FormTypeEnum; +import com.youlai.system.enums.QueryTypeEnum; import com.youlai.system.exception.BusinessException; import com.youlai.system.mapper.DatabaseMapper; -import com.youlai.system.model.bo.ColumnMetaData; -import com.youlai.system.model.bo.TableMetaData; -import com.youlai.system.model.entity.GenConfig; import com.youlai.system.model.entity.GenFieldConfig; import com.youlai.system.model.form.GenConfigForm; import com.youlai.system.model.query.TablePageQuery; -import com.youlai.system.model.vo.GeneratorPreviewVO; import com.youlai.system.service.GeneratorService; import com.youlai.system.service.GenConfigService; import com.youlai.system.service.GenFieldConfigService; @@ -84,7 +82,6 @@ public class GeneratorServiceImpl implements GeneratorService { TableMetaData tableMetadata = databaseMapper.getTableMetadata(tableName); Assert.isTrue(tableMetadata != null, "未找到表元数据"); - genConfig = new GenConfig(); genConfig.setTableName(tableName); @@ -101,51 +98,54 @@ public class GeneratorServiceImpl implements GeneratorService { } + // 根据表的列 + 已经存在的字段生成配置 得到 组合后的字段生成配置 + List genFieldConfigs = new ArrayList<>(); - List genFieldConfigs = null; - - // 获取表的列信息 + // 获取表的列 List tableColumns = databaseMapper.getTableColumns(tableName); - if (CollectionUtil.isNotEmpty(tableColumns)) { - // 查询字段生成配置 - List configList = genFieldConfigService.list( + List fieldConfigList = genFieldConfigService.list( new LambdaQueryWrapper<>(GenFieldConfig.class) .eq(GenFieldConfig::getConfigId, genConfig.getId()) ); - genFieldConfigs = new ArrayList<>(); for (ColumnMetaData tableColumn : tableColumns) { - GenFieldConfig fieldConfig = new GenFieldConfig(); - fieldConfig.setFieldName(tableColumn.getColumnName()); - fieldConfig.setFieldType(tableColumn.getDataType()); - fieldConfig.setComment(tableColumn.getColumnComment()); + // 根据列名获取字段生成配置 + String columnName = tableColumn.getColumnName(); + GenFieldConfig genFieldConfig = fieldConfigList.stream() + .filter(item -> StrUtil.equals(item.getColumnName(), columnName)) + .findFirst().orElseGet(() -> { + GenFieldConfig fieldConfig = new GenFieldConfig(); + fieldConfig.setColumnName(tableColumn.getColumnName()); + fieldConfig.setColumnType(tableColumn.getDataType()); + fieldConfig.setComment(tableColumn.getColumnComment()); + fieldConfig.setFieldName(StrUtil.toCamelCase(columnName)); + fieldConfig.setFieldType(StrUtil.toCamelCase(tableColumn.getDataType())); + fieldConfig.setIsRequired("YES".equals(tableColumn.getIsNullable()) ? 1 : 0); + fieldConfig.setFormType(FormTypeEnum.INPUT); + fieldConfig.setQueryType(QueryTypeEnum.EQ); + return fieldConfig; - - // 如果没有字段生成配置，则根据表的元数据生成默认配置 - if (CollectionUtil.isNotEmpty(configList)) { - for (GenFieldConfig config : configList) { - if (StrUtil.equals(config.getFieldName(), fieldConfig.getFieldName())) { - fieldConfig = config; - break; - } - } - } - - genFieldConfigs.add(fieldConfig); + }); + genFieldConfigs.add(genFieldConfig); } } - GenConfigForm configFormData = genConfigConverter.toGenConfigForm(genConfig, genFieldConfigs); return configFormData; } + + /** + * 保存代码生成配置 + * + * @param formData 代码生成配置表单 + */ @Override public void saveGenConfig(GenConfigForm formData) { - GenConfig genConfig = genConfigConverter.toGenConfigEntity(formData); + GenConfig genConfig = genConfigConverter.toGenConfig(formData); genConfigService.saveOrUpdate(genConfig); - List genFieldConfigs = genConfigConverter.toGenFieldConfigEntity(formData.getFieldConfigs()); + List genFieldConfigs = genConfigConverter.toGenFieldConfig(formData.getFieldConfigs()); if (CollectionUtil.isEmpty(genFieldConfigs)) { throw new BusinessException("字段配置不能为空"); @@ -221,13 +221,13 @@ public class GeneratorServiceImpl implements GeneratorService { private String getFileName(String entityName, String templateName, String extension) { - if (templateName.equals("Entity")) { + if ("Entity".equals(templateName)) { return entityName + extension; } - if (templateName.equals("MapperXml")) { + if ("MapperXml".equals(templateName)) { return entityName + "Mapper" + extension; } - if (templateName.equals("API") || templateName.equals("VIEW")) { + if ("API".equals(templateName) || "VIEW".equals(templateName)) { return StrUtil.toSymbolCase(entityName, '-') + extension; } return entityName + templateName + extension; @@ -235,13 +235,13 @@ public class GeneratorServiceImpl implements GeneratorService { private String getFilePath(String templateName, String packageName, String subPackageName) { String path; - if (templateName.equals("MapperXml")) { + if ("MapperXml".equals(templateName)) { path = (applicationName + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + subPackageName ).replace(".", File.separator); - } else if (templateName.equals("API") || templateName.equals("VIEW")) { + } else if ("API".equals(templateName) || "VIEW".equals(templateName)) { path = ("vue3-element-admin" + File.separator + "src" + File.separator + subPackageName @@ -277,7 +277,7 @@ public class GeneratorServiceImpl implements GeneratorService { bindMap.put("tableName", genConfig.getTableName()); bindMap.put("author", genConfig.getAuthor()); bindMap.put("lowerFirstEntityName", StrUtil.lowerFirst(entityName)); - bindMap.put("tableComment", StrUtil.replace(genConfig.getComment(), "表", Strings.EMPTY)); + bindMap.put("tableComment", genConfig.getBusinessName()); bindMap.put("fieldConfigs", fieldConfigs); for (GenFieldConfig fieldConfig : fieldConfigs) {