diff --git a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java index ae53c6c..f22675f 100644 --- a/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java +++ b/auth-module/module-generator-code/src/main/java/com/auth/module/generator/service/impl/GeneratorServiceImpl.java @@ -31,6 +31,8 @@ public class GeneratorServiceImpl implements GeneratorService { private final IMetadataProvider databaseMetadataProvider; private final IMetadataProvider sqlMetadataProvider; + private final List ignoreField = List.of("id", "update_time", "create_time", "create_user", "update_user"); + /** * 代码生成方法---数据库生成 * @@ -42,7 +44,14 @@ public class GeneratorServiceImpl implements GeneratorService { return dto.getTableNames().parallelStream() .flatMap(tableName -> { TableMetaData tableMeta = databaseMetadataProvider.getTableMetadata(tableName); - List columns = databaseMetadataProvider.getColumnInfoList(tableName); + + // 排除不需要的字段 + List columns = databaseMetadataProvider.getColumnInfoList(tableName).stream() + .filter(columnMetaData -> { + String columnName = columnMetaData.getColumnName(); + return !ignoreField.contains(columnName); + }) + .toList(); return getGeneratorStream(dto, tableMeta, columns); }) .collect(Collectors.groupingBy(GeneratorVo::getTableName)); @@ -59,7 +68,13 @@ public class GeneratorServiceImpl implements GeneratorService { // 根据Sql语句进行分析表的属性和表列字段 String sql = dto.getSql(); TableMetaData tableMeta = sqlMetadataProvider.getTableMetadata(sql); - List columns = sqlMetadataProvider.getColumnInfoList(sql); + + List columns = sqlMetadataProvider.getColumnInfoList(sql).stream() + .filter(columnMetaData -> { + String columnName = columnMetaData.getColumnName(); + return !ignoreField.contains(columnName); + }) + .toList(); // 生成代码 List generatorVoList = getGeneratorStream(dto, tableMeta, columns).toList(); diff --git a/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm b/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm index 402020b..45a1cab 100644 --- a/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm +++ b/auth-module/module-generator-code/src/main/resources/vms/server/model/entity/entity.java.vm @@ -1,5 +1,6 @@ package ${package}.domain.entity; +import com.auth.common.model.common.BaseEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.IdType; @@ -20,12 +21,12 @@ import java.util.Date; @Schema(name = "${classUppercaseName}对象", title = "${comment}", description = "${comment}的实体类对象") public class ${classUppercaseName}Entity extends BaseEntity { - #foreach($field in ${columnInfoList}) - @Schema(name = "${field.lowercaseName}", title = "${field.comment}") - #if($field.isPrimaryKey) - @TableId(type = IdType.ASSIGN_ID) - #end - private ${field.javaType} ${field.lowercaseName}; +#foreach($field in ${columnInfoList}) + @Schema(name = "${field.lowercaseName}", title = "${field.comment}") + #if($field.isPrimaryKey) + @TableId(type = IdType.ASSIGN_ID) + #end + private ${field.javaType} ${field.lowercaseName}; - #end +#end } \ No newline at end of file