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

流水线与模板定义。修改

Browse Source
This commit is contained in:
even 2025-07-10 15:07:59 +08:00
parent f9e1cc45ed
commit 8965c57f35
14 changed files with 73 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java
View File

@ -1,6 +1,7 @@
package cd.casic.ci.api;
import cd.casic.ci.process.dto.req.template.TemplateCreateReq;
import cd.casic.ci.process.dto.req.template.TemplateQueryReq;
import cd.casic.ci.process.dto.resp.template.TemplateFindResp;
import cd.casic.ci.process.process.dataObject.base.BaseIdReq;
@ -31,32 +32,11 @@ public class TemplateManagerController {
@Resource
private TemplateManagerService templateManagerService;
// @PostMapping(path="/createTemplate")
// public CommonResult<String> createTemplate(@RequestBody @Valid TemplateCreateReq req){
//
// String templateId = templateManagerService.createTemplate(req);
//
// return CommonResult.success(templateId);
// }
//
//
// @PostMapping(path="/deletePipeline")
// public CommonResult<Void> deletePipeline(@RequestBody @Valid PipelineReq req){
//
// templateManagerService.deletePipeline(req);
//
// return CommonResult.success();
// }
//
//
// @PostMapping(path="/updatePipeline")
// public CommonResult<Void> updatePipeline(@RequestBody @NotNull @Valid PipelineUpdateReq pipeline){
//
// templateManagerService.updatePipeline(pipeline);
//
// return CommonResult.success();
// }
@PostMapping(path="/createTemplate")
public CommonResult<String> createTemplate(@RequestBody @Valid TemplateCreateReq req){
String templateId = templateManagerService.createTemplateManager(req);
return CommonResult.success(templateId);
}
@PostMapping(path="/findTemplatePage")
public CommonResult<PageResult<TemplateFindResp>> findTemplatePage(@RequestBody @NotNull @Valid TemplateQueryReq query){

17
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java Normal file
View File

@ -0,0 +1,17 @@
package cd.casic.ci.process.constant;
import lombok.Getter;
@Getter
public class PipelineTargetTypeConstant {
public static final String SOURCE_CODE="SOURCE_CODE";
public static final String BIN="BIN";
public static final String FIRM_WARE="FIRM_WARE";
public static final String WEB_SITE="WEB_SITE";
private final String msg;
PipelineTargetTypeConstant(String msg) {
this.msg = msg;
}
}

14
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java
View File

@ -12,4 +12,18 @@ import lombok.Data;
@Data
public class TemplateCreateReq{
/**
* 模板名称
*/
private String templateName;
/**
* 模板分类
*/
private String templateType;
/**
* 描述
*/
private String remark;
}

6
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java
View File

@ -3,14 +3,8 @@ package cd.casic.ci.process.engine.worker;
import cd.casic.ci.process.common.WorkAtom;
import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.BaseWorker;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import cn.hutool.http.HttpRequest;
import cn.hutool.http.HttpResponse;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import java.util.HashMap;
/**
* 数据库模糊测试

1
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java
View File

@ -24,7 +24,6 @@ import java.util.Map;
*/
@Slf4j
@WorkAtom(taskType = "CUSTOM_IMAGE_EXECUTION_COMMAND")
//@Plugin(taskType = "testSSH")
public class DIYImageExecuteCommandWorker extends SshWorker {
@Override

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java → modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java
View File

@ -1,17 +1,18 @@
package cd.casic.ci.process.engine.worker;
package cd.casic.ci.process.engine.worker.target;
import cd.casic.ci.process.common.WorkAtom;
import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.BaseWorker;
import cd.casic.ci.process.constant.PipelineTargetTypeConstant;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@WorkAtom(taskType = "Github")
public class TestGitWorker extends BaseWorker {
@WorkAtom(taskType = PipelineTargetTypeConstant.BIN)
public class TargetBinWorker extends BaseWorker {
@Override

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java → modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java
View File

@ -1,17 +1,18 @@
package cd.casic.ci.process.engine.worker;
package cd.casic.ci.process.engine.worker.target;
import cd.casic.ci.process.common.WorkAtom;
import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.BaseWorker;
import cd.casic.ci.process.constant.PipelineTargetTypeConstant;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@WorkAtom(taskType = "GIT")
public class TestWorker extends BaseWorker {
@WorkAtom(taskType = PipelineTargetTypeConstant.FIRM_WARE)
public class TargetFirmWareWorker extends BaseWorker {
@Override

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java → modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java
View File

@ -1,9 +1,10 @@
package cd.casic.ci.process.engine.worker;
package cd.casic.ci.process.engine.worker.target;
import cd.casic.ci.process.common.WorkAtom;
import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.BaseWorker;
import cd.casic.ci.process.constant.PipelineTargetTypeConstant;
import cd.casic.ci.process.process.service.machine.MachineInfoService;
import cd.casic.ci.process.process.service.target.TargetVersionService;
import jakarta.annotation.Resource;
@ -14,8 +15,8 @@ import lombok.extern.slf4j.Slf4j;
*
* */
@Slf4j
@WorkAtom(taskType = "code")
public class TargetHandleWorker extends BaseWorker {
@WorkAtom(taskType = PipelineTargetTypeConstant.SOURCE_CODE)
public class TargetSourceCodeWorker extends BaseWorker {
@Resource
private TargetVersionService targetVersionService;
@Resource

14
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java Normal file
View File

@ -0,0 +1,14 @@
package cd.casic.ci.process.engine.worker.target;
import cd.casic.ci.process.common.WorkAtom;
import cd.casic.ci.process.engine.runContext.TaskRunContext;
import cd.casic.ci.process.engine.worker.base.BaseWorker;
import cd.casic.ci.process.constant.PipelineTargetTypeConstant;
@WorkAtom(taskType = PipelineTargetTypeConstant.WEB_SITE)
public class TargetWebSiteWorker extends BaseWorker {
@Override
public void execute(TaskRunContext context) {
}
}

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

@ -1,29 +0,0 @@
package cd.casic.ci.process.enums;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@Getter
public enum PiplineTargetTypeEnum {
SOURCE_CODE("1","源程序"),
BIN("2","二进制"),
FIRM_WARE("3","二进制"),
WEB_SITE("4","web网站")
;
private final String code;
private final String msg;
PiplineTargetTypeEnum(String code, String msg) {
this.code = code;
this.msg = msg;
}
public static Map<String,PiplineTargetTypeEnum> getCodeMap(){
Map<String,PiplineTargetTypeEnum> map = new HashMap<>();
for (PiplineTargetTypeEnum value : values()) {
map.put(value.code, value);
}
return map;
}
}

3
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java
View File

@ -1,5 +1,6 @@
package cd.casic.ci.process.process.converter;
import cd.casic.ci.process.dto.req.template.TemplateCreateReq;
import cd.casic.ci.process.dto.resp.template.TemplateFindResp;
import cd.casic.ci.process.dto.resp.template.TemplateStageResp;
import cd.casic.ci.process.dto.resp.template.TemplateTasksResp;
@ -27,5 +28,5 @@ public interface TemplateConverter {
PipStage respToStage(TemplateStageResp resp);
TemplateStageResp stageTemplateToResp(TemplateStage stage);
PipTask templateTaskToTask(TemplateTasksResp resp);
TemplateManager managerCreateReqToManager(TemplateCreateReq req);
}

10
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java
View File

@ -25,16 +25,6 @@ public class TemplateManager extends PipBaseElement {
*/
private String templateType;
/**
* 模板编码
*/
private String templateCode;
/**
* 排序
*/
private Integer sort;
/**
* 描述
*/

2
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java
View File

@ -1,6 +1,7 @@
package cd.casic.ci.process.process.service.template;
import cd.casic.ci.process.dto.req.template.TemplateCreateReq;
import cd.casic.ci.process.dto.req.template.TemplateQueryReq;
import cd.casic.ci.process.dto.resp.template.TemplateFindResp;
import cd.casic.ci.process.process.dataObject.template.TemplateManager;
@ -18,6 +19,7 @@ import java.util.List;
* @Description:
*/
public interface TemplateManagerService extends IService<TemplateManager> {
String createTemplateManager(TemplateCreateReq req);
PageResult<TemplateFindResp> findTemplatePage(@Valid TemplateQueryReq query);

7
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java
View File

@ -1,6 +1,7 @@
package cd.casic.ci.process.process.service.template.impl;
import cd.casic.ci.process.dto.req.template.TemplateCreateReq;
import cd.casic.ci.process.dto.req.template.TemplateQueryReq;
import cd.casic.ci.process.dto.resp.template.TemplateFindResp;
import cd.casic.ci.process.dto.resp.template.TemplateStageResp;
@ -59,7 +60,11 @@ public class TemplateManagerServiceImpl extends ServiceImpl<TemplateManagerDao,
@Resource
private TemplateConverter templateConverter;
public String createTemplateManager(TemplateCreateReq req){
TemplateManager templateManager = templateConverter.managerCreateReqToManager(req);
save(templateManager);
return templateManager.getId();
}
@Override
public PageResult<TemplateFindResp> findTemplatePage(TemplateQueryReq query) {