【PAC】feat：新增代码库详情页 #8118

TencentBlueKing · Nov 9, 2023 · 45ed18f · 45ed18f
1 parent 07ab2a9
commit 45ed18f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 29 deletions.
diff --git a/...pi-repository/src/main/kotlin/com/tencent/devops/repository/api/UserRepositoryResource.kt b/...pi-repository/src/main/kotlin/com/tencent/devops/repository/api/UserRepositoryResource.kt
@@ -182,9 +182,6 @@ interface UserRepositoryResource {
         @ApiParam("仓库别名", required = false)
         @QueryParam("aliasName")
         aliasName: String?,
-        @ApiParam("仓库关键字[可取代码库别名/HashId/gitProjectId],此值存在时[aliasName]参数无效", required = false)
-        @QueryParam("repoKeyWordRef")
-        repoKeyWordRef: String?,
         @ApiParam("第几页", required = false, defaultValue = "1")
         @QueryParam("page")
         page: Int?,

diff --git a/...ository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/RepositoryDao.kt b/...ository/biz-repository/src/main/kotlin/com/tencent/devops/repository/dao/RepositoryDao.kt
@@ -119,7 +119,6 @@ class RepositoryDao {
         projectIds: Collection<String>,
         repositoryTypes: List<ScmType>?,
         aliasName: String?,
-        repoKeyWordRef: String? = null,
         repositoryIds: Set<Long>?
     ): Long {
         with(TRepository.T_REPOSITORY) {
@@ -130,14 +129,8 @@ class RepositoryDao {
             if (repositoryIds != null) {
                 step.and(REPOSITORY_ID.`in`(repositoryIds))
             }
-            // 关键字搜索
-            if (!repoKeyWordRef.isNullOrBlank()) {
-                step.and(
-                    ALIAS_NAME.like("%$repoKeyWordRef%")
-                        .or(REPOSITORY_HASH_ID.eq(repoKeyWordRef))
-                )
-            }
-            if (!aliasName.isNullOrBlank() && repoKeyWordRef.isNullOrBlank()) {
+
+            if (!aliasName.isNullOrBlank()) {
                 step.and(ALIAS_NAME.like("%$aliasName%"))
             }
             return when (repositoryTypes) {
@@ -249,7 +242,6 @@ class RepositoryDao {
         projectId: String,
         repositoryTypes: List<ScmType>?,
         aliasName: String?,
-        repoKeyWordRef: String? = null,
         repositoryIds: Set<Long>?,
         offset: Int,
         limit: Int,
@@ -263,14 +255,7 @@ class RepositoryDao {
             if (repositoryIds != null) {
                 step.and(REPOSITORY_ID.`in`(repositoryIds))
             }
-            // 关键字搜索
-            if (!repoKeyWordRef.isNullOrBlank()) {
-                step.and(
-                    ALIAS_NAME.like("%$repoKeyWordRef%")
-                        .or(REPOSITORY_HASH_ID.eq(repoKeyWordRef))
-                )
-            }
-            if (!aliasName.isNullOrBlank() && repoKeyWordRef.isNullOrBlank()) {
+            if (!aliasName.isNullOrBlank()) {
                 step.and(ALIAS_NAME.like("%$aliasName%"))
             }
             when (repositoryTypes) {

diff --git a/...ory/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryResourceImpl.kt b/...ory/src/main/kotlin/com/tencent/devops/repository/resources/UserRepositoryResourceImpl.kt
@@ -235,7 +235,6 @@ class UserRepositoryResourceImpl @Autowired constructor(
         projectId: String,
         repositoryType: ScmType?,
         aliasName: String?,
-        repoKeyWordRef: String?,
         page: Int?,
         pageSize: Int?,
         sortBy: String?,
@@ -255,7 +254,6 @@ class UserRepositoryResourceImpl @Autowired constructor(
             projectId = projectId,
             repositoryType = repositoryType,
             aliasName = aliasName,
-            repoKeyWordRef = repoKeyWordRef,
             offset = limit.offset,
             limit = limit.limit,
             sortBy = sortBy,

diff --git a/...biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt b/...biz-repository/src/main/kotlin/com/tencent/devops/repository/service/RepositoryService.kt
@@ -70,15 +70,15 @@ import com.tencent.devops.scm.pojo.GitCommit
 import com.tencent.devops.scm.pojo.GitProjectInfo
 import com.tencent.devops.scm.pojo.GitRepositoryDirItem
 import com.tencent.devops.scm.pojo.GitRepositoryResp
-import java.time.LocalDateTime
-import java.util.Base64
-import javax.ws.rs.NotFoundException
 import org.jooq.DSLContext
 import org.jooq.impl.DSL
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
+import java.time.LocalDateTime
+import java.util.Base64
+import javax.ws.rs.NotFoundException
 
 @Service
 @Suppress("ALL")
@@ -653,7 +653,6 @@ class RepositoryService @Autowired constructor(
         projectId: String,
         repositoryType: ScmType?,
         aliasName: String?,
-        repoKeyWordRef: String? = null,
         offset: Int,
         limit: Int,
         sortBy: String? = null,
@@ -676,15 +675,13 @@ class RepositoryService @Autowired constructor(
                 projectIds = setOf(projectId),
                 repositoryTypes = repositoryType?.let { listOf(it) },
                 aliasName = aliasName,
-                repoKeyWordRef = repoKeyWordRef,
                 repositoryIds = hasListPermissionRepoList.toSet()
             )
         val repositoryRecordList = repositoryDao.listByProject(
             dslContext = dslContext,
             projectId = projectId,
             repositoryTypes = repositoryType?.let { listOf(it) },
             aliasName = aliasName,
-            repoKeyWordRef = repoKeyWordRef,
             repositoryIds = hasListPermissionRepoList.toSet(),
             offset = offset,
             limit = limit,