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

联调问题修改

Browse Source
This commit is contained in:
even 2025-05-21 14:46:01 +08:00
parent cc83240309
commit 247e65761e
8 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/task/TaskCreateReq.java
View File

@ -2,6 +2,9 @@ package cd.casic.ci.common.pipeline.req.task;
import lombok.Data;
import org.json.JSONObject;
import java.util.Map;
@Data
public class TaskCreateReq {
// 第二级stageId，如果没有值则新建第二级stage
@ -10,5 +13,5 @@ public class TaskCreateReq {
private String pipelineId;
private String taskType;
private Integer taskSort;
private JSONObject taskProperties;
private Map<String,Object> taskProperties;
}

4
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/task/TaskUpdateReq.java
View File

@ -3,11 +3,13 @@ package cd.casic.ci.common.pipeline.req.task;
import lombok.Data;
import org.json.JSONObject;
import java.util.Map;
@Data
public class TaskUpdateReq {
// 第二级stageId，如果没有值则新建第二级stage
private String id;
private String taskName;
private String taskType;
private JSONObject taskProperties;
private Map<String,Object> taskProperties;
}

3
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/req/task/TasksReq.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Map;
@Data
public class TasksReq {
@ -23,7 +24,7 @@ public class TasksReq {
private String taskName;
//@ApiProperty(name="values",desc="任务")
private JSONObject taskProperties;
private Map<String,Object> taskProperties;
//@ApiProperty(name="pipeline",desc="流水线id",eg="@selectOne")
private String pipelineId;

3
modules/module-ci-common-pipeline/src/main/java/cd/casic/ci/common/pipeline/resp/task/TasksResp.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.Map;
@Data
public class TasksResp {
@ -23,7 +24,7 @@ public class TasksResp {
private String taskName;
//@ApiProperty(name="values",desc="任务")
private JSONObject taskProperties;
private Map<String,Object> taskProperties;
//@ApiProperty(name="pipeline",desc="流水线id",eg="@selectOne")
private String pipelineId;

12
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/dataObject/task/PipTask.java
View File

@ -1,14 +1,20 @@
package cd.casic.ci.process.process.dataObject.task;
import cd.casic.ci.process.process.dataObject.base.PipBaseElement;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.Fastjson2TypeHandler;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.json.JSONObject;
import org.apache.ibatis.type.JdbcType;
import java.util.Map;
@EqualsAndHashCode(callSuper = true)
@Data
@TableName(autoResultMap = true)
public class PipTask extends PipBaseElement {
//@ApiProperty(name="taskType",desc= "类型1-10:源码,10-20:测试,20-30:构建,30-40:部署,40-50:代码扫描,50-60:推送制品")
@ -29,8 +35,8 @@ public class PipTask extends PipBaseElement {
//@ApiProperty(name="stageId",desc="阶段",eg="@selectOne")
private String stageId;
// task节点配置
@TableField(typeHandler = JacksonTypeHandler.class)
private JSONObject taskProperties;
@TableField(typeHandler = JacksonTypeHandler.class,jdbcType = JdbcType.VARCHAR)
private Map<String,Object> taskProperties;
// 执行实例id
@TableField(exist = false)

4
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/stage/impl/StageServiceImpl.java
View File

@ -15,11 +15,11 @@ import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.util.object.BeanUtils;
import cd.casic.framework.commons.util.util.WebFrameworkUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@ -42,7 +42,7 @@ public class StageServiceImpl extends ServiceImpl<PipStageDao, PipStage> impleme
TaskCreateReq task = stageReq.getTask();
String taskName = task.getTaskName();
String secondStageId = task.getStageId();
JSONObject taskProperties = task.getTaskProperties();
Map<String,Object> taskProperties = task.getTaskProperties();
String taskType = task.getTaskType();
Integer taskSort = task.getTaskSort();
String pipelineId = task.getPipelineId();

21
modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/task/impl/TaskServiceImpl.java
View File

@ -9,13 +9,16 @@ import cd.casic.ci.process.process.dataObject.task.PipTask;
import cd.casic.ci.process.process.service.stage.StageService;
import cd.casic.ci.process.process.service.task.TaskService;
import cd.casic.framework.commons.exception.ServiceException;
import cd.casic.framework.commons.exception.enums.GlobalErrorCodeConstants;
import cd.casic.framework.commons.util.util.WebFrameworkUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.ApplicationContext;
@ -28,11 +31,7 @@ import org.springframework.util.CollectionUtils;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.*;
@Service
@ -65,7 +64,7 @@ public class TaskServiceImpl extends ServiceImpl<PipTaskDao, PipTask> implements
PipTask pipTask = new PipTask();
pipTask.setId(taskId);
List<PipTask> taskList = getTask(pipTask);
if (!CollectionUtils.isEmpty(taskList)) {
if (CollectionUtils.isEmpty(taskList)) {
return null;
}
TasksResp tasksResp = new TasksResp();
@ -106,9 +105,15 @@ public class TaskServiceImpl extends ServiceImpl<PipTaskDao, PipTask> implements
@Override
public Boolean updateTask(TaskUpdateReq req) {
if (StringUtils.isEmpty(req.getId())) {
throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"传入id有问题");
}
PipTask byId = getById(req.getId());
if (byId == null) {
throw new ServiceException(GlobalErrorCodeConstants.PIPELINE_ERROR.getCode(),"task不存在");
}
String taskName = req.getTaskName();
JSONObject taskProperties = req.getTaskProperties();
Map<String, Object> taskProperties = req.getTaskProperties();
String taskType = req.getTaskType();
byId.setTaskProperties(taskProperties);
byId.setTaskType(taskType);

2
ops-server/src/main/java/cd/casic/server/controller/StageController.java
View File

@ -36,7 +36,7 @@ public class StageController {
* @pi.param: model=stage
*/
@RequestMapping(path="/createStage",method = RequestMethod.POST)
public CommonResult<String> createStagesOrTask(@RequestBody @Valid @NotNull StageCreateReq stage){
public CommonResult<String> createStagesOrTask(@RequestBody StageCreateReq stage){
String taskId = stageService.createStagesOrTask(stage);
return CommonResult.success(taskId);
}