From 8fbac5be8e4375788c38ae2cd5c0715a9e2965ce Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Thu, 29 May 2025 10:13:02 +0800 Subject: [PATCH] 0529 ljc --- .../req/template/TemplateQueryReq.java | 50 ++ .../resp/template/TemplateFindResp.java | 47 ++ .../resp/template/TemplateStageResp.java | 53 ++ .../resp/template/TemplateTasksResp.java | 41 ++ .../process/converter/TemplateConverter.java | 23 + .../dal/template/TemplateManagerDao.java | 14 + .../dal/template/TemplateStageDao.java | 14 + .../process/dal/template/TemplateTaskDao.java | 14 + .../dataObject/template/TemplateManager.java | 42 ++ .../dataObject/template/TemplateStage.java | 60 +++ .../dataObject/template/TemplateTask.java | 54 ++ .../template/TemplateManagerService.java | 33 ++ .../impl/TemplateManagerServiceImpl.java | 484 ++++++++++++++++++ .../controller/TemplateManagerController.java | 83 +++ 14 files changed, 1012 insertions(+) create mode 100644 modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/template/TemplateQueryReq.java create mode 100644 modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateFindResp.java create mode 100644 modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateStageResp.java create mode 100644 modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateTasksResp.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateStage.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateTask.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java create mode 100644 ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/template/TemplateQueryReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/template/TemplateQueryReq.java new file mode 100644 index 00000000..9a6056e5 --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/template/TemplateQueryReq.java @@ -0,0 +1,50 @@ +package cd.casic.ci.common.pipeline.req.template; + +import cd.casic.framework.commons.pojo.PageParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * @ClassName PipelineQueryReq + * @Author hopeli + * @Date 2025/5/10 9:54 + * @Version 1.0 + */ +@EqualsAndHashCode(callSuper = true) +@Data +public class TemplateQueryReq extends PageParam { + /** + * 主键id + */ + private String id; + + private List idList; + + /** + * 模板名称 + */ + private String templateName; + + /** + * 模板分类 + */ + private String templateType; + + /** + * 模板编码 + */ + private String templateCode; + + /** + * 排序 + */ + private Integer sort; + + /** + * 创建人用户id + */ + private String creator; + +} diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateFindResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateFindResp.java new file mode 100644 index 00000000..dfa2a939 --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateFindResp.java @@ -0,0 +1,47 @@ +package cd.casic.ci.common.pipeline.resp.template; + +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @ClassName PipelineFindResp + * @Author hopeli + * @Date 2025/5/10 10:53 + * @Version 1.0 + */ +@Data +public class TemplateFindResp { + + private String id; + + private String templateName; + private String templateType; + private String templateCode; + private Integer sort; + private String remark; + + + private List stageList; + + + + //创建人id + private String creator; + + //创建人姓名 + private String creatorName; + + //最后修改人id + private String updater; + + //最后修改人姓名 + private String updaterName; + + private LocalDateTime createTime; + + private LocalDateTime updateTime; + + +} diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateStageResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateStageResp.java new file mode 100644 index 00000000..91a7560e --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateStageResp.java @@ -0,0 +1,53 @@ +package cd.casic.ci.common.pipeline.resp.template; + +import lombok.Data; + +import java.util.List; + +@Data +public class TemplateStageResp { + //@ApiProperty(name = "stageId",desc="id") + private String id; + + //@ApiProperty(name = "stageName",desc="名称") + private String stageName; + + //@ApiProperty(name = "createTime",desc="创建时间") + private String createTime; + + //@ApiProperty(name="pipelineId",desc="流水线id") + private String templateId; + + //@ApiProperty(name="stageSort",desc="阶段顺序") + private int stageSort; + + //@ApiProperty(name = "parentId",desc="主阶段") + private String parentId; + + //@ApiProperty(name = "code",desc="是否是源码") + private boolean code = false; + + //@ApiProperty(name = "taskValues",desc="阶段任务") + private List taskValues; + + //@ApiProperty(name = "stageList",desc="阶段") + private List stageList; + + //@ApiProperty(name = "taskType",desc="任务类型") + private String taskType; + + //@ApiProperty(name = "taskId",desc="任务id") + private String taskId; + + //@ApiProperty(name = "values",desc="更新内容") + private Object values; + + //@ApiProperty(name = "taskSort",desc="任务顺序") + private int taskSort; + + //@ApiProperty(name = "parallelName",desc="并行阶段名称") + private String parallelName; + + // 执行实例id + private String instanceId; +} diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateTasksResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateTasksResp.java new file mode 100644 index 00000000..4bd729cb --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/template/TemplateTasksResp.java @@ -0,0 +1,41 @@ +package cd.casic.ci.common.pipeline.resp.template; + +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.Map; + +@Data +public class TemplateTasksResp { + //@ApiProperty(name="taskId",desc="配置id") + private String id; + + //@ApiProperty(name="createTime",desc="创建时间") + private LocalDateTime createTime; + + //@ApiProperty(name="taskType",desc= "类型1-10:源码,10-20:测试,20-30:构建,30-40:部署,40-50:代码扫描,50-60:推送制品") + private String taskType; + + //@ApiProperty(name="taskSort",desc="顺序") + private int taskSort; + + //@ApiProperty(name="taskName",desc="顺序") + private String taskName; + + //@ApiProperty(name="values",desc="任务") + private Map taskProperties; + + //@ApiProperty(name="pipeline",desc="流水线id",eg="@selectOne") + private String templateId; + + //@ApiProperty(name="postprocessId",desc="后置处理id",eg="@selectOne") + private String postprocessId;; + + //@ApiProperty(name="stageId",desc="阶段",eg="@selectOne") + private String stageId; + + //@ApiProperty(name="task",desc="任务",eg="@selectOne") + + // 执行实例id + private String instanceId; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java new file mode 100644 index 00000000..f38db1ef --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java @@ -0,0 +1,23 @@ +package cd.casic.ci.process.process.converter; + +import cd.casic.ci.common.pipeline.resp.template.TemplateFindResp; +import cd.casic.ci.process.process.dataObject.template.TemplateManager; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName PipelineConverter + * @Date: 2025/5/13 14:39 + * @Description: + */ +@Mapper(componentModel = "spring") +public interface TemplateConverter { + TemplateConverter INSTANCE = Mappers.getMapper(TemplateConverter.class); + TemplateFindResp toResp(TemplateManager templateManager); + List toRespList(List templateManagers); + +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java new file mode 100644 index 00000000..8272bfb5 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateManagerDao.java @@ -0,0 +1,14 @@ +package cd.casic.ci.process.process.dal.template; + +import cd.casic.ci.process.process.dataObject.template.TemplateManager; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName PipelineDao + * @Date: 2025/5/13 14:39 + * @Description: + */ +public interface TemplateManagerDao extends BaseMapperX{ +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java new file mode 100644 index 00000000..946f92aa --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateStageDao.java @@ -0,0 +1,14 @@ +package cd.casic.ci.process.process.dal.template; + +import cd.casic.ci.process.process.dataObject.template.TemplateStage; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName PipelineDao + * @Date: 2025/5/13 14:39 + * @Description: + */ +public interface TemplateStageDao extends BaseMapperX{ +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java new file mode 100644 index 00000000..f5ae79a9 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/template/TemplateTaskDao.java @@ -0,0 +1,14 @@ +package cd.casic.ci.process.process.dal.template; + +import cd.casic.ci.process.process.dataObject.template.TemplateTask; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName PipelineDao + * @Date: 2025/5/13 14:39 + * @Description: + */ +public interface TemplateTaskDao extends BaseMapperX{ +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java new file mode 100644 index 00000000..9faeadb8 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java @@ -0,0 +1,42 @@ +package cd.casic.ci.process.process.dataObject.template; + +import cd.casic.ci.process.process.dataObject.base.PipBaseElement; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName TemplateManager + * @Date: 2025/5/28 19:02 + * @Description: + */ + +@EqualsAndHashCode(callSuper = true) +@Data +public class TemplateManager extends PipBaseElement { + /** + * 模板名称 + */ + private String templateName; + + /** + * 模板分类 + */ + private String templateType; + + /** + * 模板编码 + */ + private String templateCode; + + /** + * 排序 + */ + private Integer sort; + + /** + * 描述 + */ + private String remark; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateStage.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateStage.java new file mode 100644 index 00000000..8b4e3818 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateStage.java @@ -0,0 +1,60 @@ +package cd.casic.ci.process.process.dataObject.template; + +import cd.casic.ci.process.process.dataObject.base.PipBaseElement; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName TemplateManager + * @Date: 2025/5/28 19:02 + * @Description: + */ + +@EqualsAndHashCode(callSuper = true) +@Data +public class TemplateStage extends PipBaseElement { + /** + * 阶段名称 + */ + private String stageName; + + /** + * 流水线模板ID + */ + private String templateId; + + /** + * 阶段排序 + */ + private Integer stageSort; + + /** + * 父级阶段ID + */ + private String parentId; + + /** + * 是否为源码（0-否，1-是） + */ + private String code; + + /** + * 触发方式（0-手动触发，1-自动触发） + */ + private String triggerMode; + + @TableField(exist = false) + private List taskValues; + + //@ApiProperty(name = "stageList",desc="阶段") + @TableField(exist = false) + private List stageList; + // 执行实例id + @TableField(exist = false) + private String instanceId; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateTask.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateTask.java new file mode 100644 index 00000000..d04e2976 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateTask.java @@ -0,0 +1,54 @@ +package cd.casic.ci.process.process.dataObject.template; + +import cd.casic.ci.process.process.dataObject.base.PipBaseElement; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Map; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName TemplateManager + * @Date: 2025/5/28 19:02 + * @Description: + */ + +@EqualsAndHashCode(callSuper = true) +@Data +public class TemplateTask extends PipBaseElement { + /** + * 阶段ID + */ + private String stageId; + + /** + * 任务名称 + */ + private String taskName; + + /** + * 流水线模板ID + */ + private String templateId; + + /** + * 任务类型 + */ + private String taskType; + + /** + * 任务排序 + */ + private Integer taskSort; + + /** + * 后置处理器ID + */ + private String postprocessId; + + /** + * 任务配置（JSON格式存储） + */ + private Map taskProperties; +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java new file mode 100644 index 00000000..a35d16a4 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java @@ -0,0 +1,33 @@ +package cd.casic.ci.process.process.service.template; + +import cd.casic.ci.common.pipeline.req.template.TemplateQueryReq; +import cd.casic.ci.common.pipeline.resp.template.TemplateFindResp; +import cd.casic.ci.common.pipeline.utils.PageResult; +import cd.casic.ci.process.process.dataObject.template.TemplateManager; +import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.validation.Valid; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName PipelineService + * @Date: 2025/5/13 10:27 + * @Description: + */ +public interface TemplateManagerService extends IService { +// String createPipeline(@Valid PipelineCreateReq pipelineReq); +// +// List findPipelineList(@Valid PipelineQueryReq pipelineQueryReq); +// +// void deletePipeline(@Valid PipelineReq req); +// +// void updatePipeline(@Valid PipelineUpdateReq pipeline); +// +// void pipelineClone(@Valid PipelineReq req); +// +// PipelineFindResp findPipelineById(@Valid PipelineQueryReq pipelineQueryReq); +// +// TreeRunContextResp getPipelineRunState(String pipelineId); + + PageResult findTemplatePage(@Valid TemplateQueryReq query); +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java new file mode 100644 index 00000000..d01db446 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java @@ -0,0 +1,484 @@ +package cd.casic.ci.process.process.service.template.impl; + +import cd.casic.ci.common.pipeline.req.template.TemplateQueryReq; +import cd.casic.ci.common.pipeline.resp.template.TemplateFindResp; +import cd.casic.ci.common.pipeline.resp.template.TemplateStageResp; +import cd.casic.ci.common.pipeline.utils.PageResult; +import cd.casic.ci.process.process.converter.TemplateConverter; +import cd.casic.ci.process.process.dal.template.TemplateManagerDao; +import cd.casic.ci.process.process.dal.template.TemplateStageDao; +import cd.casic.ci.process.process.dal.template.TemplateTaskDao; +import cd.casic.ci.process.process.dataObject.template.TemplateManager; +import cd.casic.ci.process.process.dataObject.template.TemplateStage; +import cd.casic.ci.process.process.dataObject.template.TemplateTask; +import cd.casic.ci.process.process.service.template.TemplateManagerService; +import cd.casic.framework.commons.exception.ServiceException; +import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; +import cd.casic.framework.commons.util.object.BeanUtils; +import cd.casic.framework.security.dal.user.AdminUserDO; +import cd.casic.framework.tenant.core.service.AdminUserServiceImpl; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; + +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * @author HopeLi + * @version v1.0 + * @ClassName PipelineServiceImpl + * @Date: 2025/5/13 10:31 + * @Description: + */ +@Service +@Slf4j +public class TemplateManagerServiceImpl extends ServiceImpl implements TemplateManagerService { + + @Resource + private TemplateManagerDao templateManagerDao; + + @Resource + private TemplateStageDao templateStageDao; + + @Resource + private TemplateTaskDao templateTaskDao; + + @Resource + private AdminUserServiceImpl adminUserService; + +// @Override +// @Transactional(rollbackFor = Exception.class) +// public String createPipeline(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 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 findPipelineList(PipelineQueryReq pipelineQueryReq) { +// QueryWrapper 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 page = new Page<>(pipelineQueryReq.getPageNo(), pipelineQueryReq.getPageSize()); +//// Page pipPipelinePage = pipelineDao.selectPage(page, wrapper); +// +// List pipPipelines = pipelineDao.selectList(wrapper); +// if (ObjectUtils.isEmpty(pipPipelines)){ +// return new ArrayList<>(0); +// } +// +// List 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 pipStageList = stageService.getPipStageList(pipStage); +// if (!CollectionUtils.isEmpty(pipStageList)){ +// List list = pipStageList.stream().map(PipStage::getId).toList(); +// pipStageDao.deleteByIds(list); +// } +// +// PipTask pipTask = new PipTask(); +// pipTask.setPipelineId(pipelineId); +// List task = taskService.getTask(pipTask); +// if (!CollectionUtils.isEmpty(task)){ +// List 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 findTemplatePage(TemplateQueryReq query) { + Page respPage = new Page<>(); + + QueryWrapper wrapper = new QueryWrapper<>(); + if (!ObjectUtils.isEmpty(query.getId())){ + wrapper.eq("id",query.getId()); + } + if (!ObjectUtils.isEmpty(query.getIdList())){ + wrapper.in("id",query.getId()); + } + if (!ObjectUtils.isEmpty(query.getTemplateName())){ + wrapper.like("template_name",query.getTemplateName()); + } + if (!ObjectUtils.isEmpty(query.getTemplateType())){ + wrapper.eq("template_type",query.getTemplateType()); + } + if (!ObjectUtils.isEmpty(query.getTemplateCode())){ + wrapper.eq("template_code",query.getTemplateCode()); + } + if (!ObjectUtils.isEmpty(query.getCreator())){ + wrapper.eq("creator",query.getCreator()); + } + + Page templateManagerPage = templateManagerDao.selectPage(new Page<>(query.getPageNo(), query.getPageSize()), wrapper); + + if (ObjectUtils.isEmpty(templateManagerPage)){ + return new PageResult<>(); + } + + List respList = TemplateConverter.INSTANCE.toRespList(templateManagerPage.getRecords()); + + //对流水线模板进行流水线信息赋值 + respList.forEach(this::setStageAndTask); + respList.forEach(this::setUserName); + + respPage.setRecords(respList); + respPage.setTotal(templateManagerPage.getTotal()); + respPage.setCurrent(templateManagerPage.getCurrent()); + respPage.setSize(templateManagerPage.getSize()); + PageResult pageResult = new PageResult<>(respPage); + return pageResult; + } + + private void setUserName(TemplateFindResp templateFindResp) { + if (!StringUtils.isEmpty(templateFindResp.getCreator())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(templateFindResp.getCreator())); + if (!ObjectUtils.isEmpty(user)){ + templateFindResp.setCreatorName(user.getUsername()); + } + } + + if (!StringUtils.isEmpty(templateFindResp.getUpdater())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(templateFindResp.getUpdater())); + if (!ObjectUtils.isEmpty(user)){ + templateFindResp.setUpdaterName(user.getUsername()); + } + } + } + + + + + + private void setStageAndTask(TemplateFindResp o) { + List list = new ArrayList<>(); + + //拼接流水线模板主节点 + List stageMainStage = findAllMainStage(o.getId()); + if (!stageMainStage.isEmpty()){ + for (TemplateStage stage : stageMainStage) { + String stagesId = stage.getId(); + //获取从节点 + List allStageStage = findSecondStageAndTask(stagesId); + List stageRespList = allStageStage.stream().map(it -> { +// BeanUtils.copyProperties(it, stageResp); + return JSON.parseObject(JSON.toJSONString(it), TemplateStageResp.class); + }).toList(); + TemplateStageResp stageResp = new TemplateStageResp(); + BeanUtils.copyProperties(stage,stageResp); + stageResp.setStageList(stageRespList); + list.add(stageResp); + } + list.sort(Comparator.comparing(TemplateStageResp::getStageSort)); + } + + o.setStageList(list); + } + + private List findSecondStageAndTask(String stagesId) { + List otherStage = findSecondStage(stagesId); + List list = new ArrayList<>(); + List stageIdList = otherStage.stream().map(TemplateStage::getId).toList(); + if (stageIdList.isEmpty()) { + throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"当前阶段下不存在节点"); + } + Map> stageIdTaskMap = getTaskByStageIdList(stageIdList).stream().collect(Collectors.groupingBy(TemplateTask::getStageId)); + for (TemplateStage stage : otherStage) { + //获取阶段配置及任务 + String otherId = stage.getId(); + List allStageTask = stageIdTaskMap.get(otherId); + allStageTask.sort(Comparator.comparing(TemplateTask::getTaskSort)); + stage.setTaskValues(allStageTask); + list.add(stage); + } + return list; + } + + private List getTaskByStageIdList(List stageIdList) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(TemplateTask::getStageId,stageIdList); + return templateTaskDao.selectList(wrapper); + } + + private List findSecondStage(String stagesId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TemplateStage::getParentId,stagesId); + return templateStageDao.selectList(wrapper); + } + + private List findAllMainStage(String id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(TemplateStage::getTemplateId,id); + wrapper.eq(TemplateStage::getParentId,"-1"); + return templateStageDao.selectList(wrapper); + } +} diff --git a/ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java b/ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java new file mode 100644 index 00000000..cca480f4 --- /dev/null +++ b/ops-server/src/main/java/cd/casic/server/controller/TemplateManagerController.java @@ -0,0 +1,83 @@ +package cd.casic.server.controller; + +import cd.casic.ci.common.pipeline.req.template.TemplateQueryReq; +import cd.casic.ci.common.pipeline.resp.template.TemplateFindResp; +import cd.casic.ci.common.pipeline.utils.PageResult; +import cd.casic.ci.process.process.service.template.TemplateManagerService; +import cd.casic.framework.commons.pojo.CommonResult; +import jakarta.annotation.Resource; +import jakarta.validation.Valid; +import org.jetbrains.annotations.NotNull; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName PipelineController + * @Author hopeli + * @Date 2025/5/10 10:28 + * @Version 1.0 + */ + +@RestController +@RequestMapping("/template") +public class TemplateManagerController { + + @Resource + private TemplateManagerService templateManagerService; + +// @PermitAll +// @PostMapping(path="/createPipeline") +// public CommonResult createPipeline(@RequestBody @Valid PipelineCreateReq pipelineReq){ +// +// String pipelineId = templateManagerService.createPipeline(pipelineReq); +// +// return CommonResult.success(pipelineId); +// } +// +// +// @PermitAll +// @PostMapping(path="/findPipelineList") +// public CommonResult> findPipelineList(@RequestBody @Valid PipelineQueryReq pipelineQueryReq){ +// +// List respList = templateManagerService.findPipelineList(pipelineQueryReq); +// +// return CommonResult.success(respList); +// } +// +// @PermitAll +// @PostMapping(path="/findPipelineById") +// public CommonResult findPipelineById(@RequestBody @Valid PipelineQueryReq pipelineQueryReq){ +// +// PipelineFindResp resp = templateManagerService.findPipelineById(pipelineQueryReq); +// +// return CommonResult.success(resp); +// } +// +// @PostMapping(path="/deletePipeline") +// public CommonResult deletePipeline(@RequestBody @Valid PipelineReq req){ +// +// templateManagerService.deletePipeline(req); +// +// return CommonResult.success(); +// } +// +// +// @PostMapping(path="/updatePipeline") +// public CommonResult updatePipeline(@RequestBody @NotNull @Valid PipelineUpdateReq pipeline){ +// +// templateManagerService.updatePipeline(pipeline); +// +// return CommonResult.success(); +// } + + + @PostMapping(path="/findTemplatePage") + public CommonResult> findTemplatePage(@RequestBody @NotNull @Valid TemplateQueryReq query){ + + PageResult pipelineRespPage = templateManagerService.findTemplatePage(query); + + return CommonResult.success(pipelineRespPage); + } +}