From 64128f15ec4843ec65d16d020ba7a39a18f6bf43 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Fri, 10 Jan 2025 10:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=A3=B0=E9=81=93=E6=92=92=E6=97=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/deploy/dto/ApplicationDTO.java | 15 +++++--- .../backend/deploy/entity/Application.java | 36 ++++++++++++------- .../deploy/query/RepositoryGroupQuery.java | 8 ++--- .../db/migration/V1.0.0__init_schema.sql | 5 +-- 4 files changed, 41 insertions(+), 23 deletions(-) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/ApplicationDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/ApplicationDTO.java index c933f593..4430c032 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/ApplicationDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/ApplicationDTO.java @@ -28,14 +28,21 @@ public class ApplicationDTO extends BaseDTO { @NotNull(message = "开发语言") private DevelopmentLanguageTypeEnum language; + @NotNull(message = "代码仓库组ID不能为空") + private Long repoGroupId; + + @NotNull(message = "代码仓库项目ID不能为空") + private Long repoProjectId; + + @NotNull(message = "所属项目组ID不能为空") + private Long projectGroupId; + + private ProjectGroupDTO projectGroup; + @Schema(description = "是否启用") private Boolean enabled; @NotNull(message = "排序号不能为空") private Integer sort; - private Long projectGroupId; - - private ProjectGroupDTO projectGroup; - } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java index cf99e3a1..840c8e7a 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/Application.java @@ -42,17 +42,6 @@ public class Application extends Entity { @Column(name = "app_desc") private String appDesc; - /** - * 应用状态 - */ - @Column(nullable = false) - private Boolean enabled = true; - - /** - * 代码仓库地址 - */ - @Column(name = "repo_url") - private String repoUrl; /** * 开发语言 @@ -60,13 +49,34 @@ public class Application extends Entity { @Column(name = "language") private DevelopmentLanguageTypeEnum language; + /** + * 代码仓库组ID + */ + @Column(name = "repo_group_id", nullable = false) + private Long repoGroupId; + + /** + * 代码仓库项目ID + */ + @Column(name = "repo_project_id", nullable = false) + private Long repoProjectId; + + /** + * 项目组ID + */ + @Column(name = "project_group_id", nullable = false) + private Long projectGroupId; + /** * 排序号 */ @Column(name = "sort", nullable = false) private Integer sort; - @Column(name = "project_group_id", nullable = false) - private Long projectGroupId; + /** + * 应用状态 + */ + @Column(nullable = false) + private Boolean enabled = true; } \ No newline at end of file diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java index d4bb0519..2deba066 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryGroupQuery.java @@ -30,13 +30,13 @@ public class RepositoryGroupQuery extends BaseQuery { /** * 外部系统中的组ID */ - @QueryField(field = "group_id") + @QueryField(field = "groupId") private Long groupId; /** * 父级仓库组ID */ - @QueryField(field = "parent_id") + @QueryField(field = "parentId") private Long parentId; /** @@ -48,13 +48,13 @@ public class RepositoryGroupQuery extends BaseQuery { /** * 外部系统ID */ - @QueryField(field = "external_system_id") + @QueryField(field = "externalSystemId",type = QueryType.EQUAL) private Long externalSystemId; /** * 头像URL */ - @QueryField(field = "avatar_url", type = QueryType.LIKE) + @QueryField(field = "avatarUrl", type = QueryType.LIKE) private String avatarUrl; /** diff --git a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql index 71f74f1f..fdf12ba1 100644 --- a/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql +++ b/backend/src/main/resources/db/migration/V1.0.0__init_schema.sql @@ -548,6 +548,8 @@ CREATE TABLE deploy_application language VARCHAR(50) NULL COMMENT '开发语言：JAVA、PYTHON、NODEJS', enabled BIT NOT NULL DEFAULT 1 COMMENT '是否启用（0：禁用，1：启用）', sort INT NOT NULL DEFAULT 0 COMMENT '排序号', + repo_group_id BIGINT NOT NULL COMMENT '代码仓库项目ID', + repo_project_id BIGINT NOT NULL COMMENT '代码仓库项目ID', project_group_id BIGINT NOT NULL COMMENT '所属项目组ID', -- 基础字段 create_by VARCHAR(100) NULL COMMENT '创建人', @@ -562,8 +564,7 @@ CREATE TABLE deploy_application UNIQUE INDEX uk_app_code (project_group_id, app_code) COMMENT '项目下应用编码唯一', -- 外键约束 - CONSTRAINT fk_application_project_group FOREIGN KEY (project_group_id) - REFERENCES deploy_project_group (id) + CONSTRAINT fk_application_project_group FOREIGN KEY (project_group_id) REFERENCES deploy_project_group (id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT ='应用表';