名称改回，传参形式修改
This commit is contained in:
even
parent
6605dd16e6
commit
1520c8c103
@ -0,0 +1,48 @@
|
||||
package cd.casic.ci.common.pipeline.resp.taskTemplate;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class TaskTemplateResp {
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
private String id;
|
||||
|
||||
/**
|
||||
* 唯一标示做关联
|
||||
*/
|
||||
private String parentId;
|
||||
|
||||
/**
|
||||
* name
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
private String label;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
private String nodDescription;
|
||||
|
||||
/**
|
||||
* 图标
|
||||
*/
|
||||
private String icon;
|
||||
/**
|
||||
* 是否有执行结果数据
|
||||
*/
|
||||
private int view;
|
||||
|
||||
/**
|
||||
* 节点类型：目录-0or 节点-1
|
||||
*/
|
||||
private Integer type;
|
||||
private List<TaskTemplateResp> children;
|
||||
}
|
||||
@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
* @date 2022-11-08 9:59
|
||||
*/
|
||||
@Slf4j
|
||||
//@Plugin(taskType = "CUSTOM_IMAGE_EXECUTION_COMMAND")
|
||||
@Plugin(taskType = "testSSH")
|
||||
@Plugin(taskType = "CUSTOM_IMAGE_EXECUTION_COMMAND")
|
||||
//@Plugin(taskType = "testSSH")
|
||||
public class DIYImageExecuteCommandWorker extends SshWorker {
|
||||
|
||||
@Override
|
||||
|
||||
@ -39,7 +39,7 @@ import java.util.*;
|
||||
* @Description:
|
||||
*/
|
||||
@Slf4j
|
||||
@Plugin(taskType = "test")
|
||||
@Plugin(taskType = "SCA_S_BOM")
|
||||
public class ScaSbomWorker extends HttpWorker{
|
||||
|
||||
private static final int POLLING_INTERVAL = 5000; // 轮询间隔，单位：毫秒
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
package cd.casic.ci.process.process.dal.pipeline;
|
||||
|
||||
import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate;
|
||||
import cd.casic.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @author herenbin
|
||||
* @description pipeline_node_templateMapper
|
||||
* @date 2022-09-16
|
||||
*/
|
||||
@Mapper
|
||||
public interface PipTaskTemplateDao extends BaseMapperX<PipTaskTemplate> {
|
||||
}
|
||||
@ -0,0 +1,64 @@
|
||||
package cd.casic.ci.process.process.dataObject.node;
|
||||
|
||||
|
||||
import cd.casic.framework.commons.dataobject.BaseDO;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
/**
|
||||
* @author herenbin
|
||||
* @description pipeline_node_template
|
||||
* @date 2022-09-16
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@TableName("pip_task_template")
|
||||
public class PipTaskTemplate extends BaseDO {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 唯一标示做关联
|
||||
*/
|
||||
private String parentId;
|
||||
|
||||
/**
|
||||
* name
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* 标签
|
||||
*/
|
||||
private String label;
|
||||
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
private String nodDescription;
|
||||
|
||||
/**
|
||||
* 图标
|
||||
*/
|
||||
private String icon;
|
||||
/**
|
||||
* 是否有执行结果数据
|
||||
*/
|
||||
private int view;
|
||||
|
||||
/**
|
||||
* 节点类型：目录-0or 节点-1
|
||||
*/
|
||||
private Integer type;
|
||||
|
||||
public PipTaskTemplate() {
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,25 @@
|
||||
package cd.casic.ci.process.process.service.taskTemplate;
|
||||
|
||||
import cd.casic.ci.common.pipeline.resp.taskTemplate.TaskTemplateResp;
|
||||
import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 流水线节点类型服务
|
||||
*
|
||||
* @author cww
|
||||
* @date 2022/6/17
|
||||
*/
|
||||
public interface TaskTemplateService extends IService<PipTaskTemplate> {
|
||||
// void add(PipelineNodeTemplateParam pipelineNodeTemplateRequest);
|
||||
//
|
||||
// void update(PipelineNodeTemplateParam pipelineNodeTemplateRequest);
|
||||
|
||||
void delete(Long[] ids);
|
||||
|
||||
List<TaskTemplateResp> getList();
|
||||
|
||||
// PageResult<PipelineNodeTemplate> page(PipelineNodeTemplateParam request);
|
||||
}
|
||||
@ -0,0 +1,127 @@
|
||||
package cd.casic.ci.process.process.service.taskTemplate.impl;
|
||||
|
||||
import cd.casic.ci.common.pipeline.resp.taskTemplate.TaskTemplateResp;
|
||||
import cd.casic.ci.process.process.dal.pipeline.PipTaskTemplateDao;
|
||||
import cd.casic.ci.process.process.dataObject.node.PipTaskTemplate;
|
||||
import cd.casic.ci.process.process.service.taskTemplate.TaskTemplateService;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class TaskTemplateServiceImpl extends ServiceImpl<PipTaskTemplateDao, PipTaskTemplate> implements TaskTemplateService {
|
||||
|
||||
|
||||
/**
|
||||
* 新建模板
|
||||
* @param pipelineNodeTemplateRequest 模板信息
|
||||
*/
|
||||
// @Override
|
||||
// public void add(PipelineNodeTemplateParam pipelineNodeTemplateRequest) {
|
||||
// PipelineNodeTemplate pipelineNodeTemplateDTO = new PipelineNodeTemplate();
|
||||
// BeanUtil.copyProperties(pipelineNodeTemplateRequest, pipelineNodeTemplateDTO);
|
||||
// pipelineNodeTemplateDTO.init();
|
||||
// this.save(pipelineNodeTemplateDTO);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * 编辑模板
|
||||
// * @param pipelineNodeTemplateRequest 模板信息
|
||||
// */
|
||||
// @Override
|
||||
// public void update(PipelineNodeTemplateParam pipelineNodeTemplateRequest) {
|
||||
// PipelineNodeTemplate pipelineNodeTemplateDTO = new PipelineNodeTemplate();
|
||||
// BeanUtil.copyProperties(pipelineNodeTemplateRequest, pipelineNodeTemplateDTO);
|
||||
// this.updateById(pipelineNodeTemplateDTO);
|
||||
// }
|
||||
|
||||
/**
|
||||
* 删除模板
|
||||
* @param ids 模板ID集合
|
||||
*/
|
||||
@Override
|
||||
public void delete(Long[] ids) {
|
||||
/*
|
||||
* 逻辑删除，0为已删，1为未删,由mybatis-plus配置处理，这里直接调用remove删除
|
||||
*/
|
||||
for (Long id : ids) {
|
||||
PipTaskTemplate pipelineNodeTemplateDO = this.getById(id);
|
||||
if (pipelineNodeTemplateDO != null) {
|
||||
this.removeById(id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取模板列表
|
||||
* @return 列表
|
||||
*/
|
||||
@Override
|
||||
public List<TaskTemplateResp> getList() {
|
||||
LambdaQueryWrapper<PipTaskTemplate> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.eq(PipTaskTemplate::getDeleted,"0");
|
||||
List<PipTaskTemplate> pipelineNodeTemplateDOList = this.list(wrapper);
|
||||
// int size = pipelineNodeTemplateDOList.size();
|
||||
|
||||
/**
|
||||
* 构建递归树
|
||||
*/
|
||||
List<TaskTemplateResp> rootNode = getRootNode(pipelineNodeTemplateDOList);
|
||||
rootNode.forEach(v -> setChildren(v, pipelineNodeTemplateDOList));
|
||||
return rootNode;
|
||||
}
|
||||
|
||||
// /**
|
||||
// * 模板分页查询
|
||||
// * @param request 请求数据
|
||||
// * @return 分页
|
||||
// */
|
||||
// @Override
|
||||
// public PageResult<PipelineNodeTemplate> page(PipelineNodeTemplateParam request) {
|
||||
// QueryWrapper<PipelineNodeTemplate> qw = new QueryWrapper<>();
|
||||
// qw.lambda().orderByDesc(PipelineNodeTemplate::getCreateTime);
|
||||
// /*
|
||||
// * 获取一个Page数据，并保存返回
|
||||
// */
|
||||
// return new PageResult<>(this.page(PageFactory.defaultPage(request.getPageNo(), request.getPageSize()), qw));
|
||||
// }
|
||||
|
||||
/**
|
||||
* 获取根节点
|
||||
* @param pipelineNodeDTOList 节点集合
|
||||
* @return 根节点
|
||||
*/
|
||||
private List<TaskTemplateResp> getRootNode(List<PipTaskTemplate> pipelineNodeDTOList) {
|
||||
List<TaskTemplateResp> ret = new ArrayList<>();
|
||||
for (PipTaskTemplate node : pipelineNodeDTOList) {
|
||||
if (node.getType() == 0) {
|
||||
TaskTemplateResp nodeParam = new TaskTemplateResp();
|
||||
BeanUtil.copyProperties(node, nodeParam);
|
||||
ret.add(nodeParam);
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* 设置叶子节点
|
||||
* @param node 上级节点
|
||||
* @param pipelineNodeDTOList 节点列表
|
||||
*/
|
||||
private void setChildren(TaskTemplateResp node, List<PipTaskTemplate> pipelineNodeDTOList) {
|
||||
List<TaskTemplateResp> childList = new ArrayList<>();
|
||||
pipelineNodeDTOList.forEach(v -> {
|
||||
if (node.getId().equals(v.getParentId())) {
|
||||
TaskTemplateResp nodeParam = new TaskTemplateResp();
|
||||
BeanUtil.copyProperties(v, nodeParam);
|
||||
childList.add(nodeParam);
|
||||
}
|
||||
});
|
||||
node.setChildren(childList);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,21 @@
|
||||
package cd.casic.server.controller;
|
||||
|
||||
import cd.casic.ci.common.pipeline.resp.taskTemplate.TaskTemplateResp;
|
||||
import cd.casic.ci.process.process.service.taskTemplate.TaskTemplateService;
|
||||
import cd.casic.framework.commons.pojo.CommonResult;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/taskTemplate")
|
||||
public class TaskTemplateController {
|
||||
@Resource
|
||||
private TaskTemplateService nodeTemplateService;
|
||||
@PostMapping("/list")
|
||||
public CommonResult<List<TaskTemplateResp>> list(){
|
||||
List<TaskTemplateResp> list = nodeTemplateService.getList();
|
||||
return CommonResult.success(list);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user