From e00a824504b9aea36fef5b3cef928b14b26448cf Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 10 Jan 2025 14:45:24 +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/RepositoryGroupDTO.java | 10 ++++++++++
 .../backend/deploy/entity/RepositoryGroup.java |  6 ++++++
 .../deploy/query/RepositoryProjectQuery.java   |  6 +++---
 .../impl/RepositoryGroupServiceImpl.java       |  4 ++++
 .../db/migration/V1.0.0__init_schema.sql       | 18 ++++++++++--------
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/RepositoryGroupDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/RepositoryGroupDTO.java
index a1e1f98d..c00dc40e 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/RepositoryGroupDTO.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/dto/RepositoryGroupDTO.java
@@ -48,6 +48,16 @@ public class RepositoryGroupDTO extends BaseDTO {
      */
     private String avatarUrl;
 
+    /**
+     * 完整名称（包含层级关系）
+     */
+    private String fullName;
+
+    /**
+     * 完整路径
+     */
+    private String fullPath;
+
     /**
      * 网页URL
      */
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java
index 4a70af97..8f6da067 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/entity/RepositoryGroup.java
@@ -45,6 +45,12 @@ public class RepositoryGroup extends Entity<Long> {
     @Column(name = "group_id", nullable = false)
     private Long groupId;
 
+    @Column(name = "full_name")
+    private String fullName;
+
+    @Column(name = "full_path")
+    private String fullPath;
+
     private Integer sort;
 
     private Boolean enabled = true;
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryProjectQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryProjectQuery.java
index 5daf57d1..f073af58 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryProjectQuery.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/query/RepositoryProjectQuery.java
@@ -22,12 +22,12 @@ public class RepositoryProjectQuery extends BaseQuery {
     @QueryField(field = "visibility")
     private String visibility;
 
-    @QueryField(field = "group_id")
+    @QueryField(field = "groupId")
     private Long groupId;
 
-    @QueryField(field = "external_system_id")
+    @QueryField(field = "externalSystemId")
     private Long externalSystemId;
 
-    @QueryField(field = "project_id")
+    @QueryField(field = "projectId")
     private Long projectId;
 } 
\ No newline at end of file
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java
index a92c4c2e..ae16194f 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/deploy/service/impl/RepositoryGroupServiceImpl.java
@@ -80,6 +80,10 @@ public class RepositoryGroupServiceImpl extends BaseServiceImpl<RepositoryGroup,
                 group.setAvatarUrl(remoteGroup.getAvatarUrl());
                 group.setParentId(remoteGroup.getParentId());
                 
+                // 设置完整名称和路径
+                group.setFullName(remoteGroup.getFullName());
+                group.setFullPath(remoteGroup.getFullPath());
+                
                 groupsToSave.add(group);
             }
 
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 fdf12ba1..1d0a6e6c 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
@@ -281,24 +281,26 @@ CREATE TABLE deploy_repo_group
 (
 	-- 基础字段
 	id                 BIGINT AUTO_INCREMENT PRIMARY KEY COMMENT '主键ID',
-	create_by          VARCHAR(100) NULL COMMENT '创建人',
-	create_time        DATETIME(6) NULL COMMENT '创建时间',
-	update_by          VARCHAR(100) NULL COMMENT '更新人',
-	update_time        DATETIME(6) NULL COMMENT '更新时间',
-	version            INT          NOT NULL DEFAULT 1 COMMENT '版本号',
-	deleted            BIT          NOT NULL DEFAULT 0 COMMENT '是否删除：0-未删除，1-已删除',
-
 	-- 业务字段
 	group_id           BIGINT       NOT NULL COMMENT 'Git系统中的组ID',
 	name               VARCHAR(100) NOT NULL COMMENT '仓库组名',
 	description        VARCHAR(500) NULL COMMENT '仓库组描述',
 	parent_id          BIGINT NULL COMMENT '父级仓库组ID',
+	full_name          VARCHAR(255) NULL COMMENT '完整名称（包含层级关系）',
+	full_path          VARCHAR(255) NULL COMMENT '完整路径',
 	path               VARCHAR(200) NOT NULL COMMENT '仓库组路径',
 	external_system_id BIGINT       NOT NULL COMMENT '外部系统ID',
 	avatar_url         VARCHAR(255) NULL COMMENT '头像URL',
 	web_url            VARCHAR(255) NULL COMMENT '网页URL',
 	visibility         ENUM('private', 'internal', 'public') NOT NULL DEFAULT 'private' COMMENT '可见性：private-私有，internal-内部，public-公开',
-	sort               INT                   DEFAULT 0 COMMENT '排序号'
+	sort               INT                   DEFAULT 0 COMMENT '排序号',
+
+	create_by          VARCHAR(100) NULL COMMENT '创建人',
+	create_time        DATETIME(6) NULL COMMENT '创建时间',
+	update_by          VARCHAR(100) NULL COMMENT '更新人',
+	update_time        DATETIME(6) NULL COMMENT '更新时间',
+	version            INT          NOT NULL DEFAULT 1 COMMENT '版本号',
+	deleted            BIT          NOT NULL DEFAULT 0 COMMENT '是否删除：0-未删除，1-已删除'
 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='代码仓库组表';