From 575b415c162ddb0f34979b14dd3420c998e4c8a2 Mon Sep 17 00:00:00 2001 From: HopeLi <1278288511@qq.com> Date: Mon, 19 May 2025 15:11:57 +0800 Subject: [PATCH] 0519 ljc --- .../resp/pipeline/PipelineFindResp.java | 9 ++--- modules/module-ci-process-biz/pom.xml | 4 +++ .../process/enums/PiplineTriggerModeEnum.java | 29 +++++++++++++++ .../pipeline/impl/PipelineServiceImpl.java | 35 +++++++++++++++++++ .../target/impl/TargetManagerServiceImpl.java | 3 ++ 5 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTriggerModeEnum.java 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 4efc4107..87f6b5b9 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,16 +20,16 @@ public class PipelineFindResp { private String name; //创建人id - private Long createUserId; + private String creator; //创建人姓名 - private String createUserName; + private String creatorName; //最后修改人id - private Long updateUserId; + private String updater; //最后修改人姓名 - private String updateUserName; + private String updaterName; private String remark; @@ -47,6 +47,7 @@ public class PipelineFindResp { * 执行人id */ private String executeUserId; + private String executeUserName; private String groupId; diff --git a/modules/module-ci-process-biz/pom.xml b/modules/module-ci-process-biz/pom.xml index 2f06a3ce..bb5f9e2e 100644 --- a/modules/module-ci-process-biz/pom.xml +++ b/modules/module-ci-process-biz/pom.xml @@ -25,6 +25,10 @@ resilience4j-circuitbreaker 2.3.0 + + cd.casic.boot + spring-boot-starter-biz-tenant + \ No newline at end of file diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTriggerModeEnum.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTriggerModeEnum.java new file mode 100644 index 00000000..1a6e7d29 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTriggerModeEnum.java @@ -0,0 +1,29 @@ +package cd.casic.ci.process.enums; + +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +@Getter +public enum PiplineTriggerModeEnum { + HAND("hand","手动触发"), + CODE("code","提交代码"), + WEBHOOK("webhook","网络连接"), + TIMING("timing","定时触发") + ; + private final String code; + private final String msg; + + PiplineTriggerModeEnum(String code, String msg) { + this.code = code; + this.msg = msg; + } + public static Map getCodeMap(){ + Map map = new HashMap<>(); + for (PiplineTriggerModeEnum value : values()) { + map.put(value.code, value); + } + return map; + } +} 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 93250487..d1c82741 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 @@ -24,6 +24,8 @@ 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 cd.casic.framework.security.dal.user.AdminUserDO; +import cd.casic.framework.tenant.core.service.AdminUserServiceImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -71,6 +73,9 @@ public class PipelineServiceImpl extends ServiceImpl i @Resource private PipResourceDao pipResourceDao; + @Resource + private AdminUserServiceImpl adminUserService; + @Override @Transactional(rollbackFor = Exception.class) public String createPipeline(PipelineCreateReq pipelineReq) { @@ -281,6 +286,8 @@ public class PipelineServiceImpl extends ServiceImpl i //对流水线进行流水线信息赋值 respList.forEach(this::setStageAndTask); + //对用户姓名进行赋值 + respList.forEach(this::setUserName); return respList; } @@ -377,11 +384,39 @@ public class PipelineServiceImpl extends ServiceImpl i //对流水线进行流水线信息赋值 respList.forEach(this::setStageAndTask); + respList.forEach(this::setUserName); + respPage.setRecords(respList); + respPage.setTotal(pipPipelinePage.getTotal()); + respPage.setCurrent(pipPipelinePage.getCurrent()); + respPage.setSize(pipPipelinePage.getSize()); PageResult pageResult = new PageResult<>(respPage); return pageResult; } + private void setUserName(PipelineFindResp pipelineFindResp) { + if (!StringUtils.isEmpty(pipelineFindResp.getCreator())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(pipelineFindResp.getCreator())); + if (!ObjectUtils.isEmpty(user)){ + pipelineFindResp.setCreatorName(user.getUsername()); + } + } + + if (!StringUtils.isEmpty(pipelineFindResp.getUpdater())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(pipelineFindResp.getUpdater())); + if (!ObjectUtils.isEmpty(user)){ + pipelineFindResp.setUpdaterName(user.getUsername()); + } + } + + if (!StringUtils.isEmpty(pipelineFindResp.getExecuteUserId())){ + AdminUserDO user = adminUserService.getUser(Long.valueOf(pipelineFindResp.getExecuteUserId())); + if (!ObjectUtils.isEmpty(user)){ + pipelineFindResp.setExecuteUserName(user.getUsername()); + } + } + } + @Override public void pipelineClone(PipelineReq req) { if (StringUtils.isEmpty(req.getId()) || StringUtils.isEmpty(req.getName())){ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java index c6e4ee1b..78ef7b75 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java @@ -145,6 +145,9 @@ public class TargetManagerServiceImpl extends ServiceImpl respList = TargetConverter.INSTANCE.toRespList(targetManagerPage.getRecords()); respPage.setRecords(respList); + respPage.setTotal(targetManagerPage.getTotal()); + respPage.setCurrent(targetManagerPage.getCurrent()); + respPage.setSize(targetManagerPage.getSize()); PageResult pageResult = new PageResult<>(respPage); return pageResult; }