流水线与模板定义。修改

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")
+    @PostMapping(path="/createTemplate")
-//    public CommonResult<String> createTemplate(@RequestBody @Valid TemplateCreateReq req){
+    public CommonResult<String> createTemplate(@RequestBody @Valid TemplateCreateReq req){
-//
+        String templateId = templateManagerService.createTemplateManager(req);
-//        String templateId = templateManagerService.createTemplate(req);
+        return CommonResult.success(templateId);
-//
+    }
-//        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="/findTemplatePage")
     public CommonResult<PageResult<TemplateFindResp>> findTemplatePage(@RequestBody @NotNull @Valid TemplateQueryReq query){

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;
+    }
+}

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

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;
 
 /**
  * 数据库模糊测试

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

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")
+@WorkAtom(taskType = PipelineTargetTypeConstant.BIN)
-public class TestGitWorker extends BaseWorker {
+public class TargetBinWorker extends BaseWorker {
 
 
     @Override

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")
+@WorkAtom(taskType = PipelineTargetTypeConstant.FIRM_WARE)
-public class TestWorker extends BaseWorker {
+public class TargetFirmWareWorker extends BaseWorker {
 
 
     @Override

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")
+@WorkAtom(taskType = PipelineTargetTypeConstant.SOURCE_CODE)
-public class TargetHandleWorker extends BaseWorker {
+public class TargetSourceCodeWorker extends BaseWorker {
     @Resource
     private TargetVersionService targetVersionService;
     @Resource

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) {
+
+    }
+}

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

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

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);
 }

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;
-
     /**
      * 描述
      */

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<TemplateManager> {
+    String createTemplateManager(TemplateCreateReq req);
 
     PageResult<TemplateFindResp> findTemplatePage(@Valid TemplateQueryReq query);
 

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<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) {