From 6c3ae0fc97e844f86b91ea2ff6e0e0f7c3a7c368 Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 15 May 2025 11:00:40 +0800 Subject: [PATCH] =?UTF-8?q?stage=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ci/common/pipeline/req/stage/StageUpdateReq.java | 7 ++++++- .../ci/process/process/service/stage/StageService.java | 3 ++- .../process/service/stage/impl/StageServiceImpl.java | 8 +++++++- .../java/cd/casic/server/controller/StageController.java | 5 +++-- 4 files changed, 18 insertions(+), 5 deletions(-) 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 index 22b1eb0..202ed9f 100644 --- 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 @@ -4,5 +4,10 @@ import lombok.Data; @Data public class StageUpdateReq { -// private + // 更新名称 + private String stageName; + // 更新sort + private Long stageSort; + private String stageId; + private String pipelineId; } 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 8314cfb..7e8731e 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 @@ -2,6 +2,7 @@ package cd.casic.ci.process.process.service.stage; import cd.casic.ci.common.pipeline.req.stage.StageCreateReq; import cd.casic.ci.common.pipeline.req.stage.StageReq; +import cd.casic.ci.common.pipeline.req.stage.StageUpdateReq; 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; @@ -83,7 +84,7 @@ public interface StageService extends IService { * 更新阶段任务 * @param stage 更新内容 */ - void updateStagesTask(StageReq stage); + void updateStagesTask(StageUpdateReq stage); /** 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 8bb260f..9f15535 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 @@ -3,6 +3,7 @@ package cd.casic.ci.process.process.service.stage.impl; import cd.casic.ci.common.pipeline.req.stage.StageCreateReq; import cd.casic.ci.common.pipeline.req.stage.StageReq; +import cd.casic.ci.common.pipeline.req.stage.StageUpdateReq; import cd.casic.ci.common.pipeline.req.task.TaskCreateReq; import cd.casic.ci.common.pipeline.resp.stage.StageResp; @@ -286,8 +287,13 @@ public class StageServiceImpl extends ServiceImpl impleme } @Override - public void updateStagesTask(StageReq stage) { + public void updateStagesTask(StageUpdateReq stage) { + String stageId = stage.getStageId(); + PipStage updateStage = getById(stageId); + if (stage.getStageSort() == null) { + + } } @Override 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 e7e5489..b4ae2d2 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 @@ -2,6 +2,7 @@ package cd.casic.server.controller; import cd.casic.ci.common.pipeline.req.stage.StageCreateReq; import cd.casic.ci.common.pipeline.req.stage.StageReq; +import cd.casic.ci.common.pipeline.req.stage.StageUpdateReq; import cd.casic.ci.common.pipeline.resp.stage.StageResp; import cd.casic.ci.process.process.service.stage.StageService; import cd.casic.framework.commons.pojo.CommonResult; @@ -70,14 +71,14 @@ public class StageController { /** * // TODO 暂时没发现哪里调用 - * @pi.name:更新流水线阶段任务 + * @pi.name:更新流水线阶段任务名称Or移动流水线阶段 * @pi.path:/stage/createStage * @pi.methodType:post * @pi.request-type:json * @pi.param: model=stage */ @RequestMapping(path="/updateStage",method = RequestMethod.POST) - public CommonResult updateStageTask(@RequestBody @Valid @NotNull StageReq stage){ + public CommonResult updateStageTask(@RequestBody @Valid @NotNull StageUpdateReq stage){ stageService.updateStagesTask(stage); return CommonResult.success(); }