From 8026f660c7af7bba6d4caaf31535a890e5b40a96 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 22 Feb 2024 22:33:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=94=9F=E6=88=90=20text=20=E7=B1=BB=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E9=95=BF=E5=BA=A6=E6=A0=A1=E9=AA=8C=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=95=B0=E5=80=BC=E6=98=BE=E7=A4=BA=E4=B8=BA=2065,535?= =?UTF-8?q?=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../continew/admin/tool/model/entity/FieldConfigDO.java | 5 +++-- .../admin/tool/service/impl/GeneratorServiceImpl.java | 3 ++- 2 files changed, 5 insertions(+), 3 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 cfaed9c5..9b80c785 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 @@ -16,6 +16,7 @@ package top.charles7c.continew.admin.tool.model.entity; +import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import cn.hutool.db.meta.Column; import cn.hutool.setting.dialect.Props; @@ -76,7 +77,7 @@ public class FieldConfigDO implements Serializable { * 列大小 */ @Schema(description = "列大小", example = "255") - private Long columnSize; + private String columnSize; /** * 字段名称 @@ -146,7 +147,7 @@ public FieldConfigDO(@NonNull Column column) { this.setTableName(column.getTableName()); this.setColumnName(column.getName()); this.setColumnType(StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0].toLowerCase()); - this.setColumnSize(column.getSize()); + this.setColumnSize(Convert.toStr(column.getSize())); this.setComment(column.getComment()); this.setIsRequired(!column.isPk() && !column.isNullable()); 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 e2121c80..9fc62e75 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 @@ -18,6 +18,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.file.FileNameUtil; @@ -149,7 +150,7 @@ public List listFieldConfig(String tableName, Boolean requireSync String columnType = StrUtil.splitToArray(column.getTypeName(), StringConstants.SPACE)[0] .toLowerCase(); fieldConfig.setColumnType(columnType); - fieldConfig.setColumnSize(column.getSize()); + fieldConfig.setColumnSize(Convert.toStr(column.getSize())); fieldConfig.setComment(column.getComment()); } else { // 新增字段配置