modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java

@@ -14,77 +14,77 @@ public class PipelineReq {
 
     private String name;
 
-//    private String userId;
+    private String userId;
-//
+
-//    private String envId;
+    private String envId;
-//
+
-//    private String groupId;
+    private String groupId;
-//
+
-//    /**
+    /**
-//     * @pi.name:createTime
+     * @pi.name:createTime
-//     * @pi.dataType:string
+     * @pi.dataType:string
-//     * @pi.desc:流水线创建时间
+     * @pi.desc:流水线创建时间
-//     * @pi.value:createTime
+     * @pi.value:createTime
-//     */
+     */
-//    private String createTime;
+    private String createTime;
-//
+
-//    /**
+    /**
-//     * @pi.name:type
+     * @pi.name:type
-//     * @pi.dataType:Integer
+     * @pi.dataType:Integer
-//     * @pi.desc:流水线类型 1.多任务 2.多阶段
+     * @pi.desc:流水线类型 1.多任务 2.多阶段
-//     * @pi.value: 1
+     * @pi.value: 1
-//     */
+     */
-//    private int type;
+    private int type;
-//
+
-//    /**
+    /**
-//     * @pi.name:state
+     * @pi.name:state
-//     * @pi.dataType:Integer
+     * @pi.dataType:Integer
-//     * @pi.desc:运行状态 1.未运行 2.运行中
+     * @pi.desc:运行状态 1.未运行 2.运行中
-//     * @pi.value:1
+     * @pi.value:1
-//     */
+     */
-//    private int state;
+    private int state;
-//
+
-//    /**
+    /**
-//     * @pi.name:power
+     * @pi.name:power
-//     * @pi.dataType:Integer
+     * @pi.dataType:Integer
-//     * @pi.desc:项目作用域 1.全局 2.项目
+     * @pi.desc:项目作用域 1.全局 2.项目
-//     * @pi.value:1
+     * @pi.value:1
-//     */
+     */
-//    private int power;
+    private int power;
-//
+
-//    /**
+    /**
-//     * @pi.name:color
+     * @pi.name:color
-//     * @pi.dataType:Integer
+     * @pi.dataType:Integer
-//     * @pi.desc:颜色 1~5随机生成
+     * @pi.desc:颜色 1~5随机生成
-//     * @pi.value:2
+     * @pi.value:2
-//     */
+     */
-//    private int color;
+    private int color;
-//
+
-//    /**
+    /**
-//     * @pi.name:template
+     * @pi.name:template
-//     * @pi.dataType:string
+     * @pi.dataType:string
-//     * @pi.desc:流水线模板
+     * @pi.desc:流水线模板
-//     * @pi.value:template
+     * @pi.value:template
-//     */
+     */
-//    private String templateId;
+    private String templateId;
-//
+
-//    private String targetId;
+    private String targetId;
-//
+
-//    private String targetType;
+    private String targetType;
-//
+
-//    private String pipelineTag;
+    private String pipelineTag;
-//
+
-//    private String resourceId;
+    private String resourceId;
-//
+
-//    private String remark;
+    private String remark;
-//
+
-//    /**
+    /**
-//     * @pi.name:collect
+     * @pi.name:collect
-//     * @pi.dataType:Integer
+     * @pi.dataType:Integer
-//     * @pi.desc:收藏 0.未收藏 1.收藏
+     * @pi.desc:收藏 0.未收藏 1.收藏
-//     * @pi.value:2
+     * @pi.value:2
-//     */
+     */
-//    private int collect;
+    private int collect;
 
 
 //    // 以下为统计信息

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

@@ -48,10 +48,6 @@ public class PipelineFindResp {
      */
     private String executeUserId;
 
-    private String groupId;
-
-    private String pipelineTag;
-
     /**
      * 执行时间
      */
@@ -67,41 +63,6 @@ public class PipelineFindResp {
      */
     private String executeStatus;
 
-    /**
-     * 所属项目id
-     */
-    private String projectId;
-
-    /**
-     * 持续时间
-     */
-    private Long durationTime;
-
-    /**
-     * 开始执行时间
-     */
-    private LocalDateTime startExecuteTime;
-
-    /**
-     * 代码变更次数
-     */
-    private String codeChange;
-
-    /**
-     * 运行产物
-     */
-    private String operatingProducts;
-
-    /**
-     * 环境变量
-     */
-    private String environmentVariable;
-
-    /**
-     * 运行实例编号
-     */
-    private String instanceNum;
-
     private List<StageResp> stageList;
 
 

modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java

@@ -1,8 +1,10 @@
 package cd.casic.ci.process.process.dataObject.pipeline;
 
+import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
 
@@ -42,7 +44,7 @@ public class PipPipeline extends PipBaseElement {
     private String templateId;
 
     /**
-     * 是否收藏 0.未收藏/1.收藏
+     * 是否收藏 0.未收藏 1.收藏
      */
     private Integer collect;
 
@@ -56,11 +58,6 @@ public class PipPipeline extends PipBaseElement {
      */
     private String targetType;
 
-    /**
-     * 流水线标签
-     */
-    private String pipelineTag;
-
     /**
      * 流水线组id
      */
@@ -101,38 +98,13 @@ public class PipPipeline extends PipBaseElement {
      */
     private String executeStatus;
 
+    /**
+     * 流水线标签
+     */
+    private String pipelineTag;
+
     /**
      * 所属项目id
      */
     private String projectId;
-
-    /**
-     * 持续时间
-     */
-    private Long durationTime;
-
-    /**
-     * 开始执行时间
-     */
-    private LocalDateTime startExecuteTime;
-
-    /**
-     * 代码变更次数
-     */
-    private String codeChange;
-
-    /**
-     * 运行产物
-     */
-    private String operatingProducts;
-
-    /**
-     * 环境变量
-     */
-    private String environmentVariable;
-
-    /**
-     * 运行实例编号
-     */
-    private String instanceNum;
 }

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

@@ -2,7 +2,6 @@ package cd.casic.ci.process.process.service.pipeline;
 
 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.pipeline.PipelineFindResp;
 import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
@@ -24,13 +23,11 @@ public interface PipelineService extends IService<PipPipeline> {
 
     List<PipelineFindResp> findPipelineList(@Valid PipelineQueryReq pipelineQueryReq);
 
-    void deletePipeline(@Valid PipelineReq req);
+    void deletePipeline(String pipelineId);
 
     void updatePipeline(@Valid PipelineUpdateReq pipeline);
 
     Page<PipelineFindResp> findPipelinePage(@Valid PipelineQueryReq query);
 
-    void pipelineClone(@Valid PipelineReq req);
+    void pipelineClone(String pipelineId, String pipelineName);
-
-    PipelineFindResp findPipelineById(@Valid PipelineQueryReq pipelineQueryReq);
 }

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

@@ -2,7 +2,6 @@ package cd.casic.ci.process.process.service.pipeline.impl;
 
 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.pipeline.PipelineFindResp;
 import cd.casic.ci.common.pipeline.resp.stage.StageResp;
@@ -290,13 +289,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deletePipeline(PipelineReq req) {
+    public void deletePipeline(String pipelineId) {
-        if (StringUtils.isEmpty(req.getId())){
-            throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"id不能为空");
-        }
-
-        String pipelineId = req.getId();
-
         if (ObjectUtils.isEmpty(pipelineId)){
             throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"请求参数不能为空");
         }
@@ -366,7 +359,8 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
         if (!ObjectUtils.isEmpty(query.getGroupId())){
             wrapper.eq("group_id",query.getGroupId());
         }
-        Page<PipPipeline> pipPipelinePage = pipelineDao.selectPage(new Page<>(query.getPageNo(), query.getPageSize()), wrapper);
+        Page<PipPipeline> page = new Page<>(query.getPageNo(), query.getPageSize());
+        Page<PipPipeline> pipPipelinePage = pipelineDao.selectPage(page, wrapper);
 
         if (ObjectUtils.isEmpty(pipPipelinePage)){
             return new Page<>();
@@ -381,12 +375,7 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
     }
 
     @Override
-    public void pipelineClone(PipelineReq req) {
+    public void pipelineClone(String pipelineId, String pipelineName) {
-        if (StringUtils.isEmpty(req.getId()) || StringUtils.isEmpty(req.getName())){
-            throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"参数不能为空");
-        }
-        String pipelineId = req.getId();
-        String pipelineName = req.getName();
         PipPipeline pipeline = pipelineDao.selectById(pipelineId);
         if (ObjectUtils.isEmpty(pipeline)){
             throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"数据错误，请联系管理员");
@@ -457,19 +446,4 @@ public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> i
 
         //TODO   复制状态下资源处理不明确，暂时只做resourceId的继承保留
     }
-
-    @Override
-    public PipelineFindResp findPipelineById(PipelineQueryReq pipelineQueryReq) {
-        if (StringUtils.isEmpty(pipelineQueryReq.getId())){
-            throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"id参数不能为空");
-        }
-        PipPipeline pipeline = pipelineDao.selectById(pipelineQueryReq.getId());
-        if (ObjectUtils.isEmpty(pipeline)){
-            throw new ServiceException(GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR.getCode(),"数据错误，请联系管理员");
-        }
-        PipelineFindResp resp = PipelineConverter.INSTANCE.toResp(pipeline);
-        setStageAndTask(resp);
-
-        return resp;
-    }
 }

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

@@ -2,7 +2,6 @@ package cd.casic.server.controller;
 
 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.pipeline.PipelineFindResp;
 import cd.casic.ci.process.process.service.pipeline.PipelineService;
@@ -52,19 +51,10 @@ public class PipelineController {
         return CommonResult.success(respList);
     }
 
-    @PermitAll
-    @PostMapping(path="/findPipelineById")
-    public CommonResult<PipelineFindResp> findPipelineById(@RequestBody @Valid PipelineQueryReq pipelineQueryReq){
-
-        PipelineFindResp resp = pipelineService.findPipelineById(pipelineQueryReq);
-
-        return CommonResult.success(resp);
-    }
-
     @PostMapping(path="/deletePipeline")
-    public CommonResult<Void> deletePipeline(@RequestBody @Valid PipelineReq req){
+    public CommonResult<Void> deletePipeline(@NotNull String pipelineId){
 
-        pipelineService.deletePipeline(req);
+        pipelineService.deletePipeline(pipelineId);
 
         return CommonResult.success();
     }
@@ -91,8 +81,9 @@ public class PipelineController {
 
 
     @PostMapping(path="/pipelineClone")
-    public CommonResult<Void> pipelineClone(@RequestBody @Valid PipelineReq req){
+    public CommonResult<Void> pipelineClone(@NotNull String pipelineId,@NotNull String pipelineName){
-        pipelineService.pipelineClone(req);
+
+        pipelineService.pipelineClone(pipelineId,pipelineName);
 
         return CommonResult.success();
     }