From f9da7b465526fd5697ddbdda1332c49657c16dcf Mon Sep 17 00:00:00 2001 From: RJ Date: Wed, 17 Jul 2024 10:54:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E5=8A=A0=E9=80=9F?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E6=8A=A5=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=20#269?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tencent/devops/turbo/dao/mongotemplate/TbsDaySummaryDao.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/mongotemplate/TbsDaySummaryDao.kt b/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/mongotemplate/TbsDaySummaryDao.kt index a1747d72..615820eb 100644 --- a/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/mongotemplate/TbsDaySummaryDao.kt +++ b/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/mongotemplate/TbsDaySummaryDao.kt @@ -77,6 +77,7 @@ class TbsDaySummaryDao @Autowired constructor( val criteria = Criteria.where("day").gte(startDate).lte(endDate) .and("user").`is`(null) + .and("total_time_with_cpu").gt(0) .and("engine_code").ne("disttask-ue4") .apply { if (filterPlanIdNin.isNotEmpty()) and("plan_id").nin(filterPlanIdNin) } .apply { if (filterProjectIdNin.isNotEmpty()) and("project_id").nin(filterProjectIdNin) } @@ -112,6 +113,7 @@ class TbsDaySummaryDao @Autowired constructor( logger.info("findByDayForUE startDate: $startDate, endDate: $endDate, filterPlanIdNin: $filterPlanIdNin") val criteria = Criteria.where("day").gte(startDate).lte(endDate) .and("user").ne(null) + .and("total_time_with_cpu").gt(0) .and("engine_code").`is`("disttask-ue4") .apply { if (filterPlanIdNin.isNotEmpty()) and("plan_id").nin(filterPlanIdNin) From 1238b4a92a7d7ecc567551049e897bd0999767a6 Mon Sep 17 00:00:00 2001 From: RJ Date: Wed, 17 Jul 2024 15:40:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20quartz-mongodb=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E5=88=B0=E4=BA=86jcenter=20#269?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/turbo/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/turbo/build.gradle.kts b/src/backend/turbo/build.gradle.kts index 4df630b8..d62c17e9 100644 --- a/src/backend/turbo/build.gradle.kts +++ b/src/backend/turbo/build.gradle.kts @@ -17,6 +17,7 @@ allprojects { repositories { maven(url = "https://mirrors.tencent.com/repository/maven/bkdevops_maven") + jcenter() } configurations.forEach { From 66c8f69ccfe3fc422cb72072553b23c7046b0ebc Mon Sep 17 00:00:00 2001 From: RJ Date: Tue, 10 Sep 2024 15:13:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E5=8A=A0=E9=80=9F?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E6=8A=A5=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=20#269?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devops/turbo/dao/repository/BaseDataRepository.kt | 5 +++++ .../devops/turbo/service/ProjectResourcesService.kt | 10 ++++++---- .../devops/common/util/constants/TurboConstants.kt | 10 ++++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/repository/BaseDataRepository.kt b/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/repository/BaseDataRepository.kt index 017efc30..98220399 100644 --- a/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/repository/BaseDataRepository.kt +++ b/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/dao/repository/BaseDataRepository.kt @@ -11,4 +11,9 @@ interface BaseDataRepository : MongoRepository { * 根据参数标识代码查询 */ fun findFirstByParamCode(paramCode: String): BaseDataEntity? + + /** + * 根据参数标识代码list查询 + */ + fun findByParamCodeIn(paramCodeList: List): List } diff --git a/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/service/ProjectResourcesService.kt b/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/service/ProjectResourcesService.kt index 6f078178..a269e87c 100644 --- a/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/service/ProjectResourcesService.kt +++ b/src/backend/turbo/biz-turbo/src/main/kotlin/com/tencent/devops/turbo/service/ProjectResourcesService.kt @@ -6,7 +6,8 @@ import com.tencent.devops.common.api.exception.code.TURBO_PARAM_INVALID import com.tencent.devops.common.api.pojo.Page import com.tencent.devops.common.util.JsonUtil import com.tencent.devops.common.util.MathUtil -import com.tencent.devops.common.util.constants.BASE_EXCLUDED_PLAN_ID_LIST +import com.tencent.devops.common.util.constants.BASE_EXCLUDED_COMMON_PLAN_ID +import com.tencent.devops.common.util.constants.BASE_EXCLUDED_PLAN_ID_LIST_FOR_DEV_CLOUD import com.tencent.devops.common.util.constants.BASE_EXCLUDED_PROJECT_ID_LIST import com.tencent.devops.turbo.config.TodCostProperties import com.tencent.devops.turbo.dao.mongotemplate.TbsDaySummaryDao @@ -50,8 +51,9 @@ class ProjectResourcesService @Autowired constructor( val pageSizeNum = pageSize?.coerceAtMost(10000) ?: 100 // 获取需要过滤掉的方案id集合 - val baseDataEntity = baseDataRepository.findFirstByParamCode(BASE_EXCLUDED_PLAN_ID_LIST) - val filterPlanIds = baseDataEntity?.paramValue?.split(",")?.toSet() ?: emptySet() + val baseDataEntityList = baseDataRepository.findByParamCodeIn(listOf(BASE_EXCLUDED_PLAN_ID_LIST_FOR_DEV_CLOUD, + BASE_EXCLUDED_COMMON_PLAN_ID)) + val filterPlanIds = baseDataEntityList.flatMap { it.paramValue.split(",") }.toSet() ?: emptySet() // 获取需要过滤掉的项目id集合 val projectExcludedEntity = baseDataRepository.findFirstByParamCode(BASE_EXCLUDED_PROJECT_ID_LIST) @@ -120,7 +122,7 @@ class ProjectResourcesService @Autowired constructor( val end = endDate?.let { LocalDate.parse(it) } ?: today.withDayOfMonth(14) this.checkDatesInMonth(month, start, end) - val filterPlanIds = getFilterIds(BASE_EXCLUDED_PLAN_ID_LIST) + val filterPlanIds = getFilterIds(BASE_EXCLUDED_COMMON_PLAN_ID) val filterProjectIds = getFilterIds(BASE_EXCLUDED_PROJECT_ID_LIST) val properties = SpringContextHolder.getBean() diff --git a/src/backend/turbo/common-turbo/common-turbo-util/src/main/kotlin/com/tencent/devops/common/util/constants/TurboConstants.kt b/src/backend/turbo/common-turbo/common-turbo-util/src/main/kotlin/com/tencent/devops/common/util/constants/TurboConstants.kt index 77f7db81..af6726a4 100644 --- a/src/backend/turbo/common-turbo/common-turbo-util/src/main/kotlin/com/tencent/devops/common/util/constants/TurboConstants.kt +++ b/src/backend/turbo/common-turbo/common-turbo-util/src/main/kotlin/com/tencent/devops/common/util/constants/TurboConstants.kt @@ -11,11 +11,17 @@ const val SYSTEM_ADMIN = "Turbo" const val NO_ADMIN_MEMBER_MESSAGE = "无权限，请先加入项目！" /** - * 统计数据需排除的plan id + * 统计数据需排除的plan id(DevCloud专用统计排除，服务计费不需要过滤掉) + * 微信和王者的机器资源是他们自己管理，DevCloud无需计费，咱们内部计费需要纳入统计 */ -const val BASE_EXCLUDED_PLAN_ID_LIST = "EXCLUDED_PLAN_ID_LIST" +const val BASE_EXCLUDED_PLAN_ID_LIST_FOR_DEV_CLOUD = "EXCLUDED_PLAN_ID_LIST" /** * 统计数据需排除的project id */ const val BASE_EXCLUDED_PROJECT_ID_LIST = "EXCLUDED_PROJECT_ID_LIST" + +/** + * 内部测试的方案，服务计费时需要过滤掉 + */ +const val BASE_EXCLUDED_COMMON_PLAN_ID = "EXCLUDED_COMMON_PLAN_ID_LIST" From 8c6f72d8bd3cb341ca4a44f8709688914a52a826 Mon Sep 17 00:00:00 2001 From: RJ Date: Tue, 10 Sep 2024 16:16:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E5=8A=A0=E9=80=9F?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=B8=8A=E6=8A=A5=E7=BB=9F=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BC=82=E5=B8=B8=20#269?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/turbo/build.gradle.kts | 1 - .../turbo/common-turbo/common-turbo-quartz/build.gradle.kts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/backend/turbo/build.gradle.kts b/src/backend/turbo/build.gradle.kts index d62c17e9..4df630b8 100644 --- a/src/backend/turbo/build.gradle.kts +++ b/src/backend/turbo/build.gradle.kts @@ -17,7 +17,6 @@ allprojects { repositories { maven(url = "https://mirrors.tencent.com/repository/maven/bkdevops_maven") - jcenter() } configurations.forEach { diff --git a/src/backend/turbo/common-turbo/common-turbo-quartz/build.gradle.kts b/src/backend/turbo/common-turbo/common-turbo-quartz/build.gradle.kts index 143e60a0..cb30b1e8 100644 --- a/src/backend/turbo/common-turbo/common-turbo-quartz/build.gradle.kts +++ b/src/backend/turbo/common-turbo/common-turbo-quartz/build.gradle.kts @@ -1,7 +1,7 @@ dependencies { api("org.quartz-scheduler:quartz") api("org.quartz-scheduler:quartz-jobs") - api("com.novemberain:quartz-mongodb:2.2.0-rc2") + api("io.fluidsonic.mirror:quartz-mongodb:2.2.0-rc2") api("org.springframework.boot:spring-boot-starter") api("org.springframework:spring-context-support") api("org.springframework:spring-tx")