Merge pull request TencentBlueKing#10431 from fcfang123/issue-10232

feat：获取job执行最大并发/项目活跃用户度量数据 TencentBlueKing#10232
yjieliang · Jun 3, 2024 · e56facf · e56facf
2 parents bfa648a + d80ff31
commit e56facf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/...trics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/dao/DispatchJobMetricsDao.kt b/...trics/biz-metrics/src/main/kotlin/com/tencent/devops/metrics/dao/DispatchJobMetricsDao.kt
@@ -28,6 +28,7 @@
 package com.tencent.devops.metrics.dao
 
 import com.tencent.devops.common.api.util.DateTimeUtil
+import com.tencent.devops.common.db.utils.skipCheck
 import com.tencent.devops.common.event.pojo.measure.DispatchJobMetricsData
 import com.tencent.devops.metrics.pojo.vo.BaseQueryReqVO
 import com.tencent.devops.metrics.pojo.vo.MaxJobConcurrencyVO
@@ -124,6 +125,7 @@ class DispatchJobMetricsDao {
                 ).`as`("第三方构建机最大并发")
             ).from(subQuery)
                 .groupBy(subQuery.field("PROJECT_ID", String::class.java))
+                .skipCheck()
                 .fetchAny()?.let {
                     MaxJobConcurrencyVO(
                         projectId = it.value1(),

diff --git a/...-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt b/...-project/src/main/kotlin/com/tencent/devops/project/service/impl/AbsProjectServiceImpl.kt
@@ -1219,13 +1219,6 @@ abstract class AbsProjectServiceImpl @Autowired constructor(
             ActionAuditContext.current()
                 .addAttribute(PROJECT_ENABLE_OR_DISABLE_TEMPLATE, "disable")
         }
-        projectDispatcher.dispatch(
-            ProjectEnableStatusBroadCastEvent(
-                userId = userId ?: "",
-                projectId = englishName,
-                enabled = enabled
-            )
-        )
         projectDao.updateUsableStatus(
             dslContext = dslContext,
             userId = userId,