pref：研发商店通用化接口封装优化 #11049

TencentBlueKing · Dec 3, 2024 · 7c89d57 · 7c89d57
1 parent cd841d2
commit 7c89d57
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/...ain/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt b/...ain/kotlin/com/tencent/devops/store/common/service/impl/StoreComponentQueryServiceImpl.kt
@@ -799,14 +799,14 @@ class StoreComponentQueryServiceImpl : StoreComponentQueryService {
                 ),
                 instanceId = storeInfoQuery.instanceId
             ) ?: emptyMap()
-            testStoreCodes = testComponentMap.keys
             // 查询测试或者审核中组件最新版本信息
             testComponentVersionMap = storeBaseQueryDao.getValidComponentsByCodes(
                 dslContext = dslContext,
-                storeCodes = testStoreCodes,
+                storeCodes = testComponentMap.keys,
                 storeType = storeType,
                 testComponentFlag = true
             ).intoMap({ it[tStoreBase.STORE_CODE] }, { it[tStoreBase.VERSION] })
+            testStoreCodes = testComponentVersionMap.keys
         }
         val componentVersionMap = if (queryTestFlag != true) {
             // 查询非测试或者审核中组件最新发布版本信息
@@ -935,16 +935,12 @@ class StoreComponentQueryServiceImpl : StoreComponentQueryService {
         // 获取项目下已安装组件
         watcher.start("getInstalledComponents")
         val installedInfoMap = projectCode?.let {
-            if (storeInfoQuery.installed != null || storeInfoQuery.updateFlag != null) {
-                storeProjectService.getProjectComponents(
-                    projectCode = it,
-                    storeType = storeTypeEnum.type.toByte(),
-                    storeProjectTypes = listOf(StoreProjectTypeEnum.COMMON.type.toByte()),
-                    instanceId = storeInfoQuery.instanceId
-                )
-            } else {
-                null
-            }
+            storeProjectService.getProjectComponents(
+                projectCode = it,
+                storeType = storeTypeEnum.type.toByte(),
+                storeProjectTypes = listOf(StoreProjectTypeEnum.COMMON.type.toByte()),
+                instanceId = storeInfoQuery.instanceId
+            )
         }
         // 获取分类
         watcher.start("getAllClassify")

diff --git a/support-files/sql/2004_v3.x/2020_ci_store-update_v3.0_mysql.sql b/support-files/sql/2004_v3.x/2020_ci_store-update_v3.0_mysql.sql
@@ -34,9 +34,9 @@ BEGIN
                    FROM information_schema.statistics
                    WHERE TABLE_SCHEMA = db
                      AND TABLE_NAME = 'T_STORE_PROJECT_REL'
-                     AND INDEX_NAME = 'INX_TSPR_TYPE_CODE_TYPE') THEN
+                     AND INDEX_NAME = 'INX_TSPR_PROJECT_TYPE') THEN
     ALTER TABLE `T_STORE_PROJECT_REL` ADD INDEX
-        `INX_TSPR_TYPE_CODE_TYPE` (`STORE_TYPE`,`STORE_CODE`,`TYPE`);
+        `INX_TSPR_PROJECT_TYPE` (`PROJECT_CODE`,`TYPE`);
     END IF;
 
     IF EXISTS(SELECT 1