模板相关多余代码删除
This commit is contained in:
even
parent
19f6358e60
commit
2fdbc97fff
@ -47,7 +47,7 @@ public class TargetVersion extends PipBaseElement {
|
||||
*/
|
||||
private String filePath;
|
||||
/**
|
||||
* 目标版本
|
||||
* 目标版本构成成分
|
||||
* */
|
||||
private String versionCompose;
|
||||
}
|
||||
|
||||
@ -293,4 +293,7 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
|
||||
}
|
||||
return buffer.toByteArray();
|
||||
}
|
||||
private void setTargetVersionCompose(TargetVersion targetVersion){
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,15 +18,6 @@ import java.util.List;
|
||||
* @Description:
|
||||
*/
|
||||
public interface TemplateManagerService extends IService<TemplateManager> {
|
||||
// String createTemplate(@Valid TemplateCreateReq req);
|
||||
//
|
||||
// void deletePipeline(@Valid PipelineReq req);
|
||||
//
|
||||
// void updatePipeline(@Valid PipelineUpdateReq pipeline);
|
||||
//
|
||||
// void pipelineClone(@Valid PipelineReq req);
|
||||
//
|
||||
// TreeRunContextResp getPipelineRunState(String pipelineId);
|
||||
|
||||
PageResult<TemplateFindResp> findTemplatePage(@Valid TemplateQueryReq query);
|
||||
|
||||
|
||||
@ -59,303 +59,6 @@ public class TemplateManagerServiceImpl extends ServiceImpl<TemplateManagerDao,
|
||||
@Resource
|
||||
private TemplateConverter templateConverter;
|
||||
|
||||
// @Override
|
||||
// @Transactional(rollbackFor = Exception.class)
|
||||
// public String createTemplate(PipelineCreateReq pipelineReq) {
|
||||
//
|
||||
// PipPipeline pipeline = new PipPipeline();
|
||||
// BeanUtils.copyProperties(pipelineReq, pipeline);
|
||||
// // 随机颜色
|
||||
// int randomNumber = (int)(Math.random() * 5) + 1;
|
||||
// pipeline.setColor(randomNumber);
|
||||
//
|
||||
// pipeline.setCreateTime(LocalDateTime.now());
|
||||
// if (Objects.isNull(pipeline.getCreator())){
|
||||
// pipeline.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// }
|
||||
//
|
||||
// pipeline.setState(1);
|
||||
// pipeline.setMachineId("1");
|
||||
//
|
||||
// //新增对应的配置类数据
|
||||
// if (!ObjectUtils.isEmpty(pipelineReq.getResourceReq())){
|
||||
// PipResource resource = new PipResource();
|
||||
// BeanUtils.copyProperties(pipelineReq.getResourceReq(),resource);
|
||||
// resource.setCreator(pipeline.getCreator());
|
||||
// resource.setCreateTime(LocalDateTime.now());
|
||||
// resourceService.save(resource);
|
||||
//
|
||||
// pipeline.setResourceId(resource.getId());
|
||||
// }
|
||||
//
|
||||
// this.save(pipeline);
|
||||
//
|
||||
// //TODO 根据模板覆写对应的阶段信息以及节点信息
|
||||
//// List<StageReq> stageReqList = templateService.findStageById(pipelineReq.getTemplateId());
|
||||
//// stageReqList.forEach(o->{
|
||||
//// o.setPipelineId(pipeline.getId());
|
||||
//// });
|
||||
// //新增初始阶段，无串行并行任务
|
||||
// PipStage stageReq1 = new PipStage();
|
||||
// stageReq1.setPipelineId(pipeline.getId());
|
||||
// stageReq1.setStageName("阶段-1");
|
||||
// stageReq1.setCreateTime(LocalDateTime.now());
|
||||
// stageReq1.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// stageReq1.setStageSort(1);
|
||||
// stageReq1.setParentId("-1");
|
||||
// stageReq1.setCode(true);
|
||||
// stageService.save(stageReq1);
|
||||
//
|
||||
// PipStage childStage1 = new PipStage();
|
||||
// childStage1.setPipelineId(pipeline.getId());
|
||||
// childStage1.setStageName("源码");
|
||||
// childStage1.setCreateTime(LocalDateTime.now());
|
||||
// childStage1.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// childStage1.setStageSort(1);
|
||||
// childStage1.setCode(false);
|
||||
// childStage1.setParentId(stageReq1.getId());
|
||||
// stageService.save(childStage1);
|
||||
//
|
||||
// PipTask childTask11 = new PipTask();
|
||||
// childTask11.setCreateTime(LocalDateTime.now());
|
||||
// childTask11.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// childTask11.setTaskName("串行任务-1-1");
|
||||
// childTask11.setPipelineId(pipeline.getId());
|
||||
// childTask11.setTaskType("CODE");
|
||||
// childTask11.setTaskSort(1);
|
||||
// childTask11.setStageId(childStage1.getId());
|
||||
// taskService.save(childTask11);
|
||||
//
|
||||
// //新增第二个阶段，包含串行和并行任务
|
||||
// PipStage stageReq2 = new PipStage();
|
||||
// stageReq2.setPipelineId(pipeline.getId());
|
||||
// stageReq2.setStageName("阶段-2");
|
||||
// stageReq2.setCreateTime(LocalDateTime.now());
|
||||
// stageReq2.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// stageReq2.setStageSort(2);
|
||||
// stageReq2.setParentId("-1");
|
||||
// stageReq2.setCode(true);
|
||||
// stageService.save(stageReq2);
|
||||
//
|
||||
// //新增并行阶段
|
||||
// PipStage childStage21 = new PipStage();
|
||||
// childStage21.setStageName("并行阶段-2-1");
|
||||
// childStage21.setPipelineId(pipeline.getId());
|
||||
// childStage21.setCreateTime(LocalDateTime.now());
|
||||
// childStage21.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// childStage21.setStageSort(1);
|
||||
// childStage21.setCode(false);
|
||||
// childStage21.setParentId(stageReq2.getId());
|
||||
// stageService.save(childStage21);
|
||||
//
|
||||
// //新增串行阶段
|
||||
// PipTask childTask21 = new PipTask();
|
||||
// childTask21.setPipelineId(pipeline.getId());
|
||||
// childTask21.setTaskName("串行任务-2-1");
|
||||
// childTask21.setCreateTime(LocalDateTime.now());
|
||||
// childTask21.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// childTask21.setTaskType("TEST_CASE_GENERATION");
|
||||
// childTask21.setTaskSort(1);
|
||||
// childTask21.setStageId(childStage21.getId());
|
||||
// taskService.save(childTask21);
|
||||
//
|
||||
// //------------------------------------------------------------------
|
||||
//// PipStage childStage22 = new PipStage();
|
||||
//// childStage22.setStageName("并行阶段-2-2");
|
||||
//// childStage22.setPipelineId(pipeline.getId());
|
||||
//// childStage22.setCreateTime(LocalDateTime.now());
|
||||
//// childStage22.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
//// childStage22.setStageSort(2);
|
||||
//// childStage22.setCode(false);
|
||||
//// childStage22.setParentId(stageReq2.getId());
|
||||
//// stageService.save(childStage22);
|
||||
////
|
||||
//// PipTask childTask22 = new PipTask();
|
||||
//// childTask22.setCreateTime(LocalDateTime.now());
|
||||
//// childTask22.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
//// childTask22.setTaskName("串行任务-2-2");
|
||||
//// childTask22.setPipelineId(pipeline.getId());
|
||||
//// childTask22.setTaskType("test");
|
||||
//// childTask22.setTaskSort(2);
|
||||
//// childTask22.setStageId(childStage22.getId());
|
||||
//// taskService.save(childTask22);
|
||||
//
|
||||
// //创建第三个阶段
|
||||
// PipStage stageReq3 = new PipStage();
|
||||
// stageReq3.setPipelineId(pipeline.getId());
|
||||
// stageReq3.setStageName("阶段-3");
|
||||
// stageReq3.setCreateTime(LocalDateTime.now());
|
||||
// stageReq3.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// stageReq3.setStageSort(3);
|
||||
// stageReq3.setParentId("-1");
|
||||
// stageReq3.setCode(true);
|
||||
// stageService.save(stageReq3);
|
||||
//
|
||||
// PipStage childStage31 = new PipStage();
|
||||
// childStage31.setStageName("并行任务-3-1");
|
||||
// childStage31.setPipelineId(pipeline.getId());
|
||||
// childStage31.setCreateTime(LocalDateTime.now());
|
||||
// childStage31.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// childStage31.setStageSort(1);
|
||||
// childStage31.setCode(false);
|
||||
// childStage31.setParentId(stageReq3.getId());
|
||||
// stageService.save(childStage31);
|
||||
//
|
||||
// PipTask childTask31 = new PipTask();
|
||||
// childTask31.setCreateTime(LocalDateTime.now());
|
||||
// childTask31.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// childTask31.setTaskName("串行任务-3-1");
|
||||
// childTask31.setPipelineId(pipeline.getId());
|
||||
// childTask31.setTaskType("AFL");
|
||||
// childTask31.setTaskSort(1);
|
||||
// childTask31.setStageId(childStage31.getId());
|
||||
// taskService.save(childTask31);
|
||||
//
|
||||
// //创建第四个阶段
|
||||
// //TODO
|
||||
//// PipStage stageReq4 = new PipStage();
|
||||
//// stageReq4.setPipelineId(pipeline.getId());
|
||||
//// stageReq4.setStageName("阶段-4");
|
||||
//// stageReq4.setCreateTime(LocalDateTime.now());
|
||||
//// stageReq4.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
//// stageReq4.setStageSort(4);
|
||||
//// stageReq4.setParentId("-1");
|
||||
//// stageReq4.setCode(true);
|
||||
//// stageService.save(stageReq4);
|
||||
////
|
||||
//// PipStage childStage41 = new PipStage();
|
||||
//// childStage41.setStageName("并行任务-4-1");
|
||||
//// childStage41.setPipelineId(pipeline.getId());
|
||||
//// childStage41.setCreateTime(LocalDateTime.now());
|
||||
//// childStage41.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
//// childStage41.setStageSort(1);
|
||||
//// childStage41.setCode(false);
|
||||
//// childStage41.setParentId(stageReq4.getId());
|
||||
//// stageService.save(childStage41);
|
||||
////
|
||||
//// PipTask childTask41 = new PipTask();
|
||||
//// childTask41.setCreateTime(LocalDateTime.now());
|
||||
//// childTask41.setCreator(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
//// childTask41.setTaskName("串行任务-4-1");
|
||||
//// childTask41.setPipelineId(pipeline.getId());
|
||||
//// childTask41.setTaskType("REPORT");
|
||||
//// childTask41.setTaskSort(1);
|
||||
//// childTask41.setStageId(childStage41.getId());
|
||||
//// taskService.save(childTask41);
|
||||
//
|
||||
// //TODO 创建对应的鉴权关系
|
||||
// //TODO 创建对应的消息分发
|
||||
// return pipeline.getId();
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public List<PipelineFindResp> findPipelineList(PipelineQueryReq pipelineQueryReq) {
|
||||
// QueryWrapper<PipPipeline> wrapper = new QueryWrapper<>();
|
||||
// if (!ObjectUtils.isEmpty(pipelineQueryReq.getId())){
|
||||
// wrapper.eq("id",pipelineQueryReq.getId());
|
||||
// }
|
||||
// if (!ObjectUtils.isEmpty(pipelineQueryReq.getIdList())){
|
||||
// wrapper.in("id",pipelineQueryReq.getId());
|
||||
// }
|
||||
// if (!ObjectUtils.isEmpty(pipelineQueryReq.getName())){
|
||||
// wrapper.like("name",pipelineQueryReq.getName());
|
||||
// }
|
||||
// if (!ObjectUtils.isEmpty(pipelineQueryReq.getCreator())){
|
||||
// wrapper.eq("creator",pipelineQueryReq.getCreator());
|
||||
// }
|
||||
// if (!ObjectUtils.isEmpty(pipelineQueryReq.getCollect())){
|
||||
// wrapper.eq("collect",pipelineQueryReq.getCollect());
|
||||
// }
|
||||
// if (!ObjectUtils.isEmpty(pipelineQueryReq.getGroupId())){
|
||||
// wrapper.eq("group_id",pipelineQueryReq.getGroupId());
|
||||
// }
|
||||
//// Page<PipPipeline> page = new Page<>(pipelineQueryReq.getPageNo(), pipelineQueryReq.getPageSize());
|
||||
//// Page<PipPipeline> pipPipelinePage = pipelineDao.selectPage(page, wrapper);
|
||||
//
|
||||
// List<PipPipeline> pipPipelines = pipelineDao.selectList(wrapper);
|
||||
// if (ObjectUtils.isEmpty(pipPipelines)){
|
||||
// return new ArrayList<>(0);
|
||||
// }
|
||||
//
|
||||
// List<PipelineFindResp> respList = PipelineConverter.INSTANCE.toRespList(pipPipelines);
|
||||
//
|
||||
// //对流水线进行流水线信息赋值
|
||||
// respList.forEach(this::setStageAndTask);
|
||||
// //对用户姓名进行赋值
|
||||
// respList.forEach(this::setUserName);
|
||||
// return respList;
|
||||
// }
|
||||
//
|
||||
//
|
||||
// @Override
|
||||
// @Transactional(rollbackFor = Exception.class)
|
||||
// public void deletePipeline(PipelineReq req) {
|
||||
// if (StringUtils.isEmpty(req.getId())){
|
||||
// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"id不能为空");
|
||||
// }
|
||||
//
|
||||
// String pipelineId = req.getId();
|
||||
//
|
||||
// if (ObjectUtils.isEmpty(pipelineId)){
|
||||
// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"请求参数不能为空");
|
||||
// }
|
||||
//
|
||||
// PipPipeline pipeline = pipelineDao.selectById(pipelineId);
|
||||
// if (ObjectUtils.isEmpty(pipeline)){
|
||||
// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"流水线不存在");
|
||||
// }
|
||||
// pipelineDao.deleteById(pipelineId);
|
||||
//
|
||||
// //根据流水线id查询节点和配置信息
|
||||
// PipStage pipStage = new PipStage();
|
||||
// pipStage.setPipelineId(pipelineId);
|
||||
// List<PipStage> pipStageList = stageService.getPipStageList(pipStage);
|
||||
// if (!CollectionUtils.isEmpty(pipStageList)){
|
||||
// List<String> list = pipStageList.stream().map(PipStage::getId).toList();
|
||||
// pipStageDao.deleteByIds(list);
|
||||
// }
|
||||
//
|
||||
// PipTask pipTask = new PipTask();
|
||||
// pipTask.setPipelineId(pipelineId);
|
||||
// List<PipTask> task = taskService.getTask(pipTask);
|
||||
// if (!CollectionUtils.isEmpty(task)){
|
||||
// List<String> list = task.stream().map(PipTask::getId).toList();
|
||||
// pipTaskDao.deleteByIds(list);
|
||||
// }
|
||||
//
|
||||
// //删除resource表数据
|
||||
// if (StringUtils.isNotEmpty(pipeline.getResourceId())){
|
||||
// PipResource pipResource = pipResourceDao.selectById(pipeline.getResourceId());
|
||||
//
|
||||
// if (!ObjectUtils.isEmpty(pipResource)){
|
||||
// pipResourceDao.deleteById(pipeline.getResourceId());
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void updatePipeline(PipelineUpdateReq pipeline) {
|
||||
// PipPipeline pipPipeline = new PipPipeline();
|
||||
// BeanUtils.copyProperties(pipeline,pipPipeline);
|
||||
// pipPipeline.setUpdateTime(LocalDateTime.now());
|
||||
// pipPipeline.setUpdater(String.valueOf(WebFrameworkUtils.getLoginUserId()));
|
||||
// pipelineDao.updateById(pipPipeline);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public PipelineFindResp findPipelineById(PipelineQueryReq pipelineQueryReq) {
|
||||
// if (StringUtils.isEmpty(pipelineQueryReq.getId())){
|
||||
// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"id参数不能为空");
|
||||
// }
|
||||
// PipPipeline pipeline = pipelineDao.selectById(pipelineQueryReq.getId());
|
||||
// if (ObjectUtils.isEmpty(pipeline)){
|
||||
// throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"数据错误，请联系管理员");
|
||||
// }
|
||||
// PipelineFindResp resp = PipelineConverter.INSTANCE.toResp(pipeline);
|
||||
// setStageAndTask(resp);
|
||||
//
|
||||
// return resp;
|
||||
// }
|
||||
|
||||
@Override
|
||||
public PageResult<TemplateFindResp> findTemplatePage(TemplateQueryReq query) {
|
||||
|
||||
@ -268,7 +268,7 @@ public class TestCaseManagerServiceImpl extends ServiceImpl<TestCaseManagerDao,
|
||||
}
|
||||
}
|
||||
managerInfo.setFileCount(fileCount);
|
||||
managerInfo.setFileSize(getSizeStr(size));
|
||||
managerInfo.setFileSize(getSizeStr(size*2));
|
||||
}
|
||||
}
|
||||
private String getSizeStr(Integer size){
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user