diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageUpdateReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageUpdateReq.java new file mode 100644 index 0000000..d082b0c --- /dev/null +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/stage/StageUpdateReq.java @@ -0,0 +1,8 @@ +package cd.casic.ci.common.pipeline.req.stage; + +import lombok.Data; + +@Data +public class StageUpdateReq { + private +} 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 4e71e06..8bb260f 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 @@ -14,6 +14,7 @@ import cd.casic.ci.process.process.service.task.TaskService; 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.commons.util.util.WebFrameworkUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -52,6 +53,7 @@ public class StageServiceImpl extends ServiceImpl impleme String taskType = task.getTaskType(); Integer taskSort = task.getTaskSort(); String pipelineId = task.getPipelineId(); + Long loginUserId = WebFrameworkUtils.getLoginUserId(); PipStage firstStage = null; // 判断是否需要新建阶段,如果没有传第一级tageId而传了sort就是需要创建阶段 if (StringUtils.isEmpty(firstStageId)) { @@ -65,6 +67,10 @@ public class StageServiceImpl extends ServiceImpl impleme firstStage.setCreateTime(LocalDateTime.now()); firstStage.setParentId("-1"); firstStage.setPipelineId(pipelineId); + + firstStage.setCreateUserId(loginUserId); + firstStage.setUpdateUserId(loginUserId); + firstStage.setUpdateTime(LocalDateTime.now()); PipStage stageQuery = new PipStage(); stageQuery.setPipelineId(pipelineId); stageQuery.setParentId("-1"); @@ -104,6 +110,11 @@ public class StageServiceImpl extends ServiceImpl impleme secondStage.setStageSort(pipStageList.size()+1); } secondStage.setCreateTime(LocalDateTime.now()); + secondStage.setUpdateTime(LocalDateTime.now()); + secondStage.setCreateUserId(loginUserId); + secondStage.setParentId(firstStageId); + secondStage.setPipelineId(pipelineId); + secondStage.setUpdateUserId(loginUserId); save(secondStage); taskSort=1; secondStageId = secondStage.getStageId(); @@ -122,6 +133,9 @@ public class StageServiceImpl extends ServiceImpl impleme pipTask.setCreateTime(LocalDateTime.now()); pipTask.setTaskProperties(taskProperties); pipTask.setPipelineId(pipelineId); + pipTask.setUpdateTime(LocalDateTime.now()); + pipTask.setCreateUserId(loginUserId); + pipTask.setUpdateUserId(loginUserId); taskService.save(pipTask); return pipTask.getTaskId(); }