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

Compare commits

base: mianbin:e632689765b154a6cf5fb61973cfb8831f440de2
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp
..
compare: mianbin:2d88b40e96eedddf02dd3b4b3aa00af3a7d1ea5b
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp

No commits in common. "e632689765b154a6cf5fb61973cfb8831f440de2" and "2d88b40e96eedddf02dd3b4b3aa00af3a7d1ea5b" have entirely different histories.
e632689765 ... 2d88b40e96

2 changed files with 2 additions and 24 deletions
Show Stats Expand all files Collapse all files

8
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dal/resp/pipeline/PipelineFindResp.java
View File

@ -105,16 +105,10 @@ public class PipelineFindResp {
private List<StageResp> stageList;
/**
* 目标版本id
*/
private String targetVersionId;
/**
* 目标id
*/
private String targetId;
private String targetVersionId;
/**
* 目标类型

18
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java
View File

@ -18,19 +18,17 @@ import cd.casic.ci.process.process.converter.TemplateConverter;
import cd.casic.ci.process.process.dal.pipeline.PipStageDao;
import cd.casic.ci.process.process.dal.pipeline.PipTaskDao;
import cd.casic.ci.process.process.dal.pipeline.PipelineDao;
import cd.casic.ci.process.process.dal.pipeline.TargetVersionDao;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.dataObject.stage.PipStage;
import cd.casic.ci.process.process.dataObject.target.TargetVersion;
import cd.casic.ci.process.process.dataObject.task.PipTask;
import cd.casic.ci.process.process.service.pipeline.PipelineService;
import cd.casic.ci.process.process.service.stage.impl.StageServiceImpl;
import cd.casic.ci.process.process.service.task.impl.TaskServiceImpl;
import cd.casic.ci.process.process.service.template.impl.TemplateManagerServiceImpl;
import cd.casic.ci.process.util.WebFrameworkUtils;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.pojo.PageResult;
import cd.casic.ci.process.util.WebFrameworkUtils;
import cd.casic.framework.security.dal.user.AdminUserDO;
import cd.casic.framework.tenant.core.service.AdminUserServiceImpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -85,9 +83,6 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
@Resource
private TemplateConverter templateConverter;
@Resource
private TargetVersionDao targetVersionDao;
@Override
@Transactional(rollbackFor = Exception.class)
public String createPipeline(PipelineCreateReq pipelineReq) {
@ -436,21 +431,10 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
}
PipelineFindResp resp = PipelineConverter.INSTANCE.toResp(pipeline);
setStageAndTask(resp);
setTargetId(resp);
return resp;
}
private void setTargetId(PipelineFindResp resp) {
if (!ObjectUtils.isEmpty(resp.getTargetVersionId())){
TargetVersion targetVersion = targetVersionDao.selectById(resp.getTargetVersionId());
if (!ObjectUtils.isEmpty(targetVersion)){
resp.setTargetId(targetVersion.getTargetId());
}
}
}
@Override
public TreeRunContextResp getPipelineRunState(String pipelineId) {
BaseRunContext context = contextManager.getContext(pipelineId);