diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java index c8bfe69..7a3c84a 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java @@ -1,7 +1,5 @@ package cd.casic.ci.common.pipeline.req.pipeline; -import cd.casic.framework.commons.dataobject.Group; -import cd.casic.framework.commons.dataobject.User; import lombok.Data; /** @@ -14,32 +12,13 @@ import lombok.Data; public class PipelineReq { private String id; - /** - * @pi.name:name - * @pi.dataType:string - * @pi.desc:流水线名称 - * @pi.value:name - */ private String name; - /** - * @pi.model:User - * @pi.desc:用户 - */ private String userId; + private String envId; - /** - * @pi.model:Env - * @pi.desc:流水线环境 - */ - private String env; - - /** - * @pi.model:Env - * @pi.desc:流水线组 - */ - private Group group; + private String groupId; /** * @pi.name:createTime @@ -87,7 +66,17 @@ public class PipelineReq { * @pi.desc:流水线模板 * @pi.value:template */ - private String template; + private String templateId; + + private String targetId; + + private String targetType; + + private String pipelineTag; + + private String resourceId; + + private String remake; /** * @pi.name:collect @@ -98,55 +87,55 @@ public class PipelineReq { private int collect; - // 以下为统计信息 - - - /** - * @pi.model:execUser - * @pi.desc:用户(执行人) - */ - private User execUser; - - /** - * @pi.name:number - * @pi.dataType:Integer - * @pi.desc:执行次数 - * @pi.value:2 - */ - private Integer number; - - /** - * @pi.name:instanceId - * @pi.dataType:string - * @pi.desc:实例id - * @pi.value:instanceId - */ - private String instanceId; - - - /** - * @pi.name:buildStatus - * @pi.dataType:string - * @pi.desc:最近构建状态 - * @pi.value:buildStatus - */ - private String buildStatus; - - - /** - * @pi.name:lastBuildTime - * @pi.dataType:string - * @pi.desc:最近构建时间 - * @pi.value:lastBuildTime - */ - private String lastBuildTime; - - - /** - * @pi.name:isExec - * @pi.dataType:boolean - * @pi.desc:是否可以执行 - * @pi.value:true - */ - private Boolean isExec; +// // 以下为统计信息 +// +// +// /** +// * @pi.model:execUser +// * @pi.desc:用户(执行人) +// */ +// private User execUser; +// +// /** +// * @pi.name:number +// * @pi.dataType:Integer +// * @pi.desc:执行次数 +// * @pi.value:2 +// */ +// private Integer number; +// +// /** +// * @pi.name:instanceId +// * @pi.dataType:string +// * @pi.desc:实例id +// * @pi.value:instanceId +// */ +// private String instanceId; +// +// +// /** +// * @pi.name:buildStatus +// * @pi.dataType:string +// * @pi.desc:最近构建状态 +// * @pi.value:buildStatus +// */ +// private String buildStatus; +// +// +// /** +// * @pi.name:lastBuildTime +// * @pi.dataType:string +// * @pi.desc:最近构建时间 +// * @pi.value:lastBuildTime +// */ +// private String lastBuildTime; +// +// +// /** +// * @pi.name:isExec +// * @pi.dataType:boolean +// * @pi.desc:是否可以执行 +// * @pi.value:true +// */ +// private Boolean isExec; } diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageReq.java index 9784e8c..73b2c66 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageReq.java @@ -1,8 +1,9 @@ package cd.casic.ci.common.pipeline.req.stage; -import cd.casic.ci.common.pipeline.resp.task.TasksResp; +import cd.casic.ci.common.pipeline.req.task.TasksReq; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; @Data @@ -14,7 +15,7 @@ public class StageReq { private String stageName; //@ApiProperty(name = "createTime",desc="创建时间") - private String createTime; + private LocalDateTime createTime; //@ApiProperty(name="pipelineId",desc="流水线id") private String pipelineId; @@ -29,7 +30,7 @@ public class StageReq { private boolean code = false; //@ApiProperty(name = "taskValues",desc="阶段任务") - private List taskValues; + private List taskValues; //@ApiProperty(name = "stageList",desc="阶段") private List stageList; diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/task/TasksReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/task/TasksReq.java new file mode 100644 index 0000000..f4d789f --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/task/TasksReq.java @@ -0,0 +1,41 @@ +package cd.casic.ci.common.pipeline.req.task; + +import com.alibaba.fastjson.JSONObject; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class TasksReq { + //@ApiProperty(name="taskId",desc="配置id") + private String taskId; + + //@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 JSONObject taskProperties; + + //@ApiProperty(name="pipeline",desc="流水线id",eg="@selectOne") + private String pipelineId; + + //@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-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java index 3aeba0f..b553ffe 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java @@ -1,16 +1,17 @@ package cd.casic.ci.common.pipeline.resp.task; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.Data; +import java.time.LocalDateTime; + @Data public class TasksResp { //@ApiProperty(name="taskId",desc="配置id") private String taskId; //@ApiProperty(name="createTime",desc="创建时间") - private String createTime; + private LocalDateTime createTime; //@ApiProperty(name="taskType",desc= "类型1-10:源码,10-20:测试,20-30:构建,30-40:部署,40-50:代码扫描,50-60:推送制品") private String taskType; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java index 54d3693..d980633 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java @@ -2,14 +2,87 @@ package cd.casic.ci.process.process.dataObject.pipeline; import lombok.Data; +import java.time.LocalDateTime; + @Data public class PipPipeline { + /** + * 主键id + */ private String id; + + /** + * 流水线名称 + */ private String name; + + /** + * 用户id + */ private String userId; - private String createTime; + + /** + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 流水线类型 1.多任务 2.多阶段 + */ private Integer type; + + /** + * 运行状态 1.未运行 2.运行中 + */ private Integer state; + + /** + * 项目作用域 1.全局 2.项目 + */ private Integer power; + + /** + * 颜色 1~5随机生成 + */ private Integer color; + + /** + * 流水线模板id + */ + private String templateId; + + /** + * 是否收藏 0.未收藏/1.收藏 + */ + private Integer collect; + + /** + * 目标id + */ + private String targetId; + + /** + * 目标类型 + */ + private String targetType; + + /** + * 流水线组id + */ + private String groupId; + + /** + * 资源id + */ + private String resourceId; + + /** + * 备注 + */ + private String remake; + + /** + * 流水线环境 + */ + private String envId; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java index b39f779..b20d369 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/stage/PipStage.java @@ -3,6 +3,7 @@ package cd.casic.ci.process.process.dataObject.stage; import cd.casic.ci.process.process.dataObject.task.PipTask; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; @Data public class PipStage { @@ -13,7 +14,7 @@ public class PipStage { private String stageName; //@ApiProperty(name = "createTime",desc="创建时间") - private String createTime; + private LocalDateTime createTime; //@ApiProperty(name="pipelineId",desc="流水线id") private String pipelineId; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java index 9bbd617..a7b1ecf 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java @@ -3,13 +3,15 @@ package cd.casic.ci.process.process.dataObject.task; import lombok.Data; import org.json.JSONObject; +import java.time.LocalDateTime; + @Data public class PipTask { //@ApiProperty(name="taskId",desc="配置id") private String taskId; //@ApiProperty(name="createTime",desc="创建时间") - private String createTime; + private LocalDateTime createTime; //@ApiProperty(name="taskType",desc= "类型1-10:源码,10-20:测试,20-30:构建,30-40:部署,40-50:代码扫描,50-60:推送制品") private String taskType; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java index 9942674..1d85503 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java @@ -1,17 +1,22 @@ package cd.casic.ci.process.process.service.pipeline.impl; -import cd.casic.ci.common.pipeline.constant.PipelineDateUtilConstant; import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq; -import cd.casic.ci.common.pipeline.utils.PipelineDateUtil; import cd.casic.ci.process.process.dal.pipeline.PipelineDao; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; +import cd.casic.ci.process.process.dataObject.stage.PipStage; +import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.pipeline.PipelineService; +import cd.casic.ci.process.process.service.stage.impl.StageServiceImpl; +import cd.casic.ci.process.process.service.task.impl.TaskServiceImpl; import cd.casic.framework.commons.util.object.BeanUtils; import cd.casic.framework.commons.util.util.WebFrameworkUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.Objects; /** @@ -24,7 +29,14 @@ import java.util.Objects; @Service @Slf4j public class PipelineServiceImpl extends ServiceImpl implements PipelineService { + @Resource + private StageServiceImpl stageService; + + @Resource + private TaskServiceImpl taskService; + @Override + @Transactional(rollbackFor = Exception.class) public String createPipeline(PipelineReq pipelineReq) { PipPipeline pipeline = new PipPipeline(); @@ -33,7 +45,7 @@ public class PipelineServiceImpl extends ServiceImpl i int randomNumber = (int)(Math.random() * 5) + 1; pipeline.setColor(randomNumber); - pipeline.setCreateTime(PipelineDateUtil.nowDateString(PipelineDateUtilConstant.yyyy_MM_dd_HH_mm_ss)); + pipeline.setCreateTime(LocalDateTime.now()); if (Objects.isNull(pipeline.getUserId())){ String loginUserId = String.valueOf(WebFrameworkUtils.getLoginUserId()); pipeline.setUserId(loginUserId); @@ -42,7 +54,128 @@ public class PipelineServiceImpl extends ServiceImpl i pipeline.setState(1); this.save(pipeline); - //TODO 创建关联的流水线模板 + //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.setStageSort(1); + stageReq1.setParentId("-1"); + stageReq1.setCode(true); + stageService.save(stageReq1); + + PipStage childStage1 = new PipStage(); + childStage1.setStageName("源码"); + childStage1.setCreateTime(LocalDateTime.now()); + childStage1.setStageSort(1); + childStage1.setCode(false); + childStage1.setParentId(stageReq1.getStageId()); + stageService.save(childStage1); + + //新增第二个阶段，包含串行和并行任务 + PipStage stageReq2 = new PipStage(); + stageReq2.setPipelineId(pipeline.getId()); + stageReq2.setStageName("阶段-2"); + stageReq2.setCreateTime(LocalDateTime.now()); + stageReq2.setStageSort(2); + stageReq2.setParentId("-1"); + stageReq2.setCode(true); + stageService.save(stageReq2); + + //新增并行阶段 + PipStage childStage21 = new PipStage(); + childStage21.setStageName("并行阶段-2-1"); + childStage21.setCreateTime(LocalDateTime.now()); + childStage21.setStageSort(1); + childStage21.setCode(false); + childStage21.setParentId(stageReq2.getStageId()); + stageService.save(childStage21); + + //新增串行阶段 + PipTask childTask21 = new PipTask(); + childTask21.setCreateTime(LocalDateTime.now()); + childTask21.setTaskName("串行任务-2-1"); + childTask21.setTaskType("test"); + childTask21.setTaskSort(1); + childTask21.setStageId(childStage21.getStageId()); + taskService.save(childTask21); + + //------------------------------------------------------------------ + PipStage childStage22 = new PipStage(); + childStage22.setStageName("并行阶段-2-2"); + childStage22.setCreateTime(LocalDateTime.now()); + childStage22.setStageSort(2); + childStage22.setCode(false); + childStage22.setParentId(stageReq2.getStageId()); + stageService.save(childStage22); + + PipTask childTask22 = new PipTask(); + childTask22.setCreateTime(LocalDateTime.now()); + childTask22.setTaskName("串行任务-2-2"); + childTask22.setTaskType("test"); + childTask22.setTaskSort(2); + childTask22.setStageId(childStage22.getStageId()); + taskService.save(childTask22); + + //创建第三个阶段 + PipStage stageReq3 = new PipStage(); + stageReq3.setPipelineId(pipeline.getId()); + stageReq3.setStageName("阶段-3"); + stageReq3.setCreateTime(LocalDateTime.now()); + stageReq3.setStageSort(3); + stageReq3.setParentId("-1"); + stageReq3.setCode(true); + stageService.save(stageReq3); + + PipStage childStage3 = new PipStage(); + childStage3.setStageName(""); + childStage3.setCreateTime(LocalDateTime.now()); + childStage3.setStageSort(1); + childStage3.setCode(false); + childStage3.setParentId(stageReq3.getStageId()); + stageService.save(childStage3); + + PipTask childTask31 = new PipTask(); + childTask31.setCreateTime(LocalDateTime.now()); + childTask31.setTaskName("串行任务-3-1"); + childTask31.setTaskType("test"); + childTask31.setTaskSort(1); + childTask31.setStageId(childStage3.getStageId()); + taskService.save(childTask31); + + //创建第四个阶段 + PipStage stageReq4 = new PipStage(); + stageReq4.setPipelineId(pipeline.getId()); + stageReq4.setStageName("阶段-4"); + stageReq4.setCreateTime(LocalDateTime.now()); + stageReq4.setStageSort(4); + stageReq4.setParentId("-1"); + stageReq4.setCode(true); + stageService.save(stageReq4); + + PipStage childStage4 = new PipStage(); + childStage4.setStageName(""); + childStage4.setCreateTime(LocalDateTime.now()); + childStage4.setStageSort(1); + childStage4.setCode(false); + childStage4.setParentId(stageReq4.getStageId()); + stageService.save(childStage4); + + PipTask childTask41 = new PipTask(); + childTask41.setCreateTime(LocalDateTime.now()); + childTask41.setTaskName("串行任务-4-1"); + childTask41.setTaskType("test"); + childTask41.setTaskSort(1); + childTask41.setStageId(childStage4.getStageId()); + taskService.save(childTask41); + + + //TODO 创建对应的鉴权关系 //TODO 创建对应的消息分发 return pipeline.getId(); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java index f5506bc..fb3a641 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java @@ -3,10 +3,13 @@ package cd.casic.ci.process.process.service.stage; import cd.casic.ci.common.pipeline.req.stage.StageReq; import cd.casic.ci.common.pipeline.resp.stage.StageResp; import cd.casic.ci.process.process.dataObject.stage.PipStage; +import com.baomidou.mybatisplus.extension.service.IService; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.List; -public interface StageService { +public interface StageService extends IService { /** * 创建阶段及关联任务 * @param stage 阶段信息 @@ -125,4 +128,6 @@ public interface StageService { List findAllStagesList(List idList); + void createStagesOrTaskList(@Valid @NotNull List stageList); + } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java index 86c3e36..e914cea 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java @@ -1,10 +1,7 @@ package cd.casic.ci.process.process.service.stage.impl; -import cd.casic.ci.common.pipeline.constant.PipelineDateUtilConstant; -import cd.casic.ci.common.pipeline.container.Stage; import cd.casic.ci.common.pipeline.req.stage.StageReq; import cd.casic.ci.common.pipeline.resp.stage.StageResp; -import cd.casic.ci.common.pipeline.utils.PipelineDateUtil; import cd.casic.ci.process.process.dal.pipeline.PipStageDao; import cd.casic.ci.process.process.dataObject.stage.PipStage; import cd.casic.ci.process.process.dataObject.task.PipTask; @@ -15,22 +12,22 @@ import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; import cd.casic.framework.commons.util.object.BeanUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; -import org.jsoup.helper.W3CDom; -import org.springframework.core.task.VirtualThreadTaskExecutor; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; import static cd.casic.ci.process.constant.PipelineFinalConstant.TASK_TYPE_CODE; @Service -public class StageServiceImpl implements StageService { +public class StageServiceImpl extends ServiceImpl implements StageService { @Resource private TaskService taskService; @Resource @@ -46,7 +43,7 @@ public class StageServiceImpl implements StageService { String taskType = stage.getTaskType(); int stageSort = stage.getStageSort(); - stage.setCreateTime(PipelineDateUtil.nowDateString(PipelineDateUtilConstant.yyyy_MM_dd_HH_mm_ss)); + stage.setCreateTime(LocalDateTime.now()); PipTask tasks = new PipTask(); tasks.setTaskType(taskType); @@ -252,6 +249,16 @@ public class StageServiceImpl implements StageService { public List findAllStagesList(List idList) { return null; } + + @Override + public void createStagesOrTaskList(List stageList) { + if (!ObjectUtils.isEmpty(stageList)){ + stageList.forEach(o->{ + this.createStagesOrTask(o); + }); + } + } + /** * 判断任务是否存在代码源 * @param pipelineId 流水线id diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java index 9359d60..c308ef2 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/TaskService.java @@ -1,12 +1,11 @@ package cd.casic.ci.process.process.service.task; -import cd.casic.ci.common.pipeline.resp.task.TasksResp; import cd.casic.ci.process.process.dataObject.task.PipTask; +import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; -import java.util.Objects; -public interface TaskService { +public interface TaskService extends IService { /** * 查询taskType是否存在（原项目的各种worker） * */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java index 6c5d60e..2f1c240 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java @@ -1,16 +1,13 @@ package cd.casic.ci.process.process.service.task.impl; import cd.casic.ci.common.pipeline.annotation.Plugin; -import cd.casic.ci.common.pipeline.constant.PipelineDateUtilConstant; -import cd.casic.ci.common.pipeline.utils.PipelineDateUtil; import cd.casic.ci.process.process.dal.pipeline.PipStageDao; import cd.casic.ci.process.process.dal.pipeline.PipTaskDao; -import cd.casic.ci.process.process.dataObject.stage.PipStage; import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.ci.process.process.service.task.TaskService; import cd.casic.framework.commons.exception.ServiceException; -import cd.casic.framework.commons.util.util.WebFrameworkUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; @@ -19,6 +16,7 @@ import org.springframework.context.annotation.ClassPathScanningCandidateComponen import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -27,7 +25,7 @@ import java.util.Set; import static cd.casic.ci.process.constant.PipelineFinalConstant.TASK_TYPE_CODE; @Service -public class TaskServiceImpl implements TaskService { +public class TaskServiceImpl extends ServiceImpl implements TaskService { private static final String basePackage = "cd.casic.ci.process.process.service"; private Set candidates; @Resource @@ -90,11 +88,11 @@ public class TaskServiceImpl implements TaskService { tasks.setTaskName(taskName); } - tasks.setCreateTime(PipelineDateUtil.nowDateString(PipelineDateUtilConstant.yyyy_MM_dd_HH_mm_ss)); + tasks.setCreateTime(LocalDateTime.now()); String tasksId = createTasks(tasks); //创建任务 - createDifferentTask(tasksId,taskType,tasks.getValues()); +// createDifferentTask(tasksId,taskType,tasks.getValues()); return tasksId; } diff --git a/ops-server/src/main/java/cd/casic/server/controller/StageController.java b/ops-server/src/main/java/cd/casic/server/controller/StageController.java index ff6f8ce..0de9ffe 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/StageController.java +++ b/ops-server/src/main/java/cd/casic/server/controller/StageController.java @@ -46,6 +46,13 @@ public class StageController { return CommonResult.success(taskId); } + + @RequestMapping(path="/createStageList",method = RequestMethod.POST) + public CommonResult createStagesOrTaskList(@RequestBody @Valid @NotNull List stageList){ + stageService.createStagesOrTaskList(stageList); + return CommonResult.success(); + } + /** * @pi.name:查询流水线阶段信息 * @pi.path:/stage/finAllStage