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

Compare commits

base: mianbin:f93004d1329873cd4d0bf338cc88862aa00c44dc
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp
..
compare: mianbin:aa9f19350eafdc60d93fdc2e951209212078a023
Branches Tags
mianbin:master
mianbin:jenkins-engin
mianbin:temp

No commits in common. "f93004d1329873cd4d0bf338cc88862aa00c44dc" and "aa9f19350eafdc60d93fdc2e951209212078a023" have entirely different histories.
f93004d132 ... aa9f19350e

10 changed files with 27 additions and 95 deletions
Show Stats Expand all files Collapse all files

10
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/context/RunContextResp.java Normal file
View File

@ -0,0 +1,10 @@
package cd.casic.ci.common.pipeline.resp.context;
import lombok.Data;
import java.util.List;
@Data
public class RunContextResp {
private String id;
private Integer state;
}

17
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/context/SingletonRunContextResp.java
View File

@ -1,17 +0,0 @@
package cd.casic.ci.common.pipeline.resp.context;
import lombok.Data;
/**
* 单节点上下文状态返回对象
* */
@Data
public class SingletonRunContextResp {
/**
* 流水线元素的id（pipeline、stage、task）
* */
private String id;
/**
* 状态 详见 ContextStateEnum
* */
private Integer state;
}

12
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/context/TreeRunContextResp.java
View File

@ -1,12 +0,0 @@
package cd.casic.ci.common.pipeline.resp.context;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Map;
@EqualsAndHashCode(callSuper = true)
@Data
public class TreeRunContextResp extends SingletonRunContextResp{
private Map<String,TreeRunContextResp> child;
}

5
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/log/PipTaskLog.java
View File

@ -1,6 +1,5 @@
package cd.casic.ci.process.process.dataObject.log;
import cd.casic.ci.process.constant.CommandConstant;
import cd.casic.framework.commons.dataobject.BaseDO;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -11,8 +10,4 @@ public class PipTaskLog extends BaseDO {
private String taskId;
private String content;
private String id;
public void append(String content){
this.content += CommandConstant.ENTER;
this.content +=content;
}
}

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java
View File

@ -4,7 +4,6 @@ import cd.casic.ci.common.pipeline.req.pipeline.PipelineCreateReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineQueryReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineUpdateReq;
import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp;
import cd.casic.ci.common.pipeline.resp.pipeline.PipelineFindResp;
import cd.casic.ci.common.pipeline.utils.PageResult;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
@ -12,7 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
import java.util.List;
import java.util.Map;
/**
* @author HopeLi
@ -35,6 +33,4 @@ public interface PipelineService extends IService<PipPipeline> {
void pipelineClone(@Valid PipelineReq req);
PipelineFindResp findPipelineById(@Valid PipelineQueryReq pipelineQueryReq);
Map<String, SingletonRunContextResp> getPipelineRunState(String pipelineId);
}

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

@ -4,14 +4,9 @@ import cd.casic.ci.common.pipeline.req.pipeline.PipelineCreateReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineQueryReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineUpdateReq;
import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp;
import cd.casic.ci.common.pipeline.resp.context.TreeRunContextResp;
import cd.casic.ci.common.pipeline.resp.pipeline.PipelineFindResp;
import cd.casic.ci.common.pipeline.resp.stage.StageResp;
import cd.casic.ci.common.pipeline.utils.PageResult;
import cd.casic.ci.process.engine.manager.RunContextManager;
import cd.casic.ci.process.engine.runContext.BaseRunContext;
import cd.casic.ci.process.engine.runContext.PipelineRunContext;
import cd.casic.ci.process.process.converter.PipelineConverter;
import cd.casic.ci.process.process.dal.pipeline.PipResourceDao;
import cd.casic.ci.process.process.dal.pipeline.PipStageDao;
@ -43,7 +38,9 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import java.time.LocalDateTime;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* @author HopeLi
@ -78,8 +75,6 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
@Resource
private AdminUserServiceImpl adminUserService;
@Resource
private RunContextManager contextManager;
@Override
@Transactional(rollbackFor = Exception.class)
@ -524,38 +519,4 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
return resp;
}
@Override
public Map<String, SingletonRunContextResp> getPipelineRunState(String pipelineId) {
BaseRunContext context = contextManager.getContext(pipelineId);
if (context instanceof PipelineRunContext pipelineRunContext) {
TreeRunContextResp pipeline = new TreeRunContextResp();
pipeline.setId(pipelineRunContext.getContextDef().getId());
pipeline.setState(pipelineRunContext.getState().get());
Map<String,TreeRunContextResp> secondStageStateMap = new HashMap<>(pipelineRunContext.getChildContext().size());
Map<String, BaseRunContext> childContext = pipelineRunContext.getChildContext();
pipeline.setChild(secondStageStateMap);
for (Map.Entry<String, BaseRunContext> secondEntry : childContext.entrySet()) {
BaseRunContext value = secondEntry.getValue();
String key = secondEntry.getKey();
TreeRunContextResp secondStage = new TreeRunContextResp();
secondStageStateMap.put(key,secondStage);
secondStage.setId(key);
secondStage.setState(value.getState().get());
Map<String, BaseRunContext> taskIdContextMap = value.getChildContext();
Map<String,TreeRunContextResp> taskStateMap = new HashMap<>(taskIdContextMap.size());
secondStage.setChild(taskStateMap);
for (Map.Entry<String, BaseRunContext> taskEntry : taskIdContextMap.entrySet()) {
BaseRunContext taskContext = taskEntry.getValue();
String taskId = taskEntry.getKey();
TreeRunContextResp taskState = new TreeRunContextResp();
taskState.setId(taskId);
taskState.setState(taskContext.getState().get());
taskStateMap.put(taskId,taskState);
}
}
}
return new HashMap<>();
}
}

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/StageService.java
View File

@ -2,7 +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.StageUpdateReq;
import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp;
import cd.casic.ci.common.pipeline.resp.context.RunContextResp;
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;
@ -85,5 +85,5 @@ public interface StageService extends IService<PipStage> {
void copyStage(@NotEmpty String stageId);
void deleteFirstStage(String stageId);
Map<String, SingletonRunContextResp> getStageRunState(@PathVariable String stageId);
Map<String, RunContextResp> getStageRunState(@PathVariable String stageId);
}

9
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java
View File

@ -4,7 +4,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.StageUpdateReq;
import cd.casic.ci.common.pipeline.req.task.TaskCreateReq;
import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp;
import cd.casic.ci.common.pipeline.resp.context.RunContextResp;
import cd.casic.ci.common.pipeline.resp.stage.StageResp;
import cd.casic.ci.process.engine.manager.RunContextManager;
import cd.casic.ci.process.engine.runContext.BaseRunContext;
@ -18,6 +18,7 @@ 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 com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
@ -408,9 +409,9 @@ public class StageServiceImpl extends ServiceImpl<PipStageDao, PipStage> impleme
}
@Override
public Map<String, SingletonRunContextResp> getStageRunState(String stageId) {
public Map<String, RunContextResp> getStageRunState(String stageId) {
PipStage byId = getById(stageId);
Map<String, SingletonRunContextResp> result = new HashMap<>();
Map<String, RunContextResp> result = new HashMap<>();
if (byId==null||"-1".equals(byId.getParentId())) {
log.error("传入stageId非阶段id");
return result;
@ -427,7 +428,7 @@ public class StageServiceImpl extends ServiceImpl<PipStageDao, PipStage> impleme
}
String taskId = taskValue.getId();
int state = context.getState().get();
SingletonRunContextResp runContextResp = new SingletonRunContextResp();
RunContextResp runContextResp = new RunContextResp();
runContextResp.setState(state);
runContextResp.setId(taskId);
result.put(taskId,runContextResp);

11
ops-server/src/main/java/cd/casic/server/controller/PipelineController.java
View File

@ -4,7 +4,6 @@ import cd.casic.ci.common.pipeline.req.pipeline.PipelineCreateReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineQueryReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineUpdateReq;
import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp;
import cd.casic.ci.common.pipeline.resp.pipeline.PipelineFindResp;
import cd.casic.ci.common.pipeline.utils.PageResult;
import cd.casic.ci.process.engine.executor.PipelineExecutor;
@ -15,10 +14,12 @@ import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import org.jetbrains.annotations.NotNull;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
* @ClassName PipelineController
@ -104,8 +105,4 @@ public class PipelineController {
PipelineRunContext execute = pipelineExecutor.execute(pipelineId);
return CommonResult.success(execute);
}
@PostMapping("/getStageRunState/{pipelineId}")
public CommonResult<Map<String, SingletonRunContextResp>> getPipelineRunState(@PathVariable String pipelineId){
return CommonResult.success(pipelineService.getPipelineRunState(pipelineId));
}
}

5
ops-server/src/main/java/cd/casic/server/controller/StageController.java
View File

@ -1,8 +1,9 @@
package cd.casic.server.controller;
import cd.casic.ci.common.pipeline.container.Stage;
import cd.casic.ci.common.pipeline.req.stage.StageCreateReq;
import cd.casic.ci.common.pipeline.req.stage.StageUpdateReq;
import cd.casic.ci.common.pipeline.resp.context.SingletonRunContextResp;
import cd.casic.ci.common.pipeline.resp.context.RunContextResp;
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;
@ -96,7 +97,7 @@ public class StageController {
return CommonResult.success();
}
@PostMapping("/getStageRunState/{stageId}")
public CommonResult<Map<String, SingletonRunContextResp> > getStageRunState(@PathVariable String stageId){
public CommonResult<Map<String, RunContextResp> > getStageRunState(@PathVariable String stageId){
return CommonResult.success(stageService.getStageRunState(stageId));
}
}