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

Compare commits

base: mianbin:f27c2e9a17fa2f0d99525f0704b3d98aada788da
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp
...
compare: mianbin:63d45c6ae62f9123d8f4067193975ac6dbb4a567
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp

2 Commits
f27c2e9a17 ... 63d45c6ae6

Author SHA1 Message Date
HopeLi
63d45c6ae6 Merge remote-tracking branch 'origin/master' 2025-07-18 16:16:36 +08:00
HopeLi
ebeac52bba 0718 ljc 修改目标管理删除逻辑 2025-07-18 16:15:56 +08:00
1 changed files with 13 additions and 1 deletions
Show Stats Expand all files Collapse all files

14
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java
View File

@ -6,9 +6,11 @@ import cd.casic.ci.process.dto.resp.target.TargetManagerResp;
import cd.casic.ci.process.dto.resp.target.TargetVersionResp;
import cd.casic.ci.process.process.converter.TargetConverter;
import cd.casic.ci.process.process.converter.TargetVersionConverter;
import cd.casic.ci.process.process.dao.pipeline.PipelineDao;
import cd.casic.ci.process.process.dao.pipeline.TargetManagerDao;
import cd.casic.ci.process.process.dao.pipeline.TargetVersionDao;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.dataObject.target.TargetManager;
import cd.casic.ci.process.process.dataObject.target.TargetVersion;
import cd.casic.ci.process.process.service.target.TargetManagerService;
@ -63,6 +65,8 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
private AdminUserServiceImpl adminUserService;
@Resource
private TargetFileUploadProperties fileUploadProperties;
@Resource
private PipelineDao pipelineDao;
@Override
@ -243,7 +247,15 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
@Override
public void deleteVersion(BaseIdReq req) {
targetVersionDao.deleteById(req.getId());
//判断当前目标是否被流水线引用
QueryWrapper<PipPipeline> pipelineQueryWrapper = new QueryWrapper<>();
pipelineQueryWrapper.eq("target_version_id",req.getId());
if (!CollectionUtils.isEmpty(pipelineDao.selectList(pipelineQueryWrapper))){
throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"目标版本被流水线引用，请先删除流水线");
}else {
targetVersionDao.deleteById(req.getId());
}
}
@Override