feature: Job 支持容器执行 - 脚本任务 TencentBlueKing#2631

wangyu096 · Feb 2, 2024 · aae02b8 · aae02b8
1 parent 2539355
commit aae02b8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/...-execute/src/main/java/com/tencent/bk/job/execute/model/web/vo/StepExecutionRecordVO.java b/...-execute/src/main/java/com/tencent/bk/job/execute/model/web/vo/StepExecutionRecordVO.java
@@ -25,6 +25,8 @@
 package com.tencent.bk.job.execute.model.web.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.tencent.bk.job.common.annotation.CompatibleImplementation;
+import com.tencent.bk.job.common.constant.CompatibleType;
 import com.tencent.bk.job.common.util.json.LongTimestampSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,9 +38,14 @@ public class StepExecutionRecordVO {
     @ApiModelProperty(value = "步骤实例ID")
     private Long stepInstanceId;
 
-    @ApiModelProperty(value = "重试次数")
+    @ApiModelProperty(value = "重试次数", hidden = true)
+    @CompatibleImplementation(name = "execute_object", deprecatedVersion = "3.9.x", type = CompatibleType.DEPLOY,
+        explain = "使用 executeCount 参数替换。发布完成后可以删除")
     private Integer retryCount;
 
+    @ApiModelProperty(value = "执行次数")
+    private Integer executeCount;
+
     @ApiModelProperty(value = "执行记录创建时间")
     @JsonSerialize(using = LongTimestampSerializer.class)
     private Long createTime;

diff --git a/...pi-job-execute/src/main/java/com/tencent/bk/job/execute/model/web/vo/StepOperationVO.java b/...pi-job-execute/src/main/java/com/tencent/bk/job/execute/model/web/vo/StepOperationVO.java
@@ -40,6 +40,7 @@ public class StepOperationVO {
     private Long stepInstanceId;
     @ApiModelProperty("执行次数")
     private Integer retryCount;
+
     public StepOperationVO(Long stepInstanceId, Integer retryCount) {
         this.stepInstanceId = stepInstanceId;
         this.retryCount = retryCount;

diff --git a/...main/java/com/tencent/bk/job/execute/api/web/impl/WebTaskExecutionResultResourceImpl.java b/...main/java/com/tencent/bk/job/execute/api/web/impl/WebTaskExecutionResultResourceImpl.java
@@ -1069,6 +1069,7 @@ public Response<List<StepExecutionRecordVO>> listStepExecutionHistory(String use
             StepExecutionRecordVO vo = new StepExecutionRecordVO();
             vo.setStepInstanceId(stepInstanceId);
             vo.setRetryCount(stepExecutionRecord.getRetryCount());
+            vo.setExecuteCount(stepExecutionRecord.getRetryCount());
             vo.setCreateTime(stepExecutionRecord.getCreateTime());
             return vo;
         }).collect(Collectors.toList()));