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

Merge branch 'temp' of http://1.14.125.6:3000/mianbin/ops-pro into temp

Browse Source
This commit is contained in:
even 2025-05-14 09:37:50 +08:00
commit 78d0ad8b52
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,8 @@
package cd.casic.ci.common.pipeline.req.pipeline; package cd.casic.ci.common.pipeline.req.pipeline;
import cd.casic.framework.commons.dataobject.Group; import cd.casic.framework.commons.dataobject.Group;
import cd.casic.framework.commons.dataobject.PatchUser;
import cd.casic.framework.commons.dataobject.User; import cd.casic.framework.commons.dataobject.User;
import lombok.Data; import lombok.Data;
import org.springframework.boot.autoconfigure.couchbase.CouchbaseProperties;
import java.util.List;
/** /**
* @ClassName PipelineReq * @ClassName PipelineReq
@ -16,13 +12,6 @@ import java.util.List;
*/ */
@Data @Data
public class PipelineReq { public class PipelineReq {
/**
* @pi.name:id
* @pi.dataType:string
* @pi.desc:流水线id
* @pi.value:11111
*/
private String id; private String id;
/** /**
@ -37,14 +26,14 @@ public class PipelineReq {
* @pi.model:User * @pi.model:User
* @pi.desc:用户 * @pi.desc:用户
*/ */
private User user; private String userId;
/** /**
* @pi.model:Env * @pi.model:Env
* @pi.desc:流水线环境 * @pi.desc:流水线环境
*/ */
private CouchbaseProperties.Env env; private String env;
/** /**
* @pi.model:Env * @pi.model:Env
@ -108,12 +97,6 @@ public class PipelineReq {
*/ */
private int collect; private int collect;
/**
* @pi.model:userList
* @pi.desc:流水线成员
*/
private List<PatchUser> userList;
// 以下为统计信息 // 以下为统计信息

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dal/pipeline/PipelineDao.java
View File

@ -1,7 +1,7 @@
package cd.casic.ci.process.process.dal.pipeline; package cd.casic.ci.process.process.dal.pipeline;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline; 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 * @author HopeLi
@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @Date: 2025/5/13 14:39 * @Date: 2025/5/13 14:39
* @Description: * @Description:
*/ */
public interface PipelineDao extends BaseMapper<PipPipeline> { public interface PipelineDao extends BaseMapperX<PipPipeline> {
} }

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

@ -37,9 +37,8 @@ public class PipelineController {
@PostMapping(path="/createPipeline") @PostMapping(path="/createPipeline")
public CommonResult<String> createPipeline(@RequestBody @Valid PipelineReq pipelineReq){ public CommonResult<String> createPipeline(@RequestBody @Valid PipelineReq pipelineReq){
// String pipelineId = pipelineService.createPipeline(pipelineReq); String pipelineId = pipelineService.createPipeline(pipelineReq);
String pipelineId = "1";
return CommonResult.success(pipelineId); return CommonResult.success(pipelineId);
} }