增加open接口查询任务状态 TencentBlueKing#8195 此接口bkrepo校验专用

jsonwan · May 29, 2024 · 1345ca4 · 1345ca4
1 parent de8d94f
commit 1345ca4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/...i-process/src/main/kotlin/com/tencent/devops/process/api/open/OpenPipelineTaskResource.kt b/...i-process/src/main/kotlin/com/tencent/devops/process/api/open/OpenPipelineTaskResource.kt
@@ -28,10 +28,10 @@
 package com.tencent.devops.process.api.open
 
 import com.tencent.devops.common.api.pojo.Result
-import com.tencent.devops.common.pipeline.enums.BuildStatus
-import io.swagger.v3.oas.annotations.tags.Tag
+import com.tencent.devops.process.pojo.open.BuildStatusInfo
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.Parameter
+import io.swagger.v3.oas.annotations.tags.Tag
 import javax.ws.rs.Consumes
 import javax.ws.rs.GET
 import javax.ws.rs.Path
@@ -61,5 +61,5 @@ interface OpenPipelineTaskResource {
         @Parameter(description = "任务ID，可选，如果传了则查询相应任务的状态，否则就查询整体构建的状态", required = false)
         @QueryParam("taskId")
         taskId: String?
-    ): Result<BuildStatus?>
+    ): Result<BuildStatusInfo?> // { "startUser" : "启动人", "debug" : "true/false 是否调试版本", "status" : RUNNING }
 }
diff --git a/...ocess/api-process/src/main/kotlin/com/tencent/devops/process/pojo/open/BuildStatusInfo.kt b/...ocess/api-process/src/main/kotlin/com/tencent/devops/process/pojo/open/BuildStatusInfo.kt
@@ -0,0 +1,12 @@
+package com.tencent.devops.process.pojo.open
+
+import com.tencent.devops.common.pipeline.enums.BuildStatus
+
+/**
+ * open接口返回的构建状态封装
+ */
+data class BuildStatusInfo (
+    val startUser: String,
+    val debug: Boolean,
+    val status: BuildStatus
+)
diff --git a/...ocess/src/main/kotlin/com/tencent/devops/process/api/open/OpenPipelineTaskResourceImpl.kt b/...ocess/src/main/kotlin/com/tencent/devops/process/api/open/OpenPipelineTaskResourceImpl.kt
@@ -1,10 +1,10 @@
 package com.tencent.devops.process.api.open
 
 import com.tencent.devops.common.api.pojo.Result
-import com.tencent.devops.common.pipeline.enums.BuildStatus
 import com.tencent.devops.common.web.RestResource
 import com.tencent.devops.process.engine.service.PipelineRuntimeService
 import com.tencent.devops.process.engine.service.PipelineTaskService
+import com.tencent.devops.process.pojo.open.BuildStatusInfo
 import org.springframework.beans.factory.annotation.Autowired
 
 @RestResource
@@ -18,26 +18,26 @@ class OpenPipelineTaskResourceImpl @Autowired constructor(
         pipelineId: String,
         buildId: String,
         taskId: String?
-    ): Result<BuildStatus?> {
+    ): Result<BuildStatusInfo?> {
 
         // 校验参数
-        val buildInfo = pipelineRuntimeService.getBuildInfo(
+        val build = pipelineRuntimeService.getBuildInfo(
             projectId = projectId,
             pipelineId = pipelineId,
             buildId = buildId
         )
 
-        return if (buildInfo == null) {
+        return if (build == null) {
             Result(status = -1, message = "Build[$buildId] is not found!")
         } else if (!taskId.isNullOrBlank()) { // 查指定task的状态
             val tStatus = pipelineTaskService.getTaskStatus(projectId = projectId, buildId = buildId, taskId = taskId)
             if (tStatus == null) {
                 Result(status = -1, message = "Task[$taskId] is not found!")
             } else {
-                Result(tStatus)
+                Result(BuildStatusInfo(startUser = build.startUser, debug = build.debug, status = tStatus))
             }
         } else {
-            Result(buildInfo.status)
+            Result(BuildStatusInfo(startUser = build.startUser, debug = build.debug, status = build.status))
         }
     }
 }