feat:流水线选择插件页面，研发商店入口，插件列表优化 Tencent#1268

(cherry picked from commit 412a128)
mingshewhe · Jun 28, 2024 · b4f69f1 · b4f69f1
1 parent d088089
commit b4f69f1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/...ore/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserAtomResource.kt b/...ore/store/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserAtomResource.kt
@@ -39,6 +39,7 @@ import com.tencent.devops.store.pojo.atom.AtomResp
 import com.tencent.devops.store.pojo.atom.AtomRespItem
 import com.tencent.devops.store.pojo.atom.InstalledAtom
 import com.tencent.devops.store.pojo.atom.PipelineAtom
+import com.tencent.devops.store.pojo.atom.enums.AtomCategoryEnum
 import com.tencent.devops.store.pojo.common.UnInstallReq
 import com.tencent.devops.store.pojo.common.VersionInfo
 import io.swagger.annotations.Api
@@ -86,7 +87,7 @@ interface UserAtomResource {
         projectCode: String,
         @ApiParam("插件所属范畴，TRIGGER：触发器类插件 TASK：任务类插件", required = false)
         @QueryParam("category")
-        category: String?,
+        category: String? = AtomCategoryEnum.TASK.name,
         @ApiParam("插件分类id", required = false)
         @QueryParam("classifyId")
         classifyId: String?,

diff --git a/...kend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/dao/atom/AtomDao.kt b/...kend/ci/core/store/biz-store/src/main/kotlin/com/tencent/devops/store/dao/atom/AtomDao.kt
@@ -822,8 +822,8 @@ class AtomDao : AtomBaseDao() {
                 conditions.add(ta.JOB_TYPE.eq(jobType).or(ta.BUILD_LESS_RUN_FLAG.eq(true)))
             } else {
                 conditions.add(ta.JOB_TYPE.eq(jobType))
-                if (queryFitAgentBuildLessAtomFlag == false && category == null) {
-                    conditions.add(ta.CATEGROY.eq(AtomCategoryEnum.TASK.category.toByte()))
+                if (queryFitAgentBuildLessAtomFlag == false) {
+                    conditions.add(ta.BUILD_LESS_RUN_FLAG.ne(true))
                 }
             }
         }

diff --git a/...core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/AtomService.kt b/...core/store/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/AtomService.kt
@@ -36,6 +36,7 @@ import com.tencent.devops.store.pojo.atom.AtomRespItem
 import com.tencent.devops.store.pojo.atom.AtomUpdateRequest
 import com.tencent.devops.store.pojo.atom.InstalledAtom
 import com.tencent.devops.store.pojo.atom.PipelineAtom
+import com.tencent.devops.store.pojo.atom.enums.AtomCategoryEnum
 import com.tencent.devops.store.pojo.common.VersionInfo
 import com.tencent.devops.store.pojo.common.UnInstallReq
 
@@ -57,7 +58,7 @@ interface AtomService {
         jobType: String?,
         os: String?,
         projectCode: String,
-        category: String?,
+        category: String? = AtomCategoryEnum.TASK.name,
         classifyId: String?,
         recommendFlag: Boolean?,
         keyword: String?,
@@ -77,7 +78,7 @@ interface AtomService {
         jobType: String?,
         os: String?,
         projectCode: String,
-        category: String?,
+        category: String? = AtomCategoryEnum.TASK.name,
         classifyId: String?,
         recommendFlag: Boolean?,
         keyword: String?,