diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java index 6c2dc210..7f22bbe2 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/pipeline/PipelineCreateReq.java @@ -1,6 +1,5 @@ package cd.casic.ci.process.dto.req.pipeline; -import cd.casic.ci.process.dto.req.resource.ResourceReq; import lombok.Data; import java.time.LocalDateTime; @@ -13,78 +12,60 @@ import java.time.LocalDateTime; */ @Data public class PipelineCreateReq { + //流水线名称 private String name; + //环境id private String envId; + //分组id private String groupId; - /** - * @pi.name:type - * @pi.dataType:Integer - * @pi.desc:流水线类型 1.多任务 2.多阶段 - * @pi.value: 1 - */ + + //流水线类型 1.多任务 2.多阶段 private int type; - /** - * @pi.name:state - * @pi.dataType:Integer - * @pi.desc:运行状态 1.未运行 2.运行中 - * @pi.value:1 - */ + //运行状态 1.未运行 2.运行中 private int state; - /** - * @pi.name:power - * @pi.dataType:Integer - * @pi.desc:项目作用域 1.全局 2.项目 - * @pi.value:1 - */ + //项目作用域 1.全局 2.项目 private int power; - /** - * @pi.name:color - * @pi.dataType:Integer - * @pi.desc:颜色 1~5随机生成 - * @pi.value:2 - */ + //颜色 1~5随机生成 private int color; - /** - * @pi.name:template - * @pi.dataType:string - * @pi.desc:流水线模板 - * @pi.value:template - */ + //流水线模板id private String templateId; + //目标id private String targetVersionId; + //目标类型 private String targetType; + //流水线标签 private String pipelineTag; + //项目id private String projectId; + //备注 private String remark; - /** - * @pi.name:collect - * @pi.dataType:Integer - * @pi.desc:收藏 0.未收藏 1.收藏 - * @pi.value:2 - */ + //收藏 0.未收藏 1.收藏 private int collect; + //执行人id private String executeUserId; + //执行时间 private LocalDateTime executeTime; + //流水线触发模式 private String pipelineTriggerMode; + //执行状态 private String executeStatus; + //资源id private String resourceId; - - private ResourceReq resourceReq; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java index 9e428e6e..7ec6e461 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/stage/StageCreateReq.java @@ -9,5 +9,6 @@ public class StageCreateReq { private String stageId; // 如果需要新增阶段则传这个 private Integer stageSort; + //节点信息 private TaskCreateReq task; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java index 5e67867a..7d74bb32 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/task/TaskUpdateReq.java @@ -8,7 +8,10 @@ import java.util.Map; public class TaskUpdateReq { // 第二级stageId,如果没有值则新建第二级stage private String id; + //节点名称 private String taskName; + //节点类型 private String taskType; + //节点参数配置json private Map taskProperties; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java index 75bd8287..2f7c18f1 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/resource/ResourceFindResp.java @@ -50,14 +50,19 @@ public class ResourceFindResp { //最后修改人姓名 private String updaterName; + //备注 private String remark; + //机器信息 private PipResourceMachine resourceMachine; + //镜像信息 private DockerEndpointDo dockerEndpoint; + //k8s信息 private PipResourceK8S pipResourceK8S; + //弹性云信息 private PipResourceCloud pipResourceCloud; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java index 99e91da9..caee81b2 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/resp/template/TemplateFindResp.java @@ -13,34 +13,43 @@ import java.util.List; */ @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 + // 创建人ID,记录创建该模板的用户唯一标识 private String creator; - //创建人姓名 + // 创建人姓名,记录创建该模板的用户名字 private String creatorName; - //最后修改人id + // 最后修改人ID,记录最后修改该模板的用户唯一标识 private String updater; - //最后修改人姓名 + // 最后修改人姓名,记录最后修改该模板的用户名字 private String updaterName; + // 模板创建时间 private LocalDateTime createTime; + // 模板最后一次更新时间 private LocalDateTime updateTime;