From 4e10a0c2ef0ea1207671dac2144fb1ef96edcbe8 Mon Sep 17 00:00:00 2001 From: byeJuly <3165119086@qq.com> Date: Wed, 10 Apr 2024 17:51:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20Infra=20=E6=A8=A1?= =?UTF-8?q?=E5=9D=97:=20=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E8=BE=BE=E6=A2=A68=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=90=8E,=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=EF=BC=9A=20=E8=B0=83=E6=95=B4=E7=AD=96?= =?UTF-8?q?=E7=95=A5=EF=BC=9A=E5=88=A0=E9=99=A4->=20autoIncrement=20<-?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/dm/ruoyi-vue-pro-dm8.sql | 3 --- sql/mysql/ruoyi-vue-pro.sql | 2 +- sql/oracle/ruoyi-vue-pro.sql | 2 -- sql/postgresql/ruoyi-vue-pro.sql | 3 --- sql/sqlserver/ruoyi-vue-pro.sql | 8 -------- .../admin/codegen/vo/column/CodegenColumnRespVO.java | 3 --- .../admin/codegen/vo/column/CodegenColumnSaveReqVO.java | 4 ---- .../module/infra/convert/codegen/CodegenConvert.java | 1 - .../infra/dal/dataobject/codegen/CodegenColumnDO.java | 6 ------ .../infra/service/codegen/inner/CodegenBuilderTest.java | 1 - .../src/test/resources/codegen/table/category.json | 3 +-- .../src/test/resources/codegen/table/contact.json | 3 +-- .../src/test/resources/codegen/table/student.json | 3 +-- .../src/test/resources/codegen/table/teacher.json | 3 +-- 14 files changed, 5 insertions(+), 40 deletions(-) diff --git a/sql/dm/ruoyi-vue-pro-dm8.sql b/sql/dm/ruoyi-vue-pro-dm8.sql index e5369739e..98c29b431 100644 --- a/sql/dm/ruoyi-vue-pro-dm8.sql +++ b/sql/dm/ruoyi-vue-pro-dm8.sql @@ -249,7 +249,6 @@ CREATE TABLE "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN" "COLUMN_COMMENT" VARCHAR(500) NOT NULL, "NULLABLE" BIT NOT NULL, "PRIMARY_KEY" BIT NOT NULL, - "AUTO_INCREMENT" CHAR(1) NOT NULL, "ORDINAL_POSITION" INT NOT NULL, "JAVA_TYPE" VARCHAR(32) NOT NULL, "JAVA_FIELD" VARCHAR(64) NOT NULL, @@ -2512,8 +2511,6 @@ COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否 COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键'; -COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增'; - COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序'; COMMENT ON COLUMN "RUOYI_VUE_PRO"."INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型'; diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql index 24385dab4..8e1bc421d 100644 --- a/sql/mysql/ruoyi-vue-pro.sql +++ b/sql/mysql/ruoyi-vue-pro.sql @@ -409,7 +409,7 @@ CREATE TABLE `infra_codegen_column` ( `column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述', `nullable` bit(1) NOT NULL COMMENT '是否允许为空', `primary_key` bit(1) NOT NULL COMMENT '是否主键', - `auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增', + `is_auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增', `ordinal_position` int NOT NULL COMMENT '排序', `java_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性类型', `java_field` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性名', diff --git a/sql/oracle/ruoyi-vue-pro.sql b/sql/oracle/ruoyi-vue-pro.sql index 0eb0f6440..dbe0e6a7b 100644 --- a/sql/oracle/ruoyi-vue-pro.sql +++ b/sql/oracle/ruoyi-vue-pro.sql @@ -622,7 +622,6 @@ CREATE TABLE "INFRA_CODEGEN_COLUMN" ( "COLUMN_COMMENT" NVARCHAR2(500), "NULLABLE" NUMBER(4,0), "PRIMARY_KEY" NUMBER(4,0), - "AUTO_INCREMENT" NUMBER(4,0), "ORDINAL_POSITION" NUMBER(11,0) NOT NULL, "JAVA_TYPE" NVARCHAR2(32), "JAVA_FIELD" NVARCHAR2(64), @@ -664,7 +663,6 @@ COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."DATA_TYPE" IS '字段类型'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."COLUMN_COMMENT" IS '字段描述'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."NULLABLE" IS '是否允许为空'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."PRIMARY_KEY" IS '是否主键'; -COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."AUTO_INCREMENT" IS '是否自增'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."ORDINAL_POSITION" IS '排序'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_TYPE" IS 'Java 属性类型'; COMMENT ON COLUMN "INFRA_CODEGEN_COLUMN"."JAVA_FIELD" IS 'Java 属性名'; diff --git a/sql/postgresql/ruoyi-vue-pro.sql b/sql/postgresql/ruoyi-vue-pro.sql index 206fdfce8..cff06d5a7 100644 --- a/sql/postgresql/ruoyi-vue-pro.sql +++ b/sql/postgresql/ruoyi-vue-pro.sql @@ -1225,7 +1225,6 @@ CREATE TABLE "infra_codegen_column" "column_comment" varchar(500) COLLATE "pg_catalog"."default" NOT NULL, "nullable" bool NOT NULL, "primary_key" bool NOT NULL, - "auto_increment" bool NOT NULL, "ordinal_position" int4 NOT NULL, "java_type" varchar(32) COLLATE "pg_catalog"."default" NOT NULL, "java_field" varchar(64) COLLATE "pg_catalog"."default" NOT NULL, @@ -1259,8 +1258,6 @@ ON COLUMN "infra_codegen_column"."nullable" IS '是否允许为空'; COMMENT ON COLUMN "infra_codegen_column"."primary_key" IS '是否主键'; COMMENT -ON COLUMN "infra_codegen_column"."auto_increment" IS '是否自增'; -COMMENT ON COLUMN "infra_codegen_column"."ordinal_position" IS '排序'; COMMENT ON COLUMN "infra_codegen_column"."java_type" IS 'Java 属性类型'; diff --git a/sql/sqlserver/ruoyi-vue-pro.sql b/sql/sqlserver/ruoyi-vue-pro.sql index bfb10f6bd..830a96ab3 100644 --- a/sql/sqlserver/ruoyi-vue-pro.sql +++ b/sql/sqlserver/ruoyi-vue-pro.sql @@ -1957,7 +1957,6 @@ CREATE TABLE [dbo].[infra_codegen_column] ( [column_comment] nvarchar(500) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, [nullable] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, [primary_key] varchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, - [auto_increment] nchar(1) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, [ordinal_position] int NOT NULL, [java_type] nvarchar(32) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, [java_field] nvarchar(64) COLLATE SQL_Latin1_General_CP1_CI_AS NOT NULL, @@ -2029,13 +2028,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'primary_key' GO -EXEC sp_addextendedproperty -'MS_Description', N'是否自增', -'SCHEMA', N'dbo', -'TABLE', N'infra_codegen_column', -'COLUMN', N'auto_increment' -GO - EXEC sp_addextendedproperty 'MS_Description', N'排序', 'SCHEMA', N'dbo', diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java index f5384ab51..29a8c743e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnRespVO.java @@ -30,9 +30,6 @@ public class CodegenColumnRespVO { @Schema(description = "是否主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "false") private Boolean primaryKey; - @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - private Boolean autoIncrement; - @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") private Integer ordinalPosition; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java index edad804ba..18067c2fa 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnSaveReqVO.java @@ -36,10 +36,6 @@ public class CodegenColumnSaveReqVO { @NotNull(message = "是否主键不能为空") private Boolean primaryKey; - @Schema(description = "是否自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "true") - @NotNull(message = "是否自增不能为空") - private Boolean autoIncrement; - @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED, example = "10") @NotNull(message = "排序不能为空") private Integer ordinalPosition; diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java index feb4b2384..6b976135c 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/convert/codegen/CodegenConvert.java @@ -41,7 +41,6 @@ public interface CodegenConvert { @Mapping(source = "comment", target = "columnComment"), @Mapping(source = "metaInfo.nullable", target = "nullable"), @Mapping(source = "keyFlag", target = "primaryKey"), - @Mapping(source = "keyIdentityFlag", target = "autoIncrement"), @Mapping(source = "columnType.type", target = "javaType"), @Mapping(source = "propertyName", target = "javaField"), }) diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java index 368162214..f90a3645a 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/codegen/CodegenColumnDO.java @@ -67,12 +67,6 @@ public class CodegenColumnDO extends BaseDO { * 关联 {@link TableField#isKeyFlag()} */ private Boolean primaryKey; - /** - * 是否自增 - * - * 关联 {@link TableField#isKeyIdentityFlag()} - */ - private Boolean autoIncrement; /** * 排序 */ diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java index 01a55be19..ce283ec51 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenBuilderTest.java @@ -72,7 +72,6 @@ public class CodegenBuilderTest extends BaseMockitoUnitTest { assertEquals("编号", column.getColumnComment()); assertFalse(column.getNullable()); assertTrue(column.getPrimaryKey()); - assertTrue(column.getAutoIncrement()); assertEquals(1, column.getOrdinalPosition()); assertEquals("Long", column.getJavaType()); assertEquals("id", column.getJavaField()); diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json index 210613f5d..ea58fc3f3 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/category.json @@ -18,7 +18,6 @@ "dataType" : "BIGINT", "columnComment" : "编号", "primaryKey" : true, - "autoIncrement" : true, "javaType" : "Long", "javaField" : "id", "example" : "1024", @@ -50,4 +49,4 @@ "updateOperation" : true, "listOperationResult" : true } ] -} \ No newline at end of file +} diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json index 6a310570f..1ce00a90e 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/contact.json @@ -14,7 +14,6 @@ "dataType" : "BIGINT", "columnComment" : "编号", "primaryKey" : true, - "autoIncrement" : true, "javaType" : "Long", "javaField" : "id", "example" : "1024", @@ -141,4 +140,4 @@ "listOperationResult" : true, "htmlType" : "datetime" } ] -} \ No newline at end of file +} diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json index 0cc29c5a9..29cb071eb 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/student.json @@ -17,7 +17,6 @@ "dataType" : "BIGINT", "columnComment" : "编号", "primaryKey" : true, - "autoIncrement" : true, "javaType" : "Long", "javaField" : "id", "example" : "1024", @@ -132,4 +131,4 @@ "listOperationResult" : true, "htmlType" : "datetime" } ] -} \ No newline at end of file +} diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json index 7ef460400..2fcb475a1 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json +++ b/yudao-module-infra/yudao-module-infra-biz/src/test/resources/codegen/table/teacher.json @@ -14,7 +14,6 @@ "dataType" : "BIGINT", "columnComment" : "编号", "primaryKey" : true, - "autoIncrement" : true, "javaType" : "Long", "javaField" : "id", "example" : "1024", @@ -141,4 +140,4 @@ "listOperationResult" : true, "htmlType" : "datetime" } ] -} \ No newline at end of file +} -- Gitee From f89d9f6d9915da3d3b7d9b8c3159255cdf0d9802 Mon Sep 17 00:00:00 2001 From: byeJuly <3165119086@qq.com> Date: Wed, 10 Apr 2024 19:08:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BC=8F=E6=8E=89=E4=B8=80=E4=B8=AAmysql,?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/mysql/ruoyi-vue-pro.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/sql/mysql/ruoyi-vue-pro.sql b/sql/mysql/ruoyi-vue-pro.sql index 8e1bc421d..5950b3fff 100644 --- a/sql/mysql/ruoyi-vue-pro.sql +++ b/sql/mysql/ruoyi-vue-pro.sql @@ -409,7 +409,6 @@ CREATE TABLE `infra_codegen_column` ( `column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '字段描述', `nullable` bit(1) NOT NULL COMMENT '是否允许为空', `primary_key` bit(1) NOT NULL COMMENT '是否主键', - `is_auto_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '是否自增', `ordinal_position` int NOT NULL COMMENT '排序', `java_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性类型', `java_field` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'Java 属性名', -- Gitee