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

0607 ljc sca模块修改

Browse Source
This commit is contained in:
HopeLi 2025-06-07 16:53:36 +08:00
parent aea93de839
commit 5c7d5cd4f3
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File 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

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

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

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