Compare commits
No commits in common. "63d45c6ae62f9123d8f4067193975ac6dbb4a567" and "f27c2e9a17fa2f0d99525f0704b3d98aada788da" have entirely different histories.
63d45c6ae6
...
f27c2e9a17
@ -6,11 +6,9 @@ import cd.casic.ci.process.dto.resp.target.TargetManagerResp;
|
|||||||
import cd.casic.ci.process.dto.resp.target.TargetVersionResp;
|
import cd.casic.ci.process.dto.resp.target.TargetVersionResp;
|
||||||
import cd.casic.ci.process.process.converter.TargetConverter;
|
import cd.casic.ci.process.process.converter.TargetConverter;
|
||||||
import cd.casic.ci.process.process.converter.TargetVersionConverter;
|
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.TargetManagerDao;
|
||||||
import cd.casic.ci.process.process.dao.pipeline.TargetVersionDao;
|
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.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.TargetManager;
|
||||||
import cd.casic.ci.process.process.dataObject.target.TargetVersion;
|
import cd.casic.ci.process.process.dataObject.target.TargetVersion;
|
||||||
import cd.casic.ci.process.process.service.target.TargetManagerService;
|
import cd.casic.ci.process.process.service.target.TargetManagerService;
|
||||||
@ -65,8 +63,6 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
|
|||||||
private AdminUserServiceImpl adminUserService;
|
private AdminUserServiceImpl adminUserService;
|
||||||
@Resource
|
@Resource
|
||||||
private TargetFileUploadProperties fileUploadProperties;
|
private TargetFileUploadProperties fileUploadProperties;
|
||||||
@Resource
|
|
||||||
private PipelineDao pipelineDao;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -247,15 +243,7 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void deleteVersion(BaseIdReq req) {
|
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
|
@Override
|
||||||
|
Loading…
x
Reference in New Issue
Block a user