feat:数据库表同步projectId数据 TencentBlueKing#5339

carlyin0801 · Oct 19, 2021 · 909676b · 909676b
1 parent e474c23
commit 909676b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.../src/main/kotlin/com/tencent/devops/misc/cron/process/PipelineBuildHistoryDataClearJob.kt b/.../src/main/kotlin/com/tencent/devops/misc/cron/process/PipelineBuildHistoryDataClearJob.kt
@@ -408,7 +408,8 @@ class PipelineBuildHistoryDataClearJob @Autowired constructor(
                 totalHandleNum = totalHandleNum,
                 handlePageSize = DEFAULT_PAGE_SIZE,
                 isCompletelyDelete = false,
-                maxStartTime = maxStartTime
+                maxStartTime = maxStartTime,
+                geTimeFlag = true
             )
             if (!pipelineHistoryBuildIdList.isNullOrEmpty()) {
                 // 分库路由需要同步T_PIPELINE_BUILD_DETAIL的项目信息（同步完后再删除该逻辑）

diff --git a/...d/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDao.kt b/...d/ci/core/misc/biz-misc/src/main/kotlin/com/tencent/devops/misc/dao/process/ProcessDao.kt
@@ -39,7 +39,6 @@ import com.tencent.devops.model.process.tables.records.TPipelineBuildDetailRecor
 import com.tencent.devops.model.process.tables.records.TPipelineInfoRecord
 import com.tencent.devops.model.process.tables.records.TPipelineResourceRecord
 import com.tencent.devops.model.process.tables.records.TPipelineResourceVersionRecord
-import com.tencent.devops.model.process.tables.records.TTemplatePipelineRecord
 import org.jooq.Condition
 import org.jooq.DSLContext
 import org.jooq.Record
@@ -158,7 +157,7 @@ class ProcessDao {
     ): Long {
         with(TPipelineBuildHistory.T_PIPELINE_BUILD_HISTORY) {
             val conditions = getQueryBuildHistoryCondition(pipelineId, maxBuildNum, maxStartTime, geTimeFlag)
-            return dslContext.select(DSL.max(BUILD_NUM))
+            return dslContext.selectCount()
                 .from(this)
                 .where(conditions)
                 .fetchOne(0, Long::class.java)!!
@@ -206,7 +205,7 @@ class ProcessDao {
             } else {
                 baseStep.limit(totalHandleNum, handlePageSize)
             }
-            return baseStep.fetch()
+            return baseStep.orderBy(BUILD_ID).fetch()
         }
     }