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 1/2] =?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(); } From 2f199cf34ce2ae79e92bab87a2676c049afcfc4c Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Thu, 15 May 2025 14:57:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pipeline/req/stage/StageUpdateReq.java | 2 +- .../process/service/stage/StageService.java | 49 ----- .../service/stage/impl/StageServiceImpl.java | 143 +++++---------- .../process/service/task/TaskService.java | 5 +- .../service/task/impl/TaskServiceImpl.java | 171 +----------------- .../server/controller/StageController.java | 44 +---- 6 files changed, 64 insertions(+), 350 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 202ed9f..50fd50e 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 @@ -7,7 +7,7 @@ public class StageUpdateReq { // 更新名称 private String stageName; // 更新sort - private Long stageSort; + private Integer 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 7e8731e..4220f40 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 @@ -20,27 +20,6 @@ public interface StageService extends IService { String createStagesOrTask(StageCreateReq stage); - /** - * 创建阶段模板 - * @param pipelineId 流水线id - * @param template 模板 - */ - void createStageTemplate(String pipelineId,String[] template); - - - /** - * 克隆阶段任务 - * @param pipelineId 流水线id - */ - void cloneStage(String pipelineId,String clonePipelineId); - - /** - * 查询所有阶段任务以及任务详情 - * @param pipelineId 流水线id - * @return 任务 - */ - List findAllStagesOrTask(String pipelineId); - /** * 查询所有阶段任务 * @param pipelineId 流水线id @@ -60,11 +39,6 @@ public interface StageService extends IService { */ void deleteAllStagesOrTask(String pipelineId); - /** - * 更新阶段名称 - * @param stage 阶段 - */ - void updateStageName(StageReq stage); /** * 获取所有阶段的根节点 @@ -94,13 +68,6 @@ public interface StageService extends IService { */ List validStagesMustField(String pipelineId); - /** - * 创建阶段 - * @param stage 阶段信息 - * @return 阶段id - */ - String createStages(PipStage stage); - /** * 更新阶段 * @param stage 阶段信息 @@ -113,22 +80,6 @@ public interface StageService extends IService { */ void deleteStages(String stageId); - /** - * 查询单个阶段 - * @param stageId 阶段id - * @return 阶段信息 - */ - PipStage findOneStages(String stageId); - - /** - * 查询所有阶段 - * @return 阶段信息集合 - */ - - List findAllStages(); - - 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 9f15535..cd15004 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 @@ -28,14 +28,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; -import static cd.casic.ci.process.constant.PipelineFinalConstant.TASK_TYPE_CODE; - @Service public class StageServiceImpl extends ServiceImpl implements StageService { @Resource @@ -140,41 +135,6 @@ public class StageServiceImpl extends ServiceImpl impleme taskService.save(pipTask); return pipTask.getTaskId(); } - /** - * 更新主节点阶段顺序 - * @param pipelineId 流水线id - * @param taskSort 顺序 - * @return 顺序 - */ - private Integer initStage(String pipelineId,int taskSort){ - List allMainStage = findAllMainStage(pipelineId); - if (allMainStage.isEmpty()){ - return 1; - } - for (PipStage stages : allMainStage) { - int stage = stages.getStageSort(); - if (stage < taskSort){ - continue; - } - stages.setStageSort(stage+1); - updateStages(stages); - } - return taskSort; - } - @Override - public void createStageTemplate(String pipelineId, String[] template) { - - } - - @Override - public void cloneStage(String pipelineId, String clonePipelineId) { - - } - - @Override - public List findAllStagesOrTask(String pipelineId) { - return null; - } @Override public List findAllStagesTask(String pipelineId) { @@ -190,7 +150,7 @@ public class StageServiceImpl extends ServiceImpl impleme List allStageStage = findOtherStageNoTask(stagesId); List stageRespList = allStageStage.stream().map(it -> { StageResp stageResp = new StageResp(); - BeanUtils.copyProperties(stageResp, it); + BeanUtils.copyProperties(it, stageResp); return stageResp; }).toList(); StageResp stageResp = new StageResp(); @@ -211,7 +171,7 @@ public class StageServiceImpl extends ServiceImpl impleme return; } PipTask task = taskList.get(0); - taskService.deleteTaskById(taskId); + taskService.removeById(taskId); // 查询上一级stage下有无其他task 没有则连着stage删除 String stageId = task.getStageId(); String pipelineId = task.getPipelineId(); @@ -267,17 +227,6 @@ public class StageServiceImpl extends ServiceImpl impleme return stageDao.selectList(wrapper); } - @Override - public void updateStageName(StageReq stage) { - LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); - if (StringUtils.isEmpty(stage.getStageName())||StringUtils.isEmpty(stage.getStageId())) { - throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"阶段Id和名称蹦年为空"); - } - wrapper.eq(PipStage::getStageId,stage.getStageId()); - wrapper.set(PipStage::getStageName,stage.getStageName()); - stageDao.update(wrapper); - } - @Override public List findAllMainStage(String pipelineId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -285,15 +234,54 @@ public class StageServiceImpl extends ServiceImpl impleme wrapper.eq(PipStage::getParentId,"-1"); return stageDao.selectList(wrapper); } - + @Transactional(rollbackFor = Exception.class) @Override public void updateStagesTask(StageUpdateReq stage) { String stageId = stage.getStageId(); + String stageName = stage.getStageName(); + Integer currStageSort = stage.getStageSort(); + Long loginUserId = WebFrameworkUtils.getLoginUserId(); PipStage updateStage = getById(stageId); - if (stage.getStageSort() == null) { - - + if (updateStage==null) { + return; } + + updateStage.setUpdateUserId(loginUserId); + updateStage.setUpdateTime(LocalDateTime.now()); + if (currStageSort == null) { + updateStage.setStageName(stageName); + updateById(updateStage); + } else{ + Integer oldStageSort = updateStage.getStageSort(); + if (oldStageSort.equals(currStageSort)) { + return; + } + PipStage query = new PipStage(); + query.setPipelineId(updateStage.getPipelineId()); + query.setParentId("-1"); + List stageList = getPipStageList(query); + if (oldStageSortoldStageSort&&pipStage.getStageSort()<=currStageSort) { + pipStage.setStageSort(pipStage.getStageSort()-1); + } + } + } + } else { + // 往左移动 + for (PipStage pipStage : stageList) { + if (!pipStage.getStageId().equals(updateStage.getStageId())) { + if (pipStage.getStageSort()=currStageSort) { + pipStage.setStageSort(pipStage.getStageSort()+1); + } + } + } + } + updateBatchById(stageList); + } + } @Override @@ -301,11 +289,7 @@ public class StageServiceImpl extends ServiceImpl impleme return null; } - @Override - public String createStages(PipStage stage) { - stageDao.insert(stage); - return stage.getStageId(); - } + @Override public void updateStages(PipStage stage) { @@ -317,20 +301,6 @@ public class StageServiceImpl extends ServiceImpl impleme stageDao.deleteById(stageId); } - @Override - public PipStage findOneStages(String stageId) { - return null; - } - - @Override - public List findAllStages() { - return null; - } - - @Override - public List findAllStagesList(List idList) { - return null; - } @Override public void createStagesOrTaskList(List stageList) { @@ -339,28 +309,15 @@ public class StageServiceImpl extends ServiceImpl impleme } } - /** - * 判断任务是否存在代码源 - * @param pipelineId 流水线id - */ - private void findTargetTasks(String pipelineId) { - List allStage = findAllMainStage(pipelineId); - if (allStage.isEmpty()){ - return; - } - for (PipStage stage : allStage) { - if (stage.getCode()){ - throw new ServiceException(50001,"代码源已存在，无法再次创建。"); - } - } - } public List findOtherStageNoTask(String stagesId){ List otherStage = findSecondStage(stagesId); List list = new ArrayList<>(); + List stageIdList = otherStage.stream().map(PipStage::getStageId).toList(); + Map> stageIdTaskMap = taskService.listByIds(stageIdList).stream().collect(Collectors.groupingBy(PipTask::getStageId)); for (PipStage stage : otherStage) { //获取阶段配置及任务 String otherId = stage.getStageId(); - List allStageTask = taskService.finAllStageTask(otherId); + List allStageTask = stageIdTaskMap.get(otherId); stage.setTaskValues(allStageTask); list.add(stage); } 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 9788006..81a3666 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,5 +1,6 @@ package cd.casic.ci.process.process.service.task; +import cd.casic.ci.common.pipeline.req.stage.StageCreateReq; 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; @@ -11,9 +12,7 @@ public interface TaskService extends IService { * 查询taskType是否存在（原项目的各种worker） * */ public void taskTypeExist(String taskType); - public String createTasksOrTask(PipTask tasks); - List finAllStageTask(String stageId); List getTask(PipTask pipTask); - void deleteTaskById(String taskId); public TasksResp getById(String taskId); + } 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 a72295e..16acc75 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 @@ -6,7 +6,7 @@ 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.task.PipTask; import cd.casic.ci.process.process.service.task.TaskService; -import cd.casic.framework.commons.exception.ServiceException; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import jakarta.annotation.PostConstruct; @@ -14,18 +14,18 @@ import jakarta.annotation.Resource; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.time.LocalDateTime; -import java.util.ArrayList; + + import java.util.List; -import java.util.Objects; + import java.util.Set; -import static cd.casic.ci.process.constant.PipelineFinalConstant.TASK_TYPE_CODE; @Service public class TaskServiceImpl extends ServiceImpl implements TaskService { @@ -46,66 +46,16 @@ public class TaskServiceImpl extends ServiceImpl implements new ClassPathScanningCandidateComponentProvider(false); provider.addIncludeFilter(new AnnotationTypeFilter(Plugin.class)); candidates = provider.findCandidateComponents(basePackage); + for (BeanDefinition candidate : candidates) { + + } + } @Override public void taskTypeExist(String taskType) { } - @Override - public String createTasksOrTask(PipTask tasks) { - - int sort = 0; - int taskSort = tasks.getTaskSort(); - String taskType = tasks.getTaskType(); - - //判断多任务是否存在代码源 - boolean b = TASK_TYPE_CODE.equals(taskType); - if (tasks.getPipelineId() != null && (b) ){ - findCode(tasks.getPipelineId()); - } - - //流水线任务 - String pipelineId = tasks.getPipelineId(); - if (pipelineId != null) { - sort = initSort(tasks.getPipelineId(), taskSort, taskType,1); - } - - //阶段任务 - String stageId = tasks.getStageId(); - if (stageId != null){ - sort = initSort(stageId, taskSort, taskType,2); - } - // TODO 后置任务暂时空置 -// //后置任务 -// String postprocessId = tasks.getPostprocessId(); -// if (postprocessId != null){ -// sort = initSort(postprocessId, taskSort, taskType,3); -// } - - tasks.setTaskSort(sort); - // 初始化名称 - if (Objects.isNull(tasks.getTaskName())){ -// String taskName = initDifferentTaskName(taskType); - String taskName = "未命名"; - tasks.setTaskName(taskName); - } - - tasks.setCreateTime(LocalDateTime.now()); - - String tasksId = createTasks(tasks); - //创建任务 -// createDifferentTask(tasksId,taskType,tasks.getValues()); - return tasksId; - } - - @Override - public List finAllStageTask(String stageId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PipTask::getStageId,stageId); - return taskDao.selectList(wrapper); - } - @Override public List getTask(PipTask task) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -126,107 +76,4 @@ public class TaskServiceImpl extends ServiceImpl implements BeanUtils.copyProperties(taskList.get(0),tasksResp); return tasksResp; } - @Override - public void deleteTaskById(String taskId) { - taskDao.deleteById(taskId); - } - - void createDifferentTask(String taskId,String taskType,Object values){ - // TODO - } - /** - * 查找目标节点是否存在 - * */ - private void findCode(String pipelineId){ - List tasks = finAllPipelineTask(pipelineId); - if (tasks == null){ - return; - } - for (PipTask task : tasks) { - String taskType = task.getTaskType(); - if (TASK_TYPE_CODE.equals(taskType)){ - throw new ServiceException(50001,"代码源已存在"); - } - } - } - - private List finAllPipelineTask(String pipelineId) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PipTask::getPipelineId,pipelineId); - return taskDao.selectList(wrapper); - } - /** - * 初始化配置顺序 - * @param id id - * @param taskSort 插入顺序 - * @param taskType 任务类型 - * @param type 1.流水线id 2.阶段id - * @return 顺序 - */ - private Integer initSort(String id, int taskSort,String taskType,int type){ - List list = new ArrayList<>(); - if (type == 1){ - list = finAllPipelineTask(id); - } - if (type == 2){ - list = findAllStageTask(id); - } -// if (type == 3){ -// PipTask postTask = findOnePostTask(id); -// if (postTask!= null){ -// list.add(postTask); -// } -// } - - if (list.isEmpty()){ - return 1; - } - - boolean b = TASK_TYPE_CODE.equals(taskType); - - //插入的为代码源 - if (b){ - for (PipTask tasks : list) { - tasks.setTaskSort(tasks.getTaskSort()+1); - updateTasks(tasks); - } - return 1; - } - - //更新顺序 - for (PipTask tasks : list) { - if (tasks.getTaskSort() < taskSort ){ - continue; - } - tasks.setTaskSort(tasks.getTaskSort()+1); - updateTasks(tasks); - } - return taskSort; - - } - - private void updateTasks(PipTask tasks){ - taskDao.updateById(tasks); - } - /** - * 创建任务 - * @param tasks 任务模型 - * @return 任务id - */ - private String createTasks(PipTask tasks){ - taskDao.insert(tasks); - return tasks.getTaskId(); - } - /** - * 根据stageId查询task - * */ - private List findAllStageTask(String stageId) { -// TasksQuery tasksQuery = new TasksQuery(); -// tasksQuery.setStageId(stageId); -// List tasksEntityList = tasksDao.findTaskList(tasksQuery); -// return BeanMapper.mapList(tasksEntityList, Tasks.class); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PipTask::getStageId,stageId); - return taskDao.selectList(wrapper); - } } 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 b4ae2d2..3ec4dda 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 @@ -14,10 +14,7 @@ import jakarta.annotation.security.PermitAll; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -48,13 +45,6 @@ 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 @@ -70,7 +60,6 @@ public class StageController { } /** - * // TODO 暂时没发现哪里调用 * @pi.name:更新流水线阶段任务名称Or移动流水线阶段 * @pi.path:/stage/createStage * @pi.methodType:post @@ -83,20 +72,6 @@ public class StageController { return CommonResult.success(); } - /** - * @pi.name:更新流水线阶段名称 - * @pi.path:/stage/updateStageName - * @pi.methodType:post - * @pi.request-type:json - * @pi.param: model=stage - */ - @PermitAll - @RequestMapping(path="/updateStageName",method = RequestMethod.POST) - public CommonResult updateTasksStage(@RequestBody @Valid @NotNull StageReq stage){ - stageService.updateStageName(stage); - return CommonResult.success(); - } - /** * @pi.name:删除流水线阶段及任务 * @pi.path:/stage/deleteStage @@ -104,27 +79,12 @@ public class StageController { * @pi.request-type: formdata * @pi.param: name=taskId;dataType=string;value=taskId; */ - @RequestMapping(path="/deleteStage",method = RequestMethod.POST) + @PostMapping(path="/deleteTasksOrStage") public CommonResult deleteTasksOrStage(@NotNull String taskId){ stageService.deleteStagesOrTask(taskId); return CommonResult.success(); } - /** - * @pi.name:效验流水线各个配置阶段完整性 - * @pi.path:/stage/validStagesMustField - * @pi.methodType:post - * @pi.request-type: formdata - * @pi.param: name=pipelineId;dataType=string;value=流水线Id; - */ - @RequestMapping(path="/validStagesMustField",method = RequestMethod.POST) - public CommonResult> validStagesMustField(@NotNull String pipelineId){ -// List list = stageService.validStagesMustField(pipelineId); -// return CommonResult.ok(list); - return CommonResult.success(Collections.emptyList()); - } - - }