diff --git a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java index d98c9ba..c8bfe69 100644 --- a/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java +++ b/modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/pipeline/PipelineReq.java @@ -1,12 +1,8 @@ package cd.casic.ci.common.pipeline.req.pipeline; import cd.casic.framework.commons.dataobject.Group; -import cd.casic.framework.commons.dataobject.PatchUser; import cd.casic.framework.commons.dataobject.User; import lombok.Data; -import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties; - -import java.util.List; /** * @ClassName PipelineReq @@ -16,13 +12,6 @@ import java.util.List; */ @Data public class PipelineReq { - - /** - * @pi.name:id - * @pi.dataType:string - * @pi.desc:流水线id - * @pi.value:11111 - */ private String id; /** @@ -37,14 +26,14 @@ public class PipelineReq { * @pi.model:User * @pi.desc:用户 */ - private User user; + private String userId; /** * @pi.model:Env * @pi.desc:流水线环境 */ - private CouchbaseProperties.Env env; + private String env; /** * @pi.model:Env @@ -108,12 +97,6 @@ public class PipelineReq { */ private int collect; - /** - * @pi.model:userList - * @pi.desc:流水线成员 - */ - private List userList; - // 以下为统计信息 diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java index 29ac2ff..b2bd293 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java @@ -1,7 +1,7 @@ package cd.casic.ci.process.process.dal.pipeline; import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import cd.casic.framework.mybatis.core.mapper.BaseMapperX; /** * @author HopeLi @@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @Date: 2025/5/13 14:39 * @Description: */ -public interface PipelineDao extends BaseMapper { +public interface PipelineDao extends BaseMapperX { } diff --git a/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java b/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java index a543eca..5dd79f0 100644 --- a/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java +++ b/ops-server/src/main/java/cd/casic/server/controller/PipelineController.java @@ -37,9 +37,8 @@ public class PipelineController { @PostMapping(path="/createPipeline") public CommonResult createPipeline(@RequestBody @Valid PipelineReq pipelineReq){ -// String pipelineId = pipelineService.createPipeline(pipelineReq); + String pipelineId = pipelineService.createPipeline(pipelineReq); - String pipelineId = "1"; return CommonResult.success(pipelineId); }