mianbin/ops-pro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp

Browse Source
This commit is contained in:
even 2025-05-19 15:30:22 +08:00
commit 6b79782a2b
5 changed files with 76 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/pipeline/PipelineFindResp.java
View File

@ -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;

4
modules/module-ci-process-biz/pom.xml
View File

@ -25,6 +25,10 @@
<artifactId>resilience4j-circuitbreaker</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
<groupId>cd.casic.boot</groupId>
<artifactId>spring-boot-starter-biz-tenant</artifactId>
</dependency>
</dependencies>
</project>

29
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTriggerModeEnum.java Normal file
View File

@ -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<String, PiplineTriggerModeEnum> getCodeMap(){
Map<String, PiplineTriggerModeEnum> map = new HashMap<>();
for (PiplineTriggerModeEnum value : values()) {
map.put(value.code, value);
}
return map;
}
}

35
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java
View File

@ -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<PipelineDao, PipPipeline> 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<PipelineDao, PipPipeline> i
//对流水线进行流水线信息赋值
respList.forEach(this::setStageAndTask);
//对用户姓名进行赋值
respList.forEach(this::setUserName);
return respList;
}
@ -377,11 +384,39 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> 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<PipelineFindResp> 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())){

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java
View File

@ -145,6 +145,9 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
List<TargetManagerResp> respList = TargetConverter.INSTANCE.toRespList(targetManagerPage.getRecords());
respPage.setRecords(respList);
respPage.setTotal(targetManagerPage.getTotal());
respPage.setCurrent(targetManagerPage.getCurrent());
respPage.setSize(targetManagerPage.getSize());
PageResult<TargetManagerResp> pageResult = new PageResult<>(respPage);
return pageResult;
}