From 7758a6d5ebaea1a2a05bcb0d77df0e7506819fcb Mon Sep 17 00:00:00 2001 From: even <827656971@qq.com> Date: Fri, 16 May 2025 16:03:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=95=E6=93=8E=E9=83=A8?= =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81=EF=BC=88=E5=BC=80=E4=BA=86=E4=B8=AA?= =?UTF-8?q?=E5=A4=B4=EF=BC=89=EF=BC=8Cstage=EF=BC=8Ctask=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../casic/ci/common/pipeline/ModelUpdate.java | 2 +- .../req/pipeline/PipelineQueryReq.java | 2 +- .../req/pipeline/PipelineUpdateReq.java | 4 +- .../req/resource/ResourceQueryReq.java | 4 +- .../pipeline/req/resource/ResourceReq.java | 4 +- .../resp/pipeline/PipelineFindResp.java | 4 +- .../pipeline/resp/resource/ResourceResp.java | 4 +- .../impl/DefaultRunContextManager.java | 41 ++++++++++++++++- .../engine/runContext/TaskRunContext.java | 21 ++++++--- .../dataObject/resource/PipResource.java | 4 +- .../process/dataObject/stage/PipStage.java | 3 -- .../process/dataObject/task/PipTask.java | 3 -- .../pipeline/impl/PipelineServiceImpl.java | 43 +++++++++--------- .../service/stage/impl/StageServiceImpl.java | 44 +++++++++---------- .../service/task/impl/TaskServiceImpl.java | 8 ++-- .../project/pojo/ProjectCreateUserInfo.java | 2 +- 16 files changed, 118 insertions(+), 75 deletions(-) diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/ModelUpdate.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/ModelUpdate.java index c7daec5..b2d4157 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/ModelUpdate.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/ModelUpdate.java @@ -26,7 +26,7 @@ public class ModelUpdate { private String name; @Schema(title = "更新人", required = true) - private String updateUserId; + private Long updateUserId; @Schema(title = "更新结果信息", required = false) private String updateResultMessage; diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineQueryReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineQueryReq.java index 4624c8b..631bdf3 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineQueryReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineQueryReq.java @@ -30,7 +30,7 @@ public class PipelineQueryReq extends PageParam { /** * 创建人用户id */ - private String createUserId; + private Long createUserId; /** diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineUpdateReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineUpdateReq.java index e2d44d6..0bef309 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineUpdateReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineUpdateReq.java @@ -16,9 +16,9 @@ public class PipelineUpdateReq { private String name; - private String createUserId; + private Long createUserId; - private String updateUserId; + private Long updateUserId; private String envId; diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceQueryReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceQueryReq.java index f50285a..1eba89e 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceQueryReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceQueryReq.java @@ -114,9 +114,9 @@ public class ResourceQueryReq { /** * 创建人用户id */ - private String createUserId; + private Long createUserId; - private String updateUserId; + private Long updateUserId; /** * 创建时间 diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceReq.java index 0889274..2580400 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/resource/ResourceReq.java @@ -114,9 +114,9 @@ public class ResourceReq { /** * 创建人用户id */ - private String createUserId; + private Long createUserId; - private String updateUserId; + private Long updateUserId; /** * 创建时间 diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/pipeline/PipelineFindResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/pipeline/PipelineFindResp.java index 0926044..1deb2b5 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/pipeline/PipelineFindResp.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/pipeline/PipelineFindResp.java @@ -20,13 +20,13 @@ public class PipelineFindResp { private String name; //创建人id - private String createUserId; + private Long createUserId; //创建人姓名 private String createUserName; //最后修改人id - private String updateUserId; + private Long updateUserId; //最后修改人姓名 private String updateUserName; diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/resource/ResourceResp.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/resource/ResourceResp.java index 07abe14..d10cf9c 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/resource/ResourceResp.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/resource/ResourceResp.java @@ -114,9 +114,9 @@ public class ResourceResp { /** * 创建人用户id */ - private String createUserId; + private Long createUserId; - private String updateUserId; + private Long updateUserId; /** * 创建时间 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java index 7de3b2f..9d32452 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/manager/impl/DefaultRunContextManager.java @@ -1,4 +1,43 @@ package cd.casic.ci.process.engine.manager.impl; -public class DefaultRunContextManager { +import cd.casic.ci.process.engine.manager.RunContextManager; +import cd.casic.ci.process.engine.runContext.BaseRunContext; +import org.springframework.stereotype.Component; + +@Component +public class DefaultRunContextManager implements RunContextManager { + @Override + public Boolean stopPipeline(String pipelineId) { + return null; + } + + @Override + public Boolean notifyPipeline(String pipelineId) { + return null; + } + + @Override + public Boolean suspendPipeline(String pipelineId) { + return null; + } + + @Override + public Boolean notifyStage(String pipelineId, String stageId) { + return null; + } + + @Override + public Boolean suspendStage(String pipelineId, String stageId) { + return null; + } + + @Override + public void contextRegister(BaseRunContext context) { + + } + + @Override + public BaseRunContext getContext(String key) { + return null; + } } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/TaskRunContext.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/TaskRunContext.java index df519e5..89a89f7 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/TaskRunContext.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/runContext/TaskRunContext.java @@ -1,22 +1,33 @@ package cd.casic.ci.process.engine.runContext; +import cd.casic.ci.process.process.dataObject.base.PipBaseElement; +import cd.casic.ci.process.process.dataObject.task.PipTask; import cd.casic.framework.commons.exception.ServiceException; import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants; +import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.StringUtils; -@EqualsAndHashCode(callSuper = true) -@Data +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + public class TaskRunContext extends BaseRunContext{ - private String taskId; - private String taskType; + public TaskRunContext(PipTask contextDef, StageRunContext parentContext, LocalDateTime startTime, String resourceId, String targetId, String targetType, Map globalVariables, Map localVariables) { + super(contextDef, parentContext, startTime, resourceId, targetId, targetType, globalVariables, localVariables, new HashMap<>()); + } + private TaskRunContext(PipBaseElement contextDef, BaseRunContext parentContext, LocalDateTime startTime, String resourceId, String targetId, String targetType, Map globalVariables, Map localVariables, Map childContext) { + super(contextDef, parentContext, startTime, resourceId, targetId, targetType, globalVariables, localVariables, childContext); + } + /** * task是最后一层没有下一级所以如果id相同直接返回它自己 * */ @Override public BaseRunContext getChildRunContext(String id) { - if (!StringUtils.isEmpty(id)||!id.equals(taskId)) { + if (!StringUtils.isEmpty(id)||!id.equals(this.getContextDef().getId())) { return null; } return this; diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java index 9c322d7..68ed958 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/resource/PipResource.java @@ -117,9 +117,9 @@ public class PipResource { /** * 创建人用户id */ - private String createUserId; + private Long createUserId; - private String updateUserId; + private Long updateUserId; /** * 创建时间 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 74db8e6..a93b298 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 @@ -14,9 +14,6 @@ import java.util.List; @Data public class PipStage extends PipBaseElement { //@ApiProperty(name = "stageId",desc="id") - @TableId(type = IdType.ASSIGN_ID) - private String stageId; - //@ApiProperty(name = "stageName",desc="名称") private String stageName; 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 c107e5b..e22168c 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 @@ -13,9 +13,6 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) @Data public class PipTask extends PipBaseElement { - //@ApiProperty(name="taskId",desc="配置id") - @TableId(type = IdType.ASSIGN_ID) - private String taskId; //@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 68d1bde..b086cf4 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 @@ -81,8 +81,7 @@ public class PipelineServiceImpl extends ServiceImpl i pipeline.setCreateTime(LocalDateTime.now()); if (Objects.isNull(pipeline.getCreateUserId())){ - String loginUserId = String.valueOf(WebFrameworkUtils.getLoginUserId()); - pipeline.setCreateUserId(loginUserId); + pipeline.setCreateUserId(WebFrameworkUtils.getLoginUserId()); } pipeline.setState(1); @@ -123,7 +122,7 @@ public class PipelineServiceImpl extends ServiceImpl i childStage1.setCreateUserId(WebFrameworkUtils.getLoginUserId()); childStage1.setStageSort(1); childStage1.setCode(false); - childStage1.setParentId(stageReq1.getStageId()); + childStage1.setParentId(stageReq1.getId()); stageService.save(childStage1); //新增第二个阶段，包含串行和并行任务 @@ -145,7 +144,7 @@ public class PipelineServiceImpl extends ServiceImpl i childStage21.setCreateUserId(WebFrameworkUtils.getLoginUserId()); childStage21.setStageSort(1); childStage21.setCode(false); - childStage21.setParentId(stageReq2.getStageId()); + childStage21.setParentId(stageReq2.getId()); stageService.save(childStage21); //新增串行阶段 @@ -156,7 +155,7 @@ public class PipelineServiceImpl extends ServiceImpl i childTask21.setCreateUserId(WebFrameworkUtils.getLoginUserId()); childTask21.setTaskType("test"); childTask21.setTaskSort(1); - childTask21.setStageId(childStage21.getStageId()); + childTask21.setStageId(childStage21.getId()); taskService.save(childTask21); //------------------------------------------------------------------ @@ -167,7 +166,7 @@ public class PipelineServiceImpl extends ServiceImpl i childStage22.setCreateUserId(WebFrameworkUtils.getLoginUserId()); childStage22.setStageSort(2); childStage22.setCode(false); - childStage22.setParentId(stageReq2.getStageId()); + childStage22.setParentId(stageReq2.getId()); stageService.save(childStage22); PipTask childTask22 = new PipTask(); @@ -177,7 +176,7 @@ public class PipelineServiceImpl extends ServiceImpl i childTask22.setPipelineId(pipeline.getId()); childTask22.setTaskType("test"); childTask22.setTaskSort(2); - childTask22.setStageId(childStage22.getStageId()); + childTask22.setStageId(childStage22.getId()); taskService.save(childTask22); //创建第三个阶段 @@ -198,7 +197,7 @@ public class PipelineServiceImpl extends ServiceImpl i childStage31.setCreateUserId(WebFrameworkUtils.getLoginUserId()); childStage31.setStageSort(1); childStage31.setCode(false); - childStage31.setParentId(stageReq3.getStageId()); + childStage31.setParentId(stageReq3.getId()); stageService.save(childStage31); PipTask childTask31 = new PipTask(); @@ -208,7 +207,7 @@ public class PipelineServiceImpl extends ServiceImpl i childTask31.setPipelineId(pipeline.getId()); childTask31.setTaskType("test"); childTask31.setTaskSort(1); - childTask31.setStageId(childStage31.getStageId()); + childTask31.setStageId(childStage31.getId()); taskService.save(childTask31); //创建第四个阶段 @@ -229,7 +228,7 @@ public class PipelineServiceImpl extends ServiceImpl i childStage41.setCreateUserId(WebFrameworkUtils.getLoginUserId()); childStage41.setStageSort(1); childStage41.setCode(false); - childStage41.setParentId(stageReq4.getStageId()); + childStage41.setParentId(stageReq4.getId()); stageService.save(childStage41); PipTask childTask41 = new PipTask(); @@ -239,7 +238,7 @@ public class PipelineServiceImpl extends ServiceImpl i childTask41.setPipelineId(pipeline.getId()); childTask41.setTaskType("test"); childTask41.setTaskSort(1); - childTask41.setStageId(childStage41.getStageId()); + childTask41.setStageId(childStage41.getId()); taskService.save(childTask41); //TODO 创建对应的鉴权关系 @@ -306,7 +305,7 @@ public class PipelineServiceImpl extends ServiceImpl i pipStage.setPipelineId(pipelineId); List pipStageList = stageService.getPipStageList(pipStage); if (!CollectionUtils.isEmpty(pipStageList)){ - List list = pipStageList.stream().map(PipStage::getStageId).toList(); + List list = pipStageList.stream().map(PipStage::getId).toList(); pipStageDao.deleteByIds(list); } @@ -314,7 +313,7 @@ public class PipelineServiceImpl extends ServiceImpl i pipTask.setPipelineId(pipelineId); List task = taskService.getTask(pipTask); if (!CollectionUtils.isEmpty(task)){ - List list = task.stream().map(PipTask::getTaskId).toList(); + List list = task.stream().map(PipTask::getId).toList(); pipTaskDao.deleteByIds(list); } @@ -333,7 +332,7 @@ public class PipelineServiceImpl extends ServiceImpl i PipPipeline pipPipeline = new PipPipeline(); BeanUtils.copyProperties(pipeline,pipPipeline); pipPipeline.setUpdateTime(LocalDateTime.now()); - pipPipeline.setUpdateUserId(String.valueOf(WebFrameworkUtils.getLoginUserId())); + pipPipeline.setUpdateUserId(WebFrameworkUtils.getLoginUserId()); pipelineDao.updateById(pipPipeline); } @@ -386,7 +385,7 @@ public class PipelineServiceImpl extends ServiceImpl i pipeline.setId(null); pipeline.setName(pipelineName); pipeline.setCreateTime(LocalDateTime.now()); - pipeline.setCreateUserId(String.valueOf(WebFrameworkUtils.getLoginUserId())); + pipeline.setCreateUserId(WebFrameworkUtils.getLoginUserId()); this.save(pipeline); //复制stage @@ -402,11 +401,11 @@ public class PipelineServiceImpl extends ServiceImpl i //根据阶段id查询下游并行节点 PipStage childStage = new PipStage(); childStage.setPipelineId(pipelineId); - childStage.setParentId(o.getStageId()); + childStage.setParentId(o.getId()); List pipStageChildList = stageService.getPipStageList(pipStage); //对查询结束的stage进行复制 - o.setStageId(null); + o.setId(null); o.setPipelineId(pipeline.getId()); o.setCreateTime(LocalDateTime.now()); o.setCreateUserId(WebFrameworkUtils.getLoginUserId()); @@ -418,12 +417,12 @@ public class PipelineServiceImpl extends ServiceImpl i //根据stageId查询串行节点 PipTask pipTask = new PipTask(); pipTask.setPipelineId(pipelineId); - pipTask.setStageId(j.getStageId()); + pipTask.setStageId(j.getId()); List taskList = taskService.getTask(pipTask); //对查询结束的并行节点进行复制 - j.setStageId(null); - j.setParentId(o.getStageId()); + j.setId(null); + j.setParentId(o.getId()); j.setPipelineId(pipeline.getId()); j.setCreateTime(LocalDateTime.now()); j.setCreateUserId(WebFrameworkUtils.getLoginUserId()); @@ -431,8 +430,8 @@ public class PipelineServiceImpl extends ServiceImpl i if (!CollectionUtils.isEmpty(taskList)){ taskList.forEach(k->{ - k.setTaskId(null); - k.setStageId(j.getStageId()); + k.setId(null); + k.setStageId(j.getId()); k.setPipelineId(pipeline.getId()); k.setCreateTime(LocalDateTime.now()); k.setCreateUserId(WebFrameworkUtils.getLoginUserId()); 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 0067be7..7e016a1 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 @@ -78,7 +78,7 @@ public class StageServiceImpl extends ServiceImpl impleme save(firstStage); } else { PipStage stageQuery = new PipStage(); - stageQuery.setStageId(firstStageId); + stageQuery.setId(firstStageId); List pipStageList = getPipStageList(stageQuery); if (!CollectionUtils.isEmpty(pipStageList)) { firstStage = pipStageList.get(0); @@ -108,7 +108,7 @@ public class StageServiceImpl extends ServiceImpl impleme secondStage.setUpdateUserId(loginUserId); save(secondStage); taskSort=1; - secondStageId = secondStage.getStageId(); + secondStageId = secondStage.getId(); } else { secondStage = getById(secondStageId); } @@ -128,7 +128,7 @@ public class StageServiceImpl extends ServiceImpl impleme pipTask.setCreateUserId(loginUserId); pipTask.setUpdateUserId(loginUserId); taskService.save(pipTask); - return pipTask.getTaskId(); + return pipTask.getId(); } @Override @@ -140,7 +140,7 @@ public class StageServiceImpl extends ServiceImpl impleme } List list = new ArrayList<>(); for (PipStage stage : stageMainStage) { - String stagesId = stage.getStageId(); + String stagesId = stage.getId(); //获取从节点 List allStageStage = findSecondStageAndTask(stagesId); List stageRespList = allStageStage.stream().map(it -> { @@ -165,7 +165,7 @@ public class StageServiceImpl extends ServiceImpl impleme return Collections.emptyList(); } for (PipStage stage : stageMainStage) { - String stagesId = stage.getStageId(); + String stagesId = stage.getId(); //获取从节点 List allStageStage = findSecondStageAndTask(stagesId); stage.setStageList(allStageStage); @@ -177,7 +177,7 @@ public class StageServiceImpl extends ServiceImpl impleme @Override public void deleteStagesOrTask(String taskId) { PipTask taskQuery = new PipTask(); - taskQuery.setTaskId(taskId); + taskQuery.setId(taskId); List taskList = taskService.getTask(taskQuery); if (CollectionUtils.isEmpty(taskList)) { return; @@ -187,7 +187,7 @@ public class StageServiceImpl extends ServiceImpl impleme // 查询上一级stage下有无其他task 没有则连着stage删除 String stageId = task.getStageId(); String pipelineId = task.getPipelineId(); - taskQuery.setTaskId(""); + taskQuery.setId(""); taskQuery.setStageId(stageId); List otherTask = taskService.getTask(task); if (CollectionUtils.isEmpty(otherTask)) { @@ -203,7 +203,7 @@ public class StageServiceImpl extends ServiceImpl impleme deleteStages(stageId); String parentId = currStage.getParentId(); stageQuery.setParentId(parentId); - stageQuery.setStageId(null); + stageQuery.setId(null); // 查询同阶段其他二级stage，如果不存在其他stage则删除阶段stage并整理sort值 List otherStageList = getPipStageList(stageQuery); if (CollectionUtils.isEmpty(otherStageList)) { @@ -233,7 +233,7 @@ public class StageServiceImpl extends ServiceImpl impleme public List getPipStageList(PipStage pipStage){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.isNotEmpty(pipStage.getStageId()),PipStage::getStageId,pipStage.getStageId()); + wrapper.eq(StringUtils.isNotEmpty(pipStage.getId()),PipStage::getId,pipStage.getId()); wrapper.eq(StringUtils.isNotEmpty(pipStage.getPipelineId()),PipStage::getPipelineId,pipStage.getPipelineId()); wrapper.eq(StringUtils.isNotEmpty(pipStage.getParentId()),PipStage::getParentId,pipStage.getParentId()); return stageDao.selectList(wrapper); @@ -249,11 +249,11 @@ public class StageServiceImpl extends ServiceImpl impleme @Transactional(rollbackFor = Exception.class) @Override public void updateStagesTask(StageUpdateReq stage) { - String stageId = stage.getStageId(); + String id = stage.getId(); String stageName = stage.getStageName(); Integer currStageSort = stage.getStageSort(); Long loginUserId = WebFrameworkUtils.getLoginUserId(); - PipStage updateStage = getById(stageId); + PipStage updateStage = getById(id); if (updateStage==null) { return; } @@ -275,7 +275,7 @@ public class StageServiceImpl extends ServiceImpl impleme if (oldStageSortoldStageSort&&pipStage.getStageSort()<=currStageSort) { pipStage.setStageSort(pipStage.getStageSort()-1); } @@ -284,7 +284,7 @@ public class StageServiceImpl extends ServiceImpl impleme } else { // 往左移动 for (PipStage pipStage : stageList) { - if (!pipStage.getStageId().equals(updateStage.getStageId())) { + if (!pipStage.getId().equals(updateStage.getId())) { if (pipStage.getStageSort()=currStageSort) { pipStage.setStageSort(pipStage.getStageSort()+1); } @@ -328,14 +328,14 @@ public class StageServiceImpl extends ServiceImpl impleme } } // 保存复制后的阶段，除了id和sort其他都一样 - firstStage.setStageId(null); + firstStage.setId(null); firstStage.setStageSort(firstStage.getStageSort()+1); save(firstStage); updateBatchById(updateStageList); // 查询阶段下所有分支 List secondStageList = findSecondStage(stageId); if (!CollectionUtils.isEmpty(secondStageList)) { - List stageIdList = secondStageList.stream().map(PipStage::getStageId).toList(); + List stageIdList = secondStageList.stream().map(PipStage::getId).toList(); List taskList = taskService.listByIds(stageIdList); Map> stageIdMap = taskList.stream().collect(Collectors.groupingBy(PipTask::getStageId)); for (PipStage secondStage : secondStageList) { @@ -343,14 +343,14 @@ public class StageServiceImpl extends ServiceImpl impleme secondStage.setCreateTime(LocalDateTime.now()); secondStage.setUpdateTime(LocalDateTime.now()); secondStage.setUpdateUserId(loginUserId); - secondStage.setParentId(firstStage.getStageId()); - String secondStageId = secondStage.getStageId(); + secondStage.setParentId(firstStage.getId()); + String secondStageId = secondStage.getId(); List childTask = stageIdMap.get(secondStageId); - secondStage.setStageId(null); + secondStage.setId(null); save(secondStage); for (PipTask pipTask : childTask) { - pipTask.setStageId(secondStage.getStageId()); - pipTask.setTaskId(null); + pipTask.setStageId(secondStage.getId()); + pipTask.setId(null); pipTask.setCreateUserId(loginUserId); pipTask.setCreateTime(LocalDateTime.now()); pipTask.setUpdateTime(LocalDateTime.now()); @@ -365,11 +365,11 @@ public class StageServiceImpl extends ServiceImpl impleme public List findSecondStageAndTask(String stagesId){ List otherStage = findSecondStage(stagesId); List list = new ArrayList<>(); - List stageIdList = otherStage.stream().map(PipStage::getStageId).toList(); + List stageIdList = otherStage.stream().map(PipStage::getId).toList(); Map> stageIdTaskMap = taskService.listByIds(stageIdList).stream().collect(Collectors.groupingBy(PipTask::getStageId)); for (PipStage stage : otherStage) { //获取阶段配置及任务 - String otherId = stage.getStageId(); + String otherId = stage.getId(); 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/impl/TaskServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java index 811d3e6..4c590c9 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 @@ -56,7 +56,7 @@ public class TaskServiceImpl extends ServiceImpl implements @Override public List getTask(PipTask task) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(StringUtils.isNotEmpty(task.getTaskId()),PipTask::getTaskId,task.getTaskId()); + wrapper.eq(StringUtils.isNotEmpty(task.getId()),PipTask::getId,task.getId()); wrapper.eq(StringUtils.isNotEmpty(task.getPipelineId()),PipTask::getPipelineId,task.getPipelineId()); wrapper.eq(StringUtils.isNotEmpty(task.getStageId()),PipTask::getStageId,task.getStageId()); return taskDao.selectList(wrapper); @@ -64,7 +64,7 @@ public class TaskServiceImpl extends ServiceImpl implements @Override public TasksResp getRespById(String taskId){ PipTask pipTask = new PipTask(); - pipTask.setTaskId(taskId); + pipTask.setId(taskId); List taskList = getTask(pipTask); if (!CollectionUtils.isEmpty(taskList)) { return null; @@ -90,7 +90,7 @@ public class TaskServiceImpl extends ServiceImpl implements } List updateList = new ArrayList<>(sameLevelTaskList.size()); for (PipTask pipTask : sameLevelTaskList) { - if (!pipTask.getTaskId().equals(sourceTask.getTaskId())) { + if (!pipTask.getId().equals(sourceTask.getId())) { if (pipTask.getTaskSort()>sourceTask.getTaskSort()) { pipTask.setTaskSort(pipTask.getTaskSort()+1); updateList.add(pipTask); @@ -98,7 +98,7 @@ public class TaskServiceImpl extends ServiceImpl implements } } sourceTask.setTaskSort(sourceTask.getTaskSort()+1); - sourceTask.setTaskId(null); + sourceTask.setId(null); save(sourceTask); if (!CollectionUtils.isEmpty(updateList)) { updateBatchById(updateList); diff --git a/modules/module-ci-project/src/main/java/cd/casic/ci/project/pojo/ProjectCreateUserInfo.java b/modules/module-ci-project/src/main/java/cd/casic/ci/project/pojo/ProjectCreateUserInfo.java index 31be476..7c4b432 100644 --- a/modules/module-ci-project/src/main/java/cd/casic/ci/project/pojo/ProjectCreateUserInfo.java +++ b/modules/module-ci-project/src/main/java/cd/casic/ci/project/pojo/ProjectCreateUserInfo.java @@ -15,7 +15,7 @@ import java.util.List; public class ProjectCreateUserInfo { @Schema(title = "操作人") - private String createUserId; + private Long createUserId; @Schema(title = "待分配的角色名称") private String roleName;