diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java index 06f019b1..2570fcab 100644 --- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java +++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TemplateManagerController.java @@ -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 createTemplate(@RequestBody @Valid TemplateCreateReq req){ -// -// String templateId = templateManagerService.createTemplate(req); -// -// return CommonResult.success(templateId); -// } -// -// -// @PostMapping(path="/deletePipeline") -// public CommonResult deletePipeline(@RequestBody @Valid PipelineReq req){ -// -// templateManagerService.deletePipeline(req); -// -// return CommonResult.success(); -// } -// -// -// @PostMapping(path="/updatePipeline") -// public CommonResult updatePipeline(@RequestBody @NotNull @Valid PipelineUpdateReq pipeline){ -// -// templateManagerService.updatePipeline(pipeline); -// -// return CommonResult.success(); -// } - + @PostMapping(path="/createTemplate") + public CommonResult createTemplate(@RequestBody @Valid TemplateCreateReq req){ + String templateId = templateManagerService.createTemplateManager(req); + return CommonResult.success(templateId); + } @PostMapping(path="/findTemplatePage") public CommonResult> findTemplatePage(@RequestBody @NotNull @Valid TemplateQueryReq query){ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java new file mode 100644 index 00000000..e7499b99 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/constant/PipelineTargetTypeConstant.java @@ -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; + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java index edf15f59..f0bd6258 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/dto/req/template/TemplateCreateReq.java @@ -12,4 +12,18 @@ import lombok.Data; @Data public class TemplateCreateReq{ + /** + * 模板名称 + */ + private String templateName; + + /** + * 模板分类 + */ + private String templateType; + + /** + * 描述 + */ + private String remark; } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java index 209f4eb9..4abf432f 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DBFuzzTestingWorker.java @@ -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; /** * 数据库模糊测试 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java index e9241a0a..3fdf041d 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/DIYImageExecuteCommandWorker.java @@ -24,7 +24,6 @@ import java.util.Map; */ @Slf4j @WorkAtom(taskType = "CUSTOM_IMAGE_EXECUTION_COMMAND") -//@Plugin(taskType = "testSSH") public class DIYImageExecuteCommandWorker extends SshWorker { @Override diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java similarity index 74% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java index 876d6778..5de0ba0b 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestGitWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetBinWorker.java @@ -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 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java similarity index 73% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java index 1425d8ae..68721f24 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TestWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetFirmWareWorker.java @@ -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 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java similarity index 92% rename from modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java rename to modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java index 4481cf6a..4cbb8433 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/TargetHandleWorker.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetSourceCodeWorker.java @@ -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 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java new file mode 100644 index 00000000..bb352961 --- /dev/null +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/engine/worker/target/TargetWebSiteWorker.java @@ -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) { + + } +} diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java deleted file mode 100644 index 366adbb2..00000000 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/enums/PiplineTargetTypeEnum.java +++ /dev/null @@ -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 getCodeMap(){ - Map map = new HashMap<>(); - for (PiplineTargetTypeEnum 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/converter/TemplateConverter.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java index 114e6667..1621a1a8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/converter/TemplateConverter.java @@ -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); } diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java index 9faeadb8..c26200c4 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/template/TemplateManager.java @@ -25,16 +25,6 @@ public class TemplateManager extends PipBaseElement { */ private String templateType; - /** - * 模板编码 - */ - private String templateCode; - - /** - * 排序 - */ - private Integer sort; - /** * 描述 */ diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java index 48c34d1b..1159118a 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/TemplateManagerService.java @@ -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 { + String createTemplateManager(TemplateCreateReq req); PageResult findTemplatePage(@Valid TemplateQueryReq query); diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java index 3e669fd3..c2601de8 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/template/impl/TemplateManagerServiceImpl.java @@ -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 findTemplatePage(TemplateQueryReq query) {