diff --git a/framework/commons/src/main/java/cd/casic/framework/commons/dataobject/tenant/TenantBaseDO.java b/framework/commons/src/main/java/cd/casic/framework/commons/dataobject/tenant/TenantBaseDO.java new file mode 100644 index 0000000..b77d547 --- /dev/null +++ b/framework/commons/src/main/java/cd/casic/framework/commons/dataobject/tenant/TenantBaseDO.java @@ -0,0 +1,24 @@ +package cd.casic.framework.commons.dataobject.tenant; + + +import cd.casic.framework.commons.dataobject.BaseDO; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * 拓展多租户的 BaseDO 基类 + * + * @author mianbin modified from yudao + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = true) +public abstract class TenantBaseDO extends BaseDO { + + /** + * 多租户编号 + */ + private Long tenantId; + +} diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java new file mode 100644 index 0000000..e42f2e6 --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/stage/StageResp.java @@ -0,0 +1,54 @@ +package cd.casic.ci.common.pipeline.resp.stage; + +import cd.casic.ci.common.pipeline.container.Stage; +import cd.casic.ci.common.pipeline.resp.task.TasksResp; +import lombok.Data; + +import java.util.List; +@Data +public class StageResp { + //@ApiProperty(name = "stageId",desc="id") + private String stageId; + + //@ApiProperty(name = "stageName",desc="名称") + private String stageName; + + //@ApiProperty(name = "createTime",desc="创建时间") + private String createTime; + + //@ApiProperty(name="pipelineId",desc="流水线id") + private String pipelineId; + + //@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/stream/ScsConsumerBuilder.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/stream/ScsConsumerBuilder.java new file mode 100644 index 0000000..06aab00 --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/stream/ScsConsumerBuilder.java @@ -0,0 +1,15 @@ +package cd.casic.ci.common.pipeline.stream; + +import cd.casic.ci.common.pipeline.pojo.event.IEvent; + +import java.util.function.Consumer; + +//public class ScsConsumerBuilder { +// // 私有构造器防止实例化(单例模式) +// private ScsConsumerBuilder() {} +// +// // 泛型构建方法 +// public static Consumer> build(Consumer action) { +// return message -> action.accept(message.getPayload()); +// } +//}