From ee8255876f618137f811e14ee305509e4e6466d0 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 6 Jan 2024 21:02:31 +0800 Subject: [PATCH] =?UTF-8?q?feat(tool/generator):=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=20Request=20=E5=AE=9E=E4=BD=93=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=92=88=E5=AF=B9=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/admin/tool/model/entity/FieldConfigDO.java | 7 +++++++ .../admin/tool/service/impl/GeneratorServiceImpl.java | 3 +-- .../src/main/resources/templates/generator/Req.ftl | 5 +++++ .../src/main/resources/templates/generator/index.ftl | 4 ++-- .../resources/db/changelog/v1.1.0/continew-admin_table.sql | 1 + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java index 01f4a846..081ca781 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/model/entity/FieldConfigDO.java @@ -77,6 +77,12 @@ public class FieldConfigDO implements Serializable { @NotBlank(message = "列类型不能为空") private String columnType; + /** + * 列大小 + */ + @Schema(description = "列大小", example = "255") + private Long columnSize; + /** * 字段名称 */ @@ -147,6 +153,7 @@ public class FieldConfigDO implements Serializable { this.tableName = column.getTableName(); this.setColumnName(column.getName()); this.setColumnType(columnType); + this.setColumnSize(column.getSize()); this.setComment(column.getComment()); this.setIsRequired(isRequired); this.setShowInList(true); diff --git a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java index 916fd7ea..a8d8f4ef 100644 --- a/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java +++ b/continew-admin-tool/src/main/java/top/charles7c/continew/admin/tool/service/impl/GeneratorServiceImpl.java @@ -138,7 +138,6 @@ public class GeneratorServiceImpl implements GeneratorService { Collection columnList = MetaUtils.getColumns(dataSource, tableName); return columnList.stream().map(FieldConfigDO::new).collect(Collectors.toList()); } - // 同步最新数据表列信息 if (requireSync) { Collection columnList = MetaUtils.getColumns(dataSource, tableName); @@ -155,6 +154,7 @@ public class GeneratorServiceImpl implements GeneratorService { String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase(); fieldConfig.setColumnType(columnType); + fieldConfig.setColumnSize(column.getSize()); fieldConfig.setComment(column.getComment()); } else { // 新增字段配置 @@ -193,7 +193,6 @@ public class GeneratorServiceImpl implements GeneratorService { fieldConfig.setTableName(tableName); } fieldConfigMapper.insertBatch(fieldConfigList); - // 保存或更新生成配置信息 GenConfigDO newGenConfig = req.getGenConfig(); String frontendPath = newGenConfig.getFrontendPath(); diff --git a/continew-admin-tool/src/main/resources/templates/generator/Req.ftl b/continew-admin-tool/src/main/resources/templates/generator/Req.ftl index d3702379..bd0fbddd 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/Req.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/Req.ftl @@ -16,6 +16,8 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; +import org.hibernate.validator.constraints.Length; + import top.charles7c.continew.starter.extension.crud.base.BaseReq; /** @@ -45,6 +47,9 @@ public class ${className} extends BaseReq { @NotNull(message = "${fieldConfig.comment}不能为空") + <#if fieldConfig.fieldType = 'String' && fieldConfig.columnSize??> + @Length(max = ${fieldConfig.columnSize}, message = "${fieldConfig.comment}长度不能超过 {max} 个字符") + private ${fieldConfig.fieldType} ${fieldConfig.fieldName}; 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 49bc6b20..d2b29a52 100644 --- a/continew-admin-tool/src/main/resources/templates/generator/index.ftl +++ b/continew-admin-tool/src/main/resources/templates/generator/index.ftl @@ -140,7 +140,7 @@ 修改 @@ -421,7 +421,7 @@ proxy.$modal.warning({ title: '警告', titleAlign: 'start', - content: '确定要删除当前选中的数据吗？', + content: `是否确定删除所选的${r'${ids.value.length}'}条数据？`, hideCancel: false, onOk: () => { handleDelete(ids.value); diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql index b09a74bd..83ae054e 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.1.0/continew-admin_table.sql @@ -19,6 +19,7 @@ CREATE TABLE IF NOT EXISTS `gen_field_config` ( `table_name` varchar(64) NOT NULL COMMENT '表名称', `column_name` varchar(64) NOT NULL COMMENT '列名称', `column_type` varchar(25) NOT NULL COMMENT '列类型', + `column_size` bigint(20) DEFAULT NULL COMMENT '列大小', `field_name` varchar(64) NOT NULL COMMENT '字段名称', `field_type` varchar(25) NOT NULL COMMENT '字段类型', `comment` varchar(512) DEFAULT NULL COMMENT '注释',