diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java index e42f2e6e..b0c6ce29 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java @@ -8,7 +8,7 @@ import java.util.List; @Data public class StageResp { //@ApiProperty(name = "stageId",desc="id") - private String stageId; + private String id; //@ApiProperty(name = "stageName",desc="名称") private String stageName; diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java index b553ffe2..267cbac6 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; @Data public class TasksResp { //@ApiProperty(name="taskId",desc="配置id") - private String taskId; + private String id; //@ApiProperty(name="createTime",desc="创建时间") private LocalDateTime createTime; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java index 98dbb6dc..1c6d9be9 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java @@ -14,6 +14,7 @@ import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.framework.commons.util.util.WebFrameworkUtils; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; @@ -144,9 +145,8 @@ public class StageServiceImpl extends ServiceImpl impleme //获取从节点 List allStageStage = findSecondStageAndTask(stagesId); List stageRespList = allStageStage.stream().map(it -> { - StageResp stageResp = new StageResp(); - BeanUtils.copyProperties(it, stageResp); - return stageResp; +// BeanUtils.copyProperties(it, stageResp); + return JSON.parseObject(JSON.toJSONString(it), StageResp.class); }).toList(); StageResp stageResp = new StageResp(); BeanUtils.copyProperties(stage,stageResp); @@ -366,7 +366,7 @@ public class StageServiceImpl extends ServiceImpl impleme List otherStage = findSecondStage(stagesId); List list = new ArrayList<>(); List stageIdList = otherStage.stream().map(PipStage::getId).toList(); - Map> stageIdTaskMap = taskService.listByIds(stageIdList).stream().collect(Collectors.groupingBy(PipTask::getStageId)); + Map> stageIdTaskMap = taskService.getTaskByStageIdList(stageIdList).stream().collect(Collectors.groupingBy(PipTask::getStageId)); for (PipStage stage : otherStage) { //获取阶段配置及任务 String otherId = stage.getId(); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java index d644acf3..4238480e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java @@ -14,6 +14,7 @@ public interface TaskService extends IService { * */ void taskTypeExist(String taskType); List getTask(PipTask pipTask); + List getTaskByStageIdList(List stageIdList); TasksResp getRespById(String taskId); void copyTask(String taskId); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java index d05c6e89..89711ed6 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java @@ -50,6 +50,12 @@ public class TaskServiceImpl extends ServiceImpl implements return taskDao.selectList(wrapper); } @Override + public List getTaskByStageIdList(List stageIdList){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PipTask::getStageId,stageIdList); + return taskDao.selectList(wrapper); + } + @Override public TasksResp getRespById(String taskId){ PipTask pipTask = new PipTask(); pipTask.setId(taskId);