mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stage转换代码

Browse Source
This commit is contained in:
even 2025-05-19 16:29:50 +08:00
parent 6b79782a2b
commit 6a99f0eb54
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java
View File

@ -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;

2
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java
View File

@ -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;

8
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java
View File

@ -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<PipStageDao, PipStage> impleme
//获取从节点
List<PipStage> allStageStage = findSecondStageAndTask(stagesId);
List<StageResp> 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<PipStageDao, PipStage> impleme
List<PipStage> otherStage = findSecondStage(stagesId);
List<PipStage> list = new ArrayList<>();
List<String> stageIdList = otherStage.stream().map(PipStage::getId).toList();
Map<String, List<PipTask>> stageIdTaskMap = taskService.listByIds(stageIdList).stream().collect(Collectors.groupingBy(PipTask::getStageId));
Map<String, List<PipTask>> stageIdTaskMap = taskService.getTaskByStageIdList(stageIdList).stream().collect(Collectors.groupingBy(PipTask::getStageId));
for (PipStage stage : otherStage) {
//获取阶段配置及任务
String otherId = stage.getId();

1
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java
View File

@ -14,6 +14,7 @@ public interface TaskService extends IService<PipTask> {
* */
void taskTypeExist(String taskType);
List<PipTask> getTask(PipTask pipTask);
List<PipTask> getTaskByStageIdList(List<String> stageIdList);
TasksResp getRespById(String taskId);
void copyTask(String taskId);

6
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java
View File

@ -50,6 +50,12 @@ public class TaskServiceImpl extends ServiceImpl<PipTaskDao, PipTask> implements
return taskDao.selectList(wrapper);
}
@Override
public List<PipTask> getTaskByStageIdList(List<String> stageIdList){
LambdaQueryWrapper<PipTask> 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);