Skip to content

Commit

Permalink
Merge pull request #3187 from liuliaozhong/3.9.x_issue_3163
Browse files Browse the repository at this point in the history
fix: 通过API get_job_plan_detail 获取执行方案详情,变量是否被引用字段 used 不正确 #3163
  • Loading branch information
wangyu096 authored Sep 12, 2024
2 parents cde99cd + f12de97 commit 5089782
Showing 1 changed file with 11 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import com.tencent.bk.job.manage.manager.variable.StepRefVariableParser;
import com.tencent.bk.job.manage.model.dto.TaskPlanQueryDTO;
import com.tencent.bk.job.manage.model.dto.task.TaskPlanInfoDTO;
import com.tencent.bk.job.manage.model.dto.task.TaskStepDTO;
import com.tencent.bk.job.manage.model.esb.v3.request.EsbGetPlanDetailV3Request;
import com.tencent.bk.job.manage.model.esb.v3.request.EsbGetPlanListV3Request;
import com.tencent.bk.job.manage.model.esb.v3.response.EsbPlanBasicInfoV3DTO;
Expand All @@ -49,6 +50,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;
import java.util.stream.Collectors;

/**
* @since 15/10/2020 18:08
*/
Expand Down Expand Up @@ -173,8 +177,13 @@ public EsbResp<EsbPlanInfoV3DTO> getPlanDetailUsingPost(String username,
TaskPlanInfoDTO taskPlanInfo = taskPlanService.getTaskPlan(username,
request.getAppId(), request.getPlanId());

// 解析步骤引用全局变量的信息
StepRefVariableParser.parseStepRefVars(taskPlanInfo.getStepList(), taskPlanInfo.getVariableList());
List<TaskStepDTO> enabledTaskStepList = taskPlanInfo.getStepList()
.stream()
.filter(taskStep -> taskStep.getEnable() != 0)
.collect(Collectors.toList());

// 解析启用的步骤引用全局变量的信息
StepRefVariableParser.parseStepRefVars(enabledTaskStepList, taskPlanInfo.getVariableList());
return EsbResp.buildSuccessResp(TaskPlanInfoDTO.toEsbPlanInfoV3(taskPlanInfo));
}

Expand Down

0 comments on commit 5089782

Please sign in to comment.