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 
# Conflicts:
#	ops-server/pom.xml
This commit is contained in:
even 2025-05-13 17:23:15 +08:00
commit a30646253d
6 changed files with 105 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,14 @@
package cd.casic.ci.process.process.dal.pipeline;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @author HopeLi
* @version v1.0
* @ClassName PipelineDao
* @Date: 2025/5/13 14:39
* @Description:
*/
public interface PipelineDao extends BaseMapper<PipPipeline> {
}

15
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/pipeline/PipPipeline.java Normal file
View File

@ -0,0 +1,15 @@
package cd.casic.ci.process.process.dataObject.pipeline;
import lombok.Data;
@Data
public class PipPipeline {
private String id;
private String name;
private String userId;
private String createTime;
private Integer type;
private Integer state;
private Integer power;
private Integer color;
}

16
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/PipelineService.java Normal file
View File

@ -0,0 +1,16 @@
package cd.casic.ci.process.process.service.pipeline;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* @author HopeLi
* @version v1.0
* @ClassName PipelineService
* @Date: 2025/5/13 10:27
* @Description:
*/
public interface PipelineService extends IService<PipPipeline> {
String createPipeline(PipelineReq pipelineReq);
}

50
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java Normal file
View File

@ -0,0 +1,50 @@
package cd.casic.ci.process.process.service.pipeline.impl;
import cd.casic.ci.common.pipeline.constant.PipelineDateUtilConstant;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq;
import cd.casic.ci.common.pipeline.utils.PipelineDateUtil;
import cd.casic.ci.process.process.dal.pipeline.PipelineDao;
import cd.casic.ci.process.process.dataObject.pipeline.PipPipeline;
import cd.casic.ci.process.process.service.pipeline.PipelineService;
import cd.casic.framework.commons.util.object.BeanUtils;
import cd.casic.framework.commons.util.util.WebFrameworkUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.Objects;
/**
* @author HopeLi
* @version v1.0
* @ClassName PipelineServiceImpl
* @Date: 2025/5/13 10:31
* @Description:
*/
@Service
@Slf4j
public class PipelineServiceImpl extends ServiceImpl<PipelineDao, PipPipeline> implements PipelineService {
@Override
public String createPipeline(PipelineReq pipelineReq) {
PipPipeline pipeline = new PipPipeline();
BeanUtils.copyProperties(pipelineReq, pipeline);
// 随机颜色
int randomNumber = (int)(Math.random() * 5) + 1;
pipeline.setColor(randomNumber);
pipeline.setCreateTime(PipelineDateUtil.nowDateString(PipelineDateUtilConstant.yyyy_MM_dd_HH_mm_ss));
if (Objects.isNull(pipeline.getUserId())){
String loginUserId = String.valueOf(WebFrameworkUtils.getLoginUserId());
pipeline.setUserId(loginUserId);
}
pipeline.setState(1);
this.save(pipeline);
//TODO 创建关联的流水线模板
//TODO 创建对应的鉴权关系
//TODO 创建对应的消息分发
return pipeline.getId();
}
}

1
ops-server/pom.xml
View File

@ -51,7 +51,6 @@
<groupId>cd.casic.boot</groupId>
<artifactId>module-ci-process-biz</artifactId>
<version>2.0.0-jdk17</version>
<scope>compile</scope>
</dependency>
</dependencies>

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

@ -3,9 +3,11 @@ package cd.casic.server.controller;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineQueryReq;
import cd.casic.ci.common.pipeline.req.pipeline.PipelineReq;
import cd.casic.ci.common.pipeline.resp.pipeline.PipelineResp;
import cd.casic.ci.process.process.service.pipeline.PipelineService;
import cd.casic.framework.commons.dataobject.User;
import cd.casic.framework.commons.pojo.CommonResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import jakarta.annotation.security.PermitAll;
import jakarta.validation.Valid;
import org.jetbrains.annotations.NotNull;
@ -28,16 +30,21 @@ import java.util.List;
@RequestMapping("/pipeline")
public class PipelineController {
@PostMapping(path="/createPipeline")
public CommonResult<String> createPipeline(@RequestBody @NotNull @Valid PipelineReq pipelineReq){
@Resource
private PipelineService pipelineService;
// String pipelineId = pipelineService.createPipeline(pipeline);
@PermitAll
@PostMapping(path="/createPipeline")
public CommonResult<String> createPipeline(@RequestBody @Valid PipelineReq pipelineReq){
// String pipelineId = pipelineService.createPipeline(pipelineReq);
String pipelineId = "1";
return CommonResult.success(pipelineId);
}
@PermitAll
@PostMapping(path="/findAllPipeline")
public CommonResult<List<PipelineResp>> findAllPipeline(){