test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(测试计划): 初始化规划节点

This commit is contained in:
song-cc-rock 2024-06-05 20:20:03 +08:00 committed by Craftsman
parent 8406e85963
commit 61582fa37c
25 changed files with 971 additions and 2382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanAllocation.java
View File

@ -1,132 +0,0 @@
package io.metersphere.plan.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@Data
public class TestPlanAllocation implements Serializable {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation.id.not_blank}", groups = {Updated.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation.id.length_range}", groups = {Created.class, Updated.class})
private String id;
@Schema(description = "测试计划ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation.id.not_blank}", groups = {Updated.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation.test_plan_id.length_range}", groups = {Created.class, Updated.class})
private String testPlanId;
@Schema(description = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation.test_resource_pool_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation.test_resource_pool_id.length_range}", groups = {Created.class, Updated.class})
private String testResourcePoolId;
@Schema(description = "是否失败重试", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_allocation.retry_on_fail.not_blank}", groups = {Created.class})
private Boolean retryOnFail;
@Schema(description = "失败重试类型(步骤/场景)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation.retry_type.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation.retry_type.length_range}", groups = {Created.class, Updated.class})
private String retryType;
@Schema(description = "失败重试次数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_allocation.retry_times.not_blank}", groups = {Created.class})
private Integer retryTimes;
@Schema(description = "失败重试间隔(单位: ms)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_allocation.retry_interval.not_blank}", groups = {Created.class})
private Integer retryInterval;
@Schema(description = "是否失败停止", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_allocation.stop_on_fail.not_blank}", groups = {Created.class})
private Boolean stopOnFail;
private static final long serialVersionUID = 1L;
public enum Column {
id("id", "id", "VARCHAR", false),
testPlanId("test_plan_id", "testPlanId", "VARCHAR", false),
testResourcePoolId("test_resource_pool_id", "testResourcePoolId", "VARCHAR", false),
retryOnFail("retry_on_fail", "retryOnFail", "BIT", false),
retryType("retry_type", "retryType", "VARCHAR", false),
retryTimes("retry_times", "retryTimes", "INTEGER", false),
retryInterval("retry_interval", "retryInterval", "INTEGER", false),
stopOnFail("stop_on_fail", "stopOnFail", "BIT", false);
private static final String BEGINNING_DELIMITER = "`";
private static final String ENDING_DELIMITER = "`";
private final String column;
private final boolean isColumnNameDelimited;
private final String javaProperty;
private final String jdbcType;
public String value() {
return this.column;
}
public String getValue() {
return this.column;
}
public String getJavaProperty() {
return this.javaProperty;
}
public String getJdbcType() {
return this.jdbcType;
}
Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
this.column = column;
this.javaProperty = javaProperty;
this.jdbcType = jdbcType;
this.isColumnNameDelimited = isColumnNameDelimited;
}
public String desc() {
return this.getEscapedColumnName() + " DESC";
}
public String asc() {
return this.getEscapedColumnName() + " ASC";
}
public static Column[] excludes(Column ... excludes) {
ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
if (excludes != null && excludes.length > 0) {
columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
}
return columns.toArray(new Column[]{});
}
public static Column[] all() {
return Column.values();
}
public String getEscapedColumnName() {
if (this.isColumnNameDelimited) {
return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
} else {
return this.column;
}
}
public String getAliasedEscapedColumnName() {
return this.getEscapedColumnName();
}
}
}

720
backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanAllocationExample.java
View File

@ -1,720 +0,0 @@
package io.metersphere.plan.domain;
import java.util.ArrayList;
import java.util.List;
public class TestPlanAllocationExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public TestPlanAllocationExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(String value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(String value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(String value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(String value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(String value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(String value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdLike(String value) {
addCriterion("id like", value, "id");
return (Criteria) this;
}
public Criteria andIdNotLike(String value) {
addCriterion("id not like", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<String> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<String> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(String value1, String value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(String value1, String value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andTestPlanIdIsNull() {
addCriterion("test_plan_id is null");
return (Criteria) this;
}
public Criteria andTestPlanIdIsNotNull() {
addCriterion("test_plan_id is not null");
return (Criteria) this;
}
public Criteria andTestPlanIdEqualTo(String value) {
addCriterion("test_plan_id =", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotEqualTo(String value) {
addCriterion("test_plan_id <>", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdGreaterThan(String value) {
addCriterion("test_plan_id >", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdGreaterThanOrEqualTo(String value) {
addCriterion("test_plan_id >=", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdLessThan(String value) {
addCriterion("test_plan_id <", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdLessThanOrEqualTo(String value) {
addCriterion("test_plan_id <=", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdLike(String value) {
addCriterion("test_plan_id like", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotLike(String value) {
addCriterion("test_plan_id not like", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdIn(List<String> values) {
addCriterion("test_plan_id in", values, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotIn(List<String> values) {
addCriterion("test_plan_id not in", values, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdBetween(String value1, String value2) {
addCriterion("test_plan_id between", value1, value2, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotBetween(String value1, String value2) {
addCriterion("test_plan_id not between", value1, value2, "testPlanId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdIsNull() {
addCriterion("test_resource_pool_id is null");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdIsNotNull() {
addCriterion("test_resource_pool_id is not null");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdEqualTo(String value) {
addCriterion("test_resource_pool_id =", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdNotEqualTo(String value) {
addCriterion("test_resource_pool_id <>", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdGreaterThan(String value) {
addCriterion("test_resource_pool_id >", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdGreaterThanOrEqualTo(String value) {
addCriterion("test_resource_pool_id >=", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdLessThan(String value) {
addCriterion("test_resource_pool_id <", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdLessThanOrEqualTo(String value) {
addCriterion("test_resource_pool_id <=", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdLike(String value) {
addCriterion("test_resource_pool_id like", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdNotLike(String value) {
addCriterion("test_resource_pool_id not like", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdIn(List<String> values) {
addCriterion("test_resource_pool_id in", values, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdNotIn(List<String> values) {
addCriterion("test_resource_pool_id not in", values, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdBetween(String value1, String value2) {
addCriterion("test_resource_pool_id between", value1, value2, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdNotBetween(String value1, String value2) {
addCriterion("test_resource_pool_id not between", value1, value2, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andRetryOnFailIsNull() {
addCriterion("retry_on_fail is null");
return (Criteria) this;
}
public Criteria andRetryOnFailIsNotNull() {
addCriterion("retry_on_fail is not null");
return (Criteria) this;
}
public Criteria andRetryOnFailEqualTo(Boolean value) {
addCriterion("retry_on_fail =", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailNotEqualTo(Boolean value) {
addCriterion("retry_on_fail <>", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailGreaterThan(Boolean value) {
addCriterion("retry_on_fail >", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailGreaterThanOrEqualTo(Boolean value) {
addCriterion("retry_on_fail >=", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailLessThan(Boolean value) {
addCriterion("retry_on_fail <", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailLessThanOrEqualTo(Boolean value) {
addCriterion("retry_on_fail <=", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailIn(List<Boolean> values) {
addCriterion("retry_on_fail in", values, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailNotIn(List<Boolean> values) {
addCriterion("retry_on_fail not in", values, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailBetween(Boolean value1, Boolean value2) {
addCriterion("retry_on_fail between", value1, value2, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailNotBetween(Boolean value1, Boolean value2) {
addCriterion("retry_on_fail not between", value1, value2, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryTypeIsNull() {
addCriterion("retry_type is null");
return (Criteria) this;
}
public Criteria andRetryTypeIsNotNull() {
addCriterion("retry_type is not null");
return (Criteria) this;
}
public Criteria andRetryTypeEqualTo(String value) {
addCriterion("retry_type =", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotEqualTo(String value) {
addCriterion("retry_type <>", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeGreaterThan(String value) {
addCriterion("retry_type >", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeGreaterThanOrEqualTo(String value) {
addCriterion("retry_type >=", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeLessThan(String value) {
addCriterion("retry_type <", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeLessThanOrEqualTo(String value) {
addCriterion("retry_type <=", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeLike(String value) {
addCriterion("retry_type like", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotLike(String value) {
addCriterion("retry_type not like", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeIn(List<String> values) {
addCriterion("retry_type in", values, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotIn(List<String> values) {
addCriterion("retry_type not in", values, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeBetween(String value1, String value2) {
addCriterion("retry_type between", value1, value2, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotBetween(String value1, String value2) {
addCriterion("retry_type not between", value1, value2, "retryType");
return (Criteria) this;
}
public Criteria andRetryTimesIsNull() {
addCriterion("retry_times is null");
return (Criteria) this;
}
public Criteria andRetryTimesIsNotNull() {
addCriterion("retry_times is not null");
return (Criteria) this;
}
public Criteria andRetryTimesEqualTo(Integer value) {
addCriterion("retry_times =", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesNotEqualTo(Integer value) {
addCriterion("retry_times <>", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesGreaterThan(Integer value) {
addCriterion("retry_times >", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesGreaterThanOrEqualTo(Integer value) {
addCriterion("retry_times >=", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesLessThan(Integer value) {
addCriterion("retry_times <", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesLessThanOrEqualTo(Integer value) {
addCriterion("retry_times <=", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesIn(List<Integer> values) {
addCriterion("retry_times in", values, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesNotIn(List<Integer> values) {
addCriterion("retry_times not in", values, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesBetween(Integer value1, Integer value2) {
addCriterion("retry_times between", value1, value2, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesNotBetween(Integer value1, Integer value2) {
addCriterion("retry_times not between", value1, value2, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryIntervalIsNull() {
addCriterion("retry_interval is null");
return (Criteria) this;
}
public Criteria andRetryIntervalIsNotNull() {
addCriterion("retry_interval is not null");
return (Criteria) this;
}
public Criteria andRetryIntervalEqualTo(Integer value) {
addCriterion("retry_interval =", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalNotEqualTo(Integer value) {
addCriterion("retry_interval <>", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalGreaterThan(Integer value) {
addCriterion("retry_interval >", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalGreaterThanOrEqualTo(Integer value) {
addCriterion("retry_interval >=", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalLessThan(Integer value) {
addCriterion("retry_interval <", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalLessThanOrEqualTo(Integer value) {
addCriterion("retry_interval <=", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalIn(List<Integer> values) {
addCriterion("retry_interval in", values, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalNotIn(List<Integer> values) {
addCriterion("retry_interval not in", values, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalBetween(Integer value1, Integer value2) {
addCriterion("retry_interval between", value1, value2, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalNotBetween(Integer value1, Integer value2) {
addCriterion("retry_interval not between", value1, value2, "retryInterval");
return (Criteria) this;
}
public Criteria andStopOnFailIsNull() {
addCriterion("stop_on_fail is null");
return (Criteria) this;
}
public Criteria andStopOnFailIsNotNull() {
addCriterion("stop_on_fail is not null");
return (Criteria) this;
}
public Criteria andStopOnFailEqualTo(Boolean value) {
addCriterion("stop_on_fail =", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailNotEqualTo(Boolean value) {
addCriterion("stop_on_fail <>", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailGreaterThan(Boolean value) {
addCriterion("stop_on_fail >", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailGreaterThanOrEqualTo(Boolean value) {
addCriterion("stop_on_fail >=", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailLessThan(Boolean value) {
addCriterion("stop_on_fail <", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailLessThanOrEqualTo(Boolean value) {
addCriterion("stop_on_fail <=", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailIn(List<Boolean> values) {
addCriterion("stop_on_fail in", values, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailNotIn(List<Boolean> values) {
addCriterion("stop_on_fail not in", values, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailBetween(Boolean value1, Boolean value2) {
addCriterion("stop_on_fail between", value1, value2, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailNotBetween(Boolean value1, Boolean value2) {
addCriterion("stop_on_fail not between", value1, value2, "stopOnFail");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

123
backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanAllocationType.java
View File

@ -1,123 +0,0 @@
package io.metersphere.plan.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
@Data
public class TestPlanAllocationType implements Serializable {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation_type.id.not_blank}", groups = {Updated.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation_type.id.length_range}", groups = {Created.class, Updated.class})
private String id;
@Schema(description = "测试计划ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation_type.test_plan_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation_type.test_plan_id.length_range}", groups = {Created.class, Updated.class})
private String testPlanId;
@Schema(description = "测试集类型名称", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation_type.name.not_blank}", groups = {Created.class})
@Size(min = 1, max = 255, message = "{test_plan_allocation_type.name.length_range}", groups = {Created.class, Updated.class})
private String name;
@Schema(description = "测试集类型(功能/接口/场景)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation_type.type.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation_type.type.length_range}", groups = {Created.class, Updated.class})
private String type;
@Schema(description = "执行方式(串行/并行)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_allocation_type.execute_method.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_allocation_type.execute_method.length_range}", groups = {Created.class, Updated.class})
private String executeMethod;
@Schema(description = "自定义排序，间隔为2的N次幂", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_allocation_type.pos.not_blank}", groups = {Created.class})
private Long pos;
private static final long serialVersionUID = 1L;
public enum Column {
id("id", "id", "VARCHAR", false),
testPlanId("test_plan_id", "testPlanId", "VARCHAR", false),
name("name", "name", "VARCHAR", true),
type("type", "type", "VARCHAR", true),
executeMethod("execute_method", "executeMethod", "VARCHAR", false),
pos("pos", "pos", "BIGINT", false);
private static final String BEGINNING_DELIMITER = "`";
private static final String ENDING_DELIMITER = "`";
private final String column;
private final boolean isColumnNameDelimited;
private final String javaProperty;
private final String jdbcType;
public String value() {
return this.column;
}
public String getValue() {
return this.column;
}
public String getJavaProperty() {
return this.javaProperty;
}
public String getJdbcType() {
return this.jdbcType;
}
Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
this.column = column;
this.javaProperty = javaProperty;
this.jdbcType = jdbcType;
this.isColumnNameDelimited = isColumnNameDelimited;
}
public String desc() {
return this.getEscapedColumnName() + " DESC";
}
public String asc() {
return this.getEscapedColumnName() + " ASC";
}
public static Column[] excludes(Column ... excludes) {
ArrayList<Column> columns = new ArrayList<>(Arrays.asList(Column.values()));
if (excludes != null && excludes.length > 0) {
columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
}
return columns.toArray(new Column[]{});
}
public static Column[] all() {
return Column.values();
}
public String getEscapedColumnName() {
if (this.isColumnNameDelimited) {
return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
} else {
return this.column;
}
}
public String getAliasedEscapedColumnName() {
return this.getEscapedColumnName();
}
}
}

610
backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanAllocationTypeExample.java
View File

@ -1,610 +0,0 @@
package io.metersphere.plan.domain;
import java.util.ArrayList;
import java.util.List;
public class TestPlanAllocationTypeExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public TestPlanAllocationTypeExample() {
oredCriteria = new ArrayList<Criteria>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(String value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(String value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(String value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(String value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(String value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(String value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdLike(String value) {
addCriterion("id like", value, "id");
return (Criteria) this;
}
public Criteria andIdNotLike(String value) {
addCriterion("id not like", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<String> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<String> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(String value1, String value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(String value1, String value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andTestPlanIdIsNull() {
addCriterion("test_plan_id is null");
return (Criteria) this;
}
public Criteria andTestPlanIdIsNotNull() {
addCriterion("test_plan_id is not null");
return (Criteria) this;
}
public Criteria andTestPlanIdEqualTo(String value) {
addCriterion("test_plan_id =", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotEqualTo(String value) {
addCriterion("test_plan_id <>", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdGreaterThan(String value) {
addCriterion("test_plan_id >", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdGreaterThanOrEqualTo(String value) {
addCriterion("test_plan_id >=", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdLessThan(String value) {
addCriterion("test_plan_id <", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdLessThanOrEqualTo(String value) {
addCriterion("test_plan_id <=", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdLike(String value) {
addCriterion("test_plan_id like", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotLike(String value) {
addCriterion("test_plan_id not like", value, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdIn(List<String> values) {
addCriterion("test_plan_id in", values, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotIn(List<String> values) {
addCriterion("test_plan_id not in", values, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdBetween(String value1, String value2) {
addCriterion("test_plan_id between", value1, value2, "testPlanId");
return (Criteria) this;
}
public Criteria andTestPlanIdNotBetween(String value1, String value2) {
addCriterion("test_plan_id not between", value1, value2, "testPlanId");
return (Criteria) this;
}
public Criteria andNameIsNull() {
addCriterion("`name` is null");
return (Criteria) this;
}
public Criteria andNameIsNotNull() {
addCriterion("`name` is not null");
return (Criteria) this;
}
public Criteria andNameEqualTo(String value) {
addCriterion("`name` =", value, "name");
return (Criteria) this;
}
public Criteria andNameNotEqualTo(String value) {
addCriterion("`name` <>", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThan(String value) {
addCriterion("`name` >", value, "name");
return (Criteria) this;
}
public Criteria andNameGreaterThanOrEqualTo(String value) {
addCriterion("`name` >=", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThan(String value) {
addCriterion("`name` <", value, "name");
return (Criteria) this;
}
public Criteria andNameLessThanOrEqualTo(String value) {
addCriterion("`name` <=", value, "name");
return (Criteria) this;
}
public Criteria andNameLike(String value) {
addCriterion("`name` like", value, "name");
return (Criteria) this;
}
public Criteria andNameNotLike(String value) {
addCriterion("`name` not like", value, "name");
return (Criteria) this;
}
public Criteria andNameIn(List<String> values) {
addCriterion("`name` in", values, "name");
return (Criteria) this;
}
public Criteria andNameNotIn(List<String> values) {
addCriterion("`name` not in", values, "name");
return (Criteria) this;
}
public Criteria andNameBetween(String value1, String value2) {
addCriterion("`name` between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andNameNotBetween(String value1, String value2) {
addCriterion("`name` not between", value1, value2, "name");
return (Criteria) this;
}
public Criteria andTypeIsNull() {
addCriterion("`type` is null");
return (Criteria) this;
}
public Criteria andTypeIsNotNull() {
addCriterion("`type` is not null");
return (Criteria) this;
}
public Criteria andTypeEqualTo(String value) {
addCriterion("`type` =", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotEqualTo(String value) {
addCriterion("`type` <>", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThan(String value) {
addCriterion("`type` >", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("`type` >=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThan(String value) {
addCriterion("`type` <", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("`type` <=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLike(String value) {
addCriterion("`type` like", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotLike(String value) {
addCriterion("`type` not like", value, "type");
return (Criteria) this;
}
public Criteria andTypeIn(List<String> values) {
addCriterion("`type` in", values, "type");
return (Criteria) this;
}
public Criteria andTypeNotIn(List<String> values) {
addCriterion("`type` not in", values, "type");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("`type` between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("`type` not between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andExecuteMethodIsNull() {
addCriterion("execute_method is null");
return (Criteria) this;
}
public Criteria andExecuteMethodIsNotNull() {
addCriterion("execute_method is not null");
return (Criteria) this;
}
public Criteria andExecuteMethodEqualTo(String value) {
addCriterion("execute_method =", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodNotEqualTo(String value) {
addCriterion("execute_method <>", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodGreaterThan(String value) {
addCriterion("execute_method >", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodGreaterThanOrEqualTo(String value) {
addCriterion("execute_method >=", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodLessThan(String value) {
addCriterion("execute_method <", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodLessThanOrEqualTo(String value) {
addCriterion("execute_method <=", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodLike(String value) {
addCriterion("execute_method like", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodNotLike(String value) {
addCriterion("execute_method not like", value, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodIn(List<String> values) {
addCriterion("execute_method in", values, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodNotIn(List<String> values) {
addCriterion("execute_method not in", values, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodBetween(String value1, String value2) {
addCriterion("execute_method between", value1, value2, "executeMethod");
return (Criteria) this;
}
public Criteria andExecuteMethodNotBetween(String value1, String value2) {
addCriterion("execute_method not between", value1, value2, "executeMethod");
return (Criteria) this;
}
public Criteria andPosIsNull() {
addCriterion("pos is null");
return (Criteria) this;
}
public Criteria andPosIsNotNull() {
addCriterion("pos is not null");
return (Criteria) this;
}
public Criteria andPosEqualTo(Long value) {
addCriterion("pos =", value, "pos");
return (Criteria) this;
}
public Criteria andPosNotEqualTo(Long value) {
addCriterion("pos <>", value, "pos");
return (Criteria) this;
}
public Criteria andPosGreaterThan(Long value) {
addCriterion("pos >", value, "pos");
return (Criteria) this;
}
public Criteria andPosGreaterThanOrEqualTo(Long value) {
addCriterion("pos >=", value, "pos");
return (Criteria) this;
}
public Criteria andPosLessThan(Long value) {
addCriterion("pos <", value, "pos");
return (Criteria) this;
}
public Criteria andPosLessThanOrEqualTo(Long value) {
addCriterion("pos <=", value, "pos");
return (Criteria) this;
}
public Criteria andPosIn(List<Long> values) {
addCriterion("pos in", values, "pos");
return (Criteria) this;
}
public Criteria andPosNotIn(List<Long> values) {
addCriterion("pos not in", values, "pos");
return (Criteria) this;
}
public Criteria andPosBetween(Long value1, Long value2) {
addCriterion("pos between", value1, value2, "pos");
return (Criteria) this;
}
public Criteria andPosNotBetween(Long value1, Long value2) {
addCriterion("pos not between", value1, value2, "pos");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}

63
backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanCollection.java
View File

@ -24,21 +24,30 @@ public class TestPlanCollection implements Serializable {
@Size(min = 1, max = 50, message = "{test_plan_collection.test_plan_id.length_range}", groups = {Created.class, Updated.class})
private String testPlanId;
@Schema(description = "所属测试集类型ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.test_collection_type_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_collection.test_collection_type_id.length_range}", groups = {Created.class, Updated.class})
private String testCollectionTypeId;
@Schema(description = "父级ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.parent_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_collection.parent_id.length_range}", groups = {Created.class, Updated.class})
private String parentId;
@Schema(description = "测试集名称", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.name.not_blank}", groups = {Created.class})
@Size(min = 1, max = 255, message = "{test_plan_collection.name.length_range}", groups = {Created.class, Updated.class})
private String name;
@Schema(description = "测试集类型(功能/接口/场景)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.type.not_blank}", groups = {Created.class})
@Size(min = 1, max = 255, message = "{test_plan_collection.type.length_range}", groups = {Created.class, Updated.class})
private String type;
@Schema(description = "执行方式(串行/并行)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.execute_method.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_collection.execute_method.length_range}", groups = {Created.class, Updated.class})
private String executeMethod;
@Schema(description = "是否继承", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.extended.not_blank}", groups = {Created.class})
private Boolean extended;
@Schema(description = "是否使用环境组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.grouped.not_blank}", groups = {Created.class})
private Boolean grouped;
@ -48,9 +57,31 @@ public class TestPlanCollection implements Serializable {
@Size(min = 1, max = 50, message = "{test_plan_collection.environment_id.length_range}", groups = {Created.class, Updated.class})
private String environmentId;
@Schema(description = "自定义排序，间隔为2的N次幂", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.pos.not_blank}", groups = {Created.class})
private Long pos;
@Schema(description = "测试资源池ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.test_resource_pool_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_collection.test_resource_pool_id.length_range}", groups = {Created.class, Updated.class})
private String testResourcePoolId;
@Schema(description = "是否失败重试", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.retry_on_fail.not_blank}", groups = {Created.class})
private Boolean retryOnFail;
@Schema(description = "失败重试类型(步骤/场景)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{test_plan_collection.retry_type.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{test_plan_collection.retry_type.length_range}", groups = {Created.class, Updated.class})
private String retryType;
@Schema(description = "失败重试次数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.retry_times.not_blank}", groups = {Created.class})
private Integer retryTimes;
@Schema(description = "失败重试间隔(单位: ms)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.retry_interval.not_blank}", groups = {Created.class})
private Integer retryInterval;
@Schema(description = "是否失败停止", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.stop_on_fail.not_blank}", groups = {Created.class})
private Boolean stopOnFail;
@Schema(description = "创建人")
private String createUser;
@ -58,19 +89,31 @@ public class TestPlanCollection implements Serializable {
@Schema(description = "创建时间")
private Long createTime;
@Schema(description = "自定义排序，间隔为4096", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{test_plan_collection.pos.not_blank}", groups = {Created.class})
private Long pos;
private static final long serialVersionUID = 1L;
public enum Column {
id("id", "id", "VARCHAR", false),
testPlanId("test_plan_id", "testPlanId", "VARCHAR", false),
testCollectionTypeId("test_collection_type_id", "testCollectionTypeId", "VARCHAR", false),
parentId("parent_id", "parentId", "VARCHAR", false),
name("name", "name", "VARCHAR", true),
type("type", "type", "VARCHAR", true),
executeMethod("execute_method", "executeMethod", "VARCHAR", false),
extended("extended", "extended", "BIT", false),
grouped("grouped", "grouped", "BIT", false),
environmentId("environment_id", "environmentId", "VARCHAR", false),
pos("pos", "pos", "BIGINT", false),
testResourcePoolId("test_resource_pool_id", "testResourcePoolId", "VARCHAR", false),
retryOnFail("retry_on_fail", "retryOnFail", "BIT", false),
retryType("retry_type", "retryType", "VARCHAR", false),
retryTimes("retry_times", "retryTimes", "INTEGER", false),
retryInterval("retry_interval", "retryInterval", "INTEGER", false),
stopOnFail("stop_on_fail", "stopOnFail", "BIT", false),
createUser("create_user", "createUser", "VARCHAR", false),
createTime("create_time", "createTime", "BIGINT", false);
createTime("create_time", "createTime", "BIGINT", false),
pos("pos", "pos", "BIGINT", false);
private static final String BEGINNING_DELIMITER = "`";

614
backend/framework/domain/src/main/java/io/metersphere/plan/domain/TestPlanCollectionExample.java
View File

@ -244,73 +244,73 @@ public class TestPlanCollectionExample {
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdIsNull() {
addCriterion("test_collection_type_id is null");
public Criteria andParentIdIsNull() {
addCriterion("parent_id is null");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdIsNotNull() {
addCriterion("test_collection_type_id is not null");
public Criteria andParentIdIsNotNull() {
addCriterion("parent_id is not null");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdEqualTo(String value) {
addCriterion("test_collection_type_id =", value, "testCollectionTypeId");
public Criteria andParentIdEqualTo(String value) {
addCriterion("parent_id =", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdNotEqualTo(String value) {
addCriterion("test_collection_type_id <>", value, "testCollectionTypeId");
public Criteria andParentIdNotEqualTo(String value) {
addCriterion("parent_id <>", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdGreaterThan(String value) {
addCriterion("test_collection_type_id >", value, "testCollectionTypeId");
public Criteria andParentIdGreaterThan(String value) {
addCriterion("parent_id >", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdGreaterThanOrEqualTo(String value) {
addCriterion("test_collection_type_id >=", value, "testCollectionTypeId");
public Criteria andParentIdGreaterThanOrEqualTo(String value) {
addCriterion("parent_id >=", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdLessThan(String value) {
addCriterion("test_collection_type_id <", value, "testCollectionTypeId");
public Criteria andParentIdLessThan(String value) {
addCriterion("parent_id <", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdLessThanOrEqualTo(String value) {
addCriterion("test_collection_type_id <=", value, "testCollectionTypeId");
public Criteria andParentIdLessThanOrEqualTo(String value) {
addCriterion("parent_id <=", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdLike(String value) {
addCriterion("test_collection_type_id like", value, "testCollectionTypeId");
public Criteria andParentIdLike(String value) {
addCriterion("parent_id like", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdNotLike(String value) {
addCriterion("test_collection_type_id not like", value, "testCollectionTypeId");
public Criteria andParentIdNotLike(String value) {
addCriterion("parent_id not like", value, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdIn(List<String> values) {
addCriterion("test_collection_type_id in", values, "testCollectionTypeId");
public Criteria andParentIdIn(List<String> values) {
addCriterion("parent_id in", values, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdNotIn(List<String> values) {
addCriterion("test_collection_type_id not in", values, "testCollectionTypeId");
public Criteria andParentIdNotIn(List<String> values) {
addCriterion("parent_id not in", values, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdBetween(String value1, String value2) {
addCriterion("test_collection_type_id between", value1, value2, "testCollectionTypeId");
public Criteria andParentIdBetween(String value1, String value2) {
addCriterion("parent_id between", value1, value2, "parentId");
return (Criteria) this;
}
public Criteria andTestCollectionTypeIdNotBetween(String value1, String value2) {
addCriterion("test_collection_type_id not between", value1, value2, "testCollectionTypeId");
public Criteria andParentIdNotBetween(String value1, String value2) {
addCriterion("parent_id not between", value1, value2, "parentId");
return (Criteria) this;
}
@ -384,6 +384,76 @@ public class TestPlanCollectionExample {
return (Criteria) this;
}
public Criteria andTypeIsNull() {
addCriterion("`type` is null");
return (Criteria) this;
}
public Criteria andTypeIsNotNull() {
addCriterion("`type` is not null");
return (Criteria) this;
}
public Criteria andTypeEqualTo(String value) {
addCriterion("`type` =", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotEqualTo(String value) {
addCriterion("`type` <>", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThan(String value) {
addCriterion("`type` >", value, "type");
return (Criteria) this;
}
public Criteria andTypeGreaterThanOrEqualTo(String value) {
addCriterion("`type` >=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThan(String value) {
addCriterion("`type` <", value, "type");
return (Criteria) this;
}
public Criteria andTypeLessThanOrEqualTo(String value) {
addCriterion("`type` <=", value, "type");
return (Criteria) this;
}
public Criteria andTypeLike(String value) {
addCriterion("`type` like", value, "type");
return (Criteria) this;
}
public Criteria andTypeNotLike(String value) {
addCriterion("`type` not like", value, "type");
return (Criteria) this;
}
public Criteria andTypeIn(List<String> values) {
addCriterion("`type` in", values, "type");
return (Criteria) this;
}
public Criteria andTypeNotIn(List<String> values) {
addCriterion("`type` not in", values, "type");
return (Criteria) this;
}
public Criteria andTypeBetween(String value1, String value2) {
addCriterion("`type` between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andTypeNotBetween(String value1, String value2) {
addCriterion("`type` not between", value1, value2, "type");
return (Criteria) this;
}
public Criteria andExecuteMethodIsNull() {
addCriterion("execute_method is null");
return (Criteria) this;
@ -454,6 +524,66 @@ public class TestPlanCollectionExample {
return (Criteria) this;
}
public Criteria andExtendedIsNull() {
addCriterion("extended is null");
return (Criteria) this;
}
public Criteria andExtendedIsNotNull() {
addCriterion("extended is not null");
return (Criteria) this;
}
public Criteria andExtendedEqualTo(Boolean value) {
addCriterion("extended =", value, "extended");
return (Criteria) this;
}
public Criteria andExtendedNotEqualTo(Boolean value) {
addCriterion("extended <>", value, "extended");
return (Criteria) this;
}
public Criteria andExtendedGreaterThan(Boolean value) {
addCriterion("extended >", value, "extended");
return (Criteria) this;
}
public Criteria andExtendedGreaterThanOrEqualTo(Boolean value) {
addCriterion("extended >=", value, "extended");
return (Criteria) this;
}
public Criteria andExtendedLessThan(Boolean value) {
addCriterion("extended <", value, "extended");
return (Criteria) this;
}
public Criteria andExtendedLessThanOrEqualTo(Boolean value) {
addCriterion("extended <=", value, "extended");
return (Criteria) this;
}
public Criteria andExtendedIn(List<Boolean> values) {
addCriterion("extended in", values, "extended");
return (Criteria) this;
}
public Criteria andExtendedNotIn(List<Boolean> values) {
addCriterion("extended not in", values, "extended");
return (Criteria) this;
}
public Criteria andExtendedBetween(Boolean value1, Boolean value2) {
addCriterion("extended between", value1, value2, "extended");
return (Criteria) this;
}
public Criteria andExtendedNotBetween(Boolean value1, Boolean value2) {
addCriterion("extended not between", value1, value2, "extended");
return (Criteria) this;
}
public Criteria andGroupedIsNull() {
addCriterion("grouped is null");
return (Criteria) this;
@ -584,63 +714,383 @@ public class TestPlanCollectionExample {
return (Criteria) this;
}
public Criteria andPosIsNull() {
addCriterion("pos is null");
public Criteria andTestResourcePoolIdIsNull() {
addCriterion("test_resource_pool_id is null");
return (Criteria) this;
}
public Criteria andPosIsNotNull() {
addCriterion("pos is not null");
public Criteria andTestResourcePoolIdIsNotNull() {
addCriterion("test_resource_pool_id is not null");
return (Criteria) this;
}
public Criteria andPosEqualTo(Long value) {
addCriterion("pos =", value, "pos");
public Criteria andTestResourcePoolIdEqualTo(String value) {
addCriterion("test_resource_pool_id =", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosNotEqualTo(Long value) {
addCriterion("pos <>", value, "pos");
public Criteria andTestResourcePoolIdNotEqualTo(String value) {
addCriterion("test_resource_pool_id <>", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosGreaterThan(Long value) {
addCriterion("pos >", value, "pos");
public Criteria andTestResourcePoolIdGreaterThan(String value) {
addCriterion("test_resource_pool_id >", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosGreaterThanOrEqualTo(Long value) {
addCriterion("pos >=", value, "pos");
public Criteria andTestResourcePoolIdGreaterThanOrEqualTo(String value) {
addCriterion("test_resource_pool_id >=", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosLessThan(Long value) {
addCriterion("pos <", value, "pos");
public Criteria andTestResourcePoolIdLessThan(String value) {
addCriterion("test_resource_pool_id <", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosLessThanOrEqualTo(Long value) {
addCriterion("pos <=", value, "pos");
public Criteria andTestResourcePoolIdLessThanOrEqualTo(String value) {
addCriterion("test_resource_pool_id <=", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosIn(List<Long> values) {
addCriterion("pos in", values, "pos");
public Criteria andTestResourcePoolIdLike(String value) {
addCriterion("test_resource_pool_id like", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosNotIn(List<Long> values) {
addCriterion("pos not in", values, "pos");
public Criteria andTestResourcePoolIdNotLike(String value) {
addCriterion("test_resource_pool_id not like", value, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosBetween(Long value1, Long value2) {
addCriterion("pos between", value1, value2, "pos");
public Criteria andTestResourcePoolIdIn(List<String> values) {
addCriterion("test_resource_pool_id in", values, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andPosNotBetween(Long value1, Long value2) {
addCriterion("pos not between", value1, value2, "pos");
public Criteria andTestResourcePoolIdNotIn(List<String> values) {
addCriterion("test_resource_pool_id not in", values, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdBetween(String value1, String value2) {
addCriterion("test_resource_pool_id between", value1, value2, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andTestResourcePoolIdNotBetween(String value1, String value2) {
addCriterion("test_resource_pool_id not between", value1, value2, "testResourcePoolId");
return (Criteria) this;
}
public Criteria andRetryOnFailIsNull() {
addCriterion("retry_on_fail is null");
return (Criteria) this;
}
public Criteria andRetryOnFailIsNotNull() {
addCriterion("retry_on_fail is not null");
return (Criteria) this;
}
public Criteria andRetryOnFailEqualTo(Boolean value) {
addCriterion("retry_on_fail =", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailNotEqualTo(Boolean value) {
addCriterion("retry_on_fail <>", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailGreaterThan(Boolean value) {
addCriterion("retry_on_fail >", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailGreaterThanOrEqualTo(Boolean value) {
addCriterion("retry_on_fail >=", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailLessThan(Boolean value) {
addCriterion("retry_on_fail <", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailLessThanOrEqualTo(Boolean value) {
addCriterion("retry_on_fail <=", value, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailIn(List<Boolean> values) {
addCriterion("retry_on_fail in", values, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailNotIn(List<Boolean> values) {
addCriterion("retry_on_fail not in", values, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailBetween(Boolean value1, Boolean value2) {
addCriterion("retry_on_fail between", value1, value2, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryOnFailNotBetween(Boolean value1, Boolean value2) {
addCriterion("retry_on_fail not between", value1, value2, "retryOnFail");
return (Criteria) this;
}
public Criteria andRetryTypeIsNull() {
addCriterion("retry_type is null");
return (Criteria) this;
}
public Criteria andRetryTypeIsNotNull() {
addCriterion("retry_type is not null");
return (Criteria) this;
}
public Criteria andRetryTypeEqualTo(String value) {
addCriterion("retry_type =", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotEqualTo(String value) {
addCriterion("retry_type <>", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeGreaterThan(String value) {
addCriterion("retry_type >", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeGreaterThanOrEqualTo(String value) {
addCriterion("retry_type >=", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeLessThan(String value) {
addCriterion("retry_type <", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeLessThanOrEqualTo(String value) {
addCriterion("retry_type <=", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeLike(String value) {
addCriterion("retry_type like", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotLike(String value) {
addCriterion("retry_type not like", value, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeIn(List<String> values) {
addCriterion("retry_type in", values, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotIn(List<String> values) {
addCriterion("retry_type not in", values, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeBetween(String value1, String value2) {
addCriterion("retry_type between", value1, value2, "retryType");
return (Criteria) this;
}
public Criteria andRetryTypeNotBetween(String value1, String value2) {
addCriterion("retry_type not between", value1, value2, "retryType");
return (Criteria) this;
}
public Criteria andRetryTimesIsNull() {
addCriterion("retry_times is null");
return (Criteria) this;
}
public Criteria andRetryTimesIsNotNull() {
addCriterion("retry_times is not null");
return (Criteria) this;
}
public Criteria andRetryTimesEqualTo(Integer value) {
addCriterion("retry_times =", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesNotEqualTo(Integer value) {
addCriterion("retry_times <>", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesGreaterThan(Integer value) {
addCriterion("retry_times >", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesGreaterThanOrEqualTo(Integer value) {
addCriterion("retry_times >=", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesLessThan(Integer value) {
addCriterion("retry_times <", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesLessThanOrEqualTo(Integer value) {
addCriterion("retry_times <=", value, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesIn(List<Integer> values) {
addCriterion("retry_times in", values, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesNotIn(List<Integer> values) {
addCriterion("retry_times not in", values, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesBetween(Integer value1, Integer value2) {
addCriterion("retry_times between", value1, value2, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryTimesNotBetween(Integer value1, Integer value2) {
addCriterion("retry_times not between", value1, value2, "retryTimes");
return (Criteria) this;
}
public Criteria andRetryIntervalIsNull() {
addCriterion("retry_interval is null");
return (Criteria) this;
}
public Criteria andRetryIntervalIsNotNull() {
addCriterion("retry_interval is not null");
return (Criteria) this;
}
public Criteria andRetryIntervalEqualTo(Integer value) {
addCriterion("retry_interval =", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalNotEqualTo(Integer value) {
addCriterion("retry_interval <>", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalGreaterThan(Integer value) {
addCriterion("retry_interval >", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalGreaterThanOrEqualTo(Integer value) {
addCriterion("retry_interval >=", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalLessThan(Integer value) {
addCriterion("retry_interval <", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalLessThanOrEqualTo(Integer value) {
addCriterion("retry_interval <=", value, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalIn(List<Integer> values) {
addCriterion("retry_interval in", values, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalNotIn(List<Integer> values) {
addCriterion("retry_interval not in", values, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalBetween(Integer value1, Integer value2) {
addCriterion("retry_interval between", value1, value2, "retryInterval");
return (Criteria) this;
}
public Criteria andRetryIntervalNotBetween(Integer value1, Integer value2) {
addCriterion("retry_interval not between", value1, value2, "retryInterval");
return (Criteria) this;
}
public Criteria andStopOnFailIsNull() {
addCriterion("stop_on_fail is null");
return (Criteria) this;
}
public Criteria andStopOnFailIsNotNull() {
addCriterion("stop_on_fail is not null");
return (Criteria) this;
}
public Criteria andStopOnFailEqualTo(Boolean value) {
addCriterion("stop_on_fail =", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailNotEqualTo(Boolean value) {
addCriterion("stop_on_fail <>", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailGreaterThan(Boolean value) {
addCriterion("stop_on_fail >", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailGreaterThanOrEqualTo(Boolean value) {
addCriterion("stop_on_fail >=", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailLessThan(Boolean value) {
addCriterion("stop_on_fail <", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailLessThanOrEqualTo(Boolean value) {
addCriterion("stop_on_fail <=", value, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailIn(List<Boolean> values) {
addCriterion("stop_on_fail in", values, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailNotIn(List<Boolean> values) {
addCriterion("stop_on_fail not in", values, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailBetween(Boolean value1, Boolean value2) {
addCriterion("stop_on_fail between", value1, value2, "stopOnFail");
return (Criteria) this;
}
public Criteria andStopOnFailNotBetween(Boolean value1, Boolean value2) {
addCriterion("stop_on_fail not between", value1, value2, "stopOnFail");
return (Criteria) this;
}
@ -773,6 +1223,66 @@ public class TestPlanCollectionExample {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andPosIsNull() {
addCriterion("pos is null");
return (Criteria) this;
}
public Criteria andPosIsNotNull() {
addCriterion("pos is not null");
return (Criteria) this;
}
public Criteria andPosEqualTo(Long value) {
addCriterion("pos =", value, "pos");
return (Criteria) this;
}
public Criteria andPosNotEqualTo(Long value) {
addCriterion("pos <>", value, "pos");
return (Criteria) this;
}
public Criteria andPosGreaterThan(Long value) {
addCriterion("pos >", value, "pos");
return (Criteria) this;
}
public Criteria andPosGreaterThanOrEqualTo(Long value) {
addCriterion("pos >=", value, "pos");
return (Criteria) this;
}
public Criteria andPosLessThan(Long value) {
addCriterion("pos <", value, "pos");
return (Criteria) this;
}
public Criteria andPosLessThanOrEqualTo(Long value) {
addCriterion("pos <=", value, "pos");
return (Criteria) this;
}
public Criteria andPosIn(List<Long> values) {
addCriterion("pos in", values, "pos");
return (Criteria) this;
}
public Criteria andPosNotIn(List<Long> values) {
addCriterion("pos not in", values, "pos");
return (Criteria) this;
}
public Criteria andPosBetween(Long value1, Long value2) {
addCriterion("pos between", value1, value2, "pos");
return (Criteria) this;
}
public Criteria andPosNotBetween(Long value1, Long value2) {
addCriterion("pos not between", value1, value2, "pos");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

35
backend/framework/domain/src/main/java/io/metersphere/plan/mapper/TestPlanAllocationMapper.java
View File

@ -1,35 +0,0 @@
package io.metersphere.plan.mapper;
import io.metersphere.plan.domain.TestPlanAllocation;
import io.metersphere.plan.domain.TestPlanAllocationExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TestPlanAllocationMapper {
long countByExample(TestPlanAllocationExample example);
int deleteByExample(TestPlanAllocationExample example);
int deleteByPrimaryKey(String id);
int insert(TestPlanAllocation record);
int insertSelective(TestPlanAllocation record);
List<TestPlanAllocation> selectByExample(TestPlanAllocationExample example);
TestPlanAllocation selectByPrimaryKey(String id);
int updateByExampleSelective(@Param("record") TestPlanAllocation record, @Param("example") TestPlanAllocationExample example);
int updateByExample(@Param("record") TestPlanAllocation record, @Param("example") TestPlanAllocationExample example);
int updateByPrimaryKeySelective(TestPlanAllocation record);
int updateByPrimaryKey(TestPlanAllocation record);
int batchInsert(@Param("list") List<TestPlanAllocation> list);
int batchInsertSelective(@Param("list") List<TestPlanAllocation> list, @Param("selective") TestPlanAllocation.Column ... selective);
}

308
backend/framework/domain/src/main/java/io/metersphere/plan/mapper/TestPlanAllocationMapper.xml
View File

@ -1,308 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="io.metersphere.plan.mapper.TestPlanAllocationMapper">
<resultMap id="BaseResultMap" type="io.metersphere.plan.domain.TestPlanAllocation">
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="test_plan_id" jdbcType="VARCHAR" property="testPlanId" />
<result column="test_resource_pool_id" jdbcType="VARCHAR" property="testResourcePoolId" />
<result column="retry_on_fail" jdbcType="BIT" property="retryOnFail" />
<result column="retry_type" jdbcType="VARCHAR" property="retryType" />
<result column="retry_times" jdbcType="INTEGER" property="retryTimes" />
<result column="retry_interval" jdbcType="INTEGER" property="retryInterval" />
<result column="stop_on_fail" jdbcType="BIT" property="stopOnFail" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, test_plan_id, test_resource_pool_id, retry_on_fail, retry_type, retry_times,
retry_interval, stop_on_fail
</sql>
<select id="selectByExample" parameterType="io.metersphere.plan.domain.TestPlanAllocationExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from test_plan_allocation
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from test_plan_allocation
where id = #{id,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from test_plan_allocation
where id = #{id,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="io.metersphere.plan.domain.TestPlanAllocationExample">
delete from test_plan_allocation
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="io.metersphere.plan.domain.TestPlanAllocation">
insert into test_plan_allocation (id, test_plan_id, test_resource_pool_id,
retry_on_fail, retry_type, retry_times,
retry_interval, stop_on_fail)
values (#{id,jdbcType=VARCHAR}, #{testPlanId,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR},
#{retryOnFail,jdbcType=BIT}, #{retryType,jdbcType=VARCHAR}, #{retryTimes,jdbcType=INTEGER},
#{retryInterval,jdbcType=INTEGER}, #{stopOnFail,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.plan.domain.TestPlanAllocation">
insert into test_plan_allocation
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="testPlanId != null">
test_plan_id,
</if>
<if test="testResourcePoolId != null">
test_resource_pool_id,
</if>
<if test="retryOnFail != null">
retry_on_fail,
</if>
<if test="retryType != null">
retry_type,
</if>
<if test="retryTimes != null">
retry_times,
</if>
<if test="retryInterval != null">
retry_interval,
</if>
<if test="stopOnFail != null">
stop_on_fail,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=VARCHAR},
</if>
<if test="testPlanId != null">
#{testPlanId,jdbcType=VARCHAR},
</if>
<if test="testResourcePoolId != null">
#{testResourcePoolId,jdbcType=VARCHAR},
</if>
<if test="retryOnFail != null">
#{retryOnFail,jdbcType=BIT},
</if>
<if test="retryType != null">
#{retryType,jdbcType=VARCHAR},
</if>
<if test="retryTimes != null">
#{retryTimes,jdbcType=INTEGER},
</if>
<if test="retryInterval != null">
#{retryInterval,jdbcType=INTEGER},
</if>
<if test="stopOnFail != null">
#{stopOnFail,jdbcType=BIT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.metersphere.plan.domain.TestPlanAllocationExample" resultType="java.lang.Long">
select count(*) from test_plan_allocation
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update test_plan_allocation
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=VARCHAR},
</if>
<if test="record.testPlanId != null">
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR},
</if>
<if test="record.testResourcePoolId != null">
test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
</if>
<if test="record.retryOnFail != null">
retry_on_fail = #{record.retryOnFail,jdbcType=BIT},
</if>
<if test="record.retryType != null">
retry_type = #{record.retryType,jdbcType=VARCHAR},
</if>
<if test="record.retryTimes != null">
retry_times = #{record.retryTimes,jdbcType=INTEGER},
</if>
<if test="record.retryInterval != null">
retry_interval = #{record.retryInterval,jdbcType=INTEGER},
</if>
<if test="record.stopOnFail != null">
stop_on_fail = #{record.stopOnFail,jdbcType=BIT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update test_plan_allocation
set id = #{record.id,jdbcType=VARCHAR},
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR},
test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
retry_on_fail = #{record.retryOnFail,jdbcType=BIT},
retry_type = #{record.retryType,jdbcType=VARCHAR},
retry_times = #{record.retryTimes,jdbcType=INTEGER},
retry_interval = #{record.retryInterval,jdbcType=INTEGER},
stop_on_fail = #{record.stopOnFail,jdbcType=BIT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="io.metersphere.plan.domain.TestPlanAllocation">
update test_plan_allocation
<set>
<if test="testPlanId != null">
test_plan_id = #{testPlanId,jdbcType=VARCHAR},
</if>
<if test="testResourcePoolId != null">
test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
</if>
<if test="retryOnFail != null">
retry_on_fail = #{retryOnFail,jdbcType=BIT},
</if>
<if test="retryType != null">
retry_type = #{retryType,jdbcType=VARCHAR},
</if>
<if test="retryTimes != null">
retry_times = #{retryTimes,jdbcType=INTEGER},
</if>
<if test="retryInterval != null">
retry_interval = #{retryInterval,jdbcType=INTEGER},
</if>
<if test="stopOnFail != null">
stop_on_fail = #{stopOnFail,jdbcType=BIT},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="io.metersphere.plan.domain.TestPlanAllocation">
update test_plan_allocation
set test_plan_id = #{testPlanId,jdbcType=VARCHAR},
test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
retry_on_fail = #{retryOnFail,jdbcType=BIT},
retry_type = #{retryType,jdbcType=VARCHAR},
retry_times = #{retryTimes,jdbcType=INTEGER},
retry_interval = #{retryInterval,jdbcType=INTEGER},
stop_on_fail = #{stopOnFail,jdbcType=BIT}
where id = #{id,jdbcType=VARCHAR}
</update>
<insert id="batchInsert" parameterType="map">
insert into test_plan_allocation
(id, test_plan_id, test_resource_pool_id, retry_on_fail, retry_type, retry_times,
retry_interval, stop_on_fail)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=VARCHAR}, #{item.testPlanId,jdbcType=VARCHAR}, #{item.testResourcePoolId,jdbcType=VARCHAR},
#{item.retryOnFail,jdbcType=BIT}, #{item.retryType,jdbcType=VARCHAR}, #{item.retryTimes,jdbcType=INTEGER},
#{item.retryInterval,jdbcType=INTEGER}, #{item.stopOnFail,jdbcType=BIT})
</foreach>
</insert>
<insert id="batchInsertSelective" parameterType="map">
insert into test_plan_allocation (
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
</foreach>
)
values
<foreach collection="list" item="item" separator=",">
(
<foreach collection="selective" item="column" separator=",">
<if test="'id'.toString() == column.value">
#{item.id,jdbcType=VARCHAR}
</if>
<if test="'test_plan_id'.toString() == column.value">
#{item.testPlanId,jdbcType=VARCHAR}
</if>
<if test="'test_resource_pool_id'.toString() == column.value">
#{item.testResourcePoolId,jdbcType=VARCHAR}
</if>
<if test="'retry_on_fail'.toString() == column.value">
#{item.retryOnFail,jdbcType=BIT}
</if>
<if test="'retry_type'.toString() == column.value">
#{item.retryType,jdbcType=VARCHAR}
</if>
<if test="'retry_times'.toString() == column.value">
#{item.retryTimes,jdbcType=INTEGER}
</if>
<if test="'retry_interval'.toString() == column.value">
#{item.retryInterval,jdbcType=INTEGER}
</if>
<if test="'stop_on_fail'.toString() == column.value">
#{item.stopOnFail,jdbcType=BIT}
</if>
</foreach>
)
</foreach>
</insert>
</mapper>

35
backend/framework/domain/src/main/java/io/metersphere/plan/mapper/TestPlanAllocationTypeMapper.java
View File

@ -1,35 +0,0 @@
package io.metersphere.plan.mapper;
import io.metersphere.plan.domain.TestPlanAllocationType;
import io.metersphere.plan.domain.TestPlanAllocationTypeExample;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TestPlanAllocationTypeMapper {
long countByExample(TestPlanAllocationTypeExample example);
int deleteByExample(TestPlanAllocationTypeExample example);
int deleteByPrimaryKey(String id);
int insert(TestPlanAllocationType record);
int insertSelective(TestPlanAllocationType record);
List<TestPlanAllocationType> selectByExample(TestPlanAllocationTypeExample example);
TestPlanAllocationType selectByPrimaryKey(String id);
int updateByExampleSelective(@Param("record") TestPlanAllocationType record, @Param("example") TestPlanAllocationTypeExample example);
int updateByExample(@Param("record") TestPlanAllocationType record, @Param("example") TestPlanAllocationTypeExample example);
int updateByPrimaryKeySelective(TestPlanAllocationType record);
int updateByPrimaryKey(TestPlanAllocationType record);
int batchInsert(@Param("list") List<TestPlanAllocationType> list);
int batchInsertSelective(@Param("list") List<TestPlanAllocationType> list, @Param("selective") TestPlanAllocationType.Column ... selective);
}

270
backend/framework/domain/src/main/java/io/metersphere/plan/mapper/TestPlanAllocationTypeMapper.xml
View File

@ -1,270 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="io.metersphere.plan.mapper.TestPlanAllocationTypeMapper">
<resultMap id="BaseResultMap" type="io.metersphere.plan.domain.TestPlanAllocationType">
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="test_plan_id" jdbcType="VARCHAR" property="testPlanId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="execute_method" jdbcType="VARCHAR" property="executeMethod" />
<result column="pos" jdbcType="BIGINT" property="pos" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, test_plan_id, `name`, `type`, execute_method, pos
</sql>
<select id="selectByExample" parameterType="io.metersphere.plan.domain.TestPlanAllocationTypeExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from test_plan_allocation_type
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from test_plan_allocation_type
where id = #{id,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
delete from test_plan_allocation_type
where id = #{id,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="io.metersphere.plan.domain.TestPlanAllocationTypeExample">
delete from test_plan_allocation_type
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="io.metersphere.plan.domain.TestPlanAllocationType">
insert into test_plan_allocation_type (id, test_plan_id, `name`,
`type`, execute_method, pos
)
values (#{id,jdbcType=VARCHAR}, #{testPlanId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR}, #{executeMethod,jdbcType=VARCHAR}, #{pos,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" parameterType="io.metersphere.plan.domain.TestPlanAllocationType">
insert into test_plan_allocation_type
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="testPlanId != null">
test_plan_id,
</if>
<if test="name != null">
`name`,
</if>
<if test="type != null">
`type`,
</if>
<if test="executeMethod != null">
execute_method,
</if>
<if test="pos != null">
pos,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=VARCHAR},
</if>
<if test="testPlanId != null">
#{testPlanId,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="executeMethod != null">
#{executeMethod,jdbcType=VARCHAR},
</if>
<if test="pos != null">
#{pos,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.metersphere.plan.domain.TestPlanAllocationTypeExample" resultType="java.lang.Long">
select count(*) from test_plan_allocation_type
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update test_plan_allocation_type
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=VARCHAR},
</if>
<if test="record.testPlanId != null">
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
`name` = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.type != null">
`type` = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.executeMethod != null">
execute_method = #{record.executeMethod,jdbcType=VARCHAR},
</if>
<if test="record.pos != null">
pos = #{record.pos,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update test_plan_allocation_type
set id = #{record.id,jdbcType=VARCHAR},
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR},
`name` = #{record.name,jdbcType=VARCHAR},
`type` = #{record.type,jdbcType=VARCHAR},
execute_method = #{record.executeMethod,jdbcType=VARCHAR},
pos = #{record.pos,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="io.metersphere.plan.domain.TestPlanAllocationType">
update test_plan_allocation_type
<set>
<if test="testPlanId != null">
test_plan_id = #{testPlanId,jdbcType=VARCHAR},
</if>
<if test="name != null">
`name` = #{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
`type` = #{type,jdbcType=VARCHAR},
</if>
<if test="executeMethod != null">
execute_method = #{executeMethod,jdbcType=VARCHAR},
</if>
<if test="pos != null">
pos = #{pos,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="io.metersphere.plan.domain.TestPlanAllocationType">
update test_plan_allocation_type
set test_plan_id = #{testPlanId,jdbcType=VARCHAR},
`name` = #{name,jdbcType=VARCHAR},
`type` = #{type,jdbcType=VARCHAR},
execute_method = #{executeMethod,jdbcType=VARCHAR},
pos = #{pos,jdbcType=BIGINT}
where id = #{id,jdbcType=VARCHAR}
</update>
<insert id="batchInsert" parameterType="map">
insert into test_plan_allocation_type
(id, test_plan_id, `name`, `type`, execute_method, pos)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=VARCHAR}, #{item.testPlanId,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR},
#{item.type,jdbcType=VARCHAR}, #{item.executeMethod,jdbcType=VARCHAR}, #{item.pos,jdbcType=BIGINT}
)
</foreach>
</insert>
<insert id="batchInsertSelective" parameterType="map">
insert into test_plan_allocation_type (
<foreach collection="selective" item="column" separator=",">
${column.escapedColumnName}
</foreach>
)
values
<foreach collection="list" item="item" separator=",">
(
<foreach collection="selective" item="column" separator=",">
<if test="'id'.toString() == column.value">
#{item.id,jdbcType=VARCHAR}
</if>
<if test="'test_plan_id'.toString() == column.value">
#{item.testPlanId,jdbcType=VARCHAR}
</if>
<if test="'name'.toString() == column.value">
#{item.name,jdbcType=VARCHAR}
</if>
<if test="'type'.toString() == column.value">
#{item.type,jdbcType=VARCHAR}
</if>
<if test="'execute_method'.toString() == column.value">
#{item.executeMethod,jdbcType=VARCHAR}
</if>
<if test="'pos'.toString() == column.value">
#{item.pos,jdbcType=BIGINT}
</if>
</foreach>
)
</foreach>
</insert>
</mapper>

243
backend/framework/domain/src/main/java/io/metersphere/plan/mapper/TestPlanCollectionMapper.xml
View File

@ -4,14 +4,22 @@
<resultMap id="BaseResultMap" type="io.metersphere.plan.domain.TestPlanCollection">
<id column="id" jdbcType="VARCHAR" property="id" />
<result column="test_plan_id" jdbcType="VARCHAR" property="testPlanId" />
<result column="test_collection_type_id" jdbcType="VARCHAR" property="testCollectionTypeId" />
<result column="parent_id" jdbcType="VARCHAR" property="parentId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="execute_method" jdbcType="VARCHAR" property="executeMethod" />
<result column="extended" jdbcType="BIT" property="extended" />
<result column="grouped" jdbcType="BIT" property="grouped" />
<result column="environment_id" jdbcType="VARCHAR" property="environmentId" />
<result column="pos" jdbcType="BIGINT" property="pos" />
<result column="test_resource_pool_id" jdbcType="VARCHAR" property="testResourcePoolId" />
<result column="retry_on_fail" jdbcType="BIT" property="retryOnFail" />
<result column="retry_type" jdbcType="VARCHAR" property="retryType" />
<result column="retry_times" jdbcType="INTEGER" property="retryTimes" />
<result column="retry_interval" jdbcType="INTEGER" property="retryInterval" />
<result column="stop_on_fail" jdbcType="BIT" property="stopOnFail" />
<result column="create_user" jdbcType="VARCHAR" property="createUser" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="pos" jdbcType="BIGINT" property="pos" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -72,8 +80,9 @@
</where>
</sql>
<sql id="Base_Column_List">
id, test_plan_id, test_collection_type_id, `name`, execute_method, grouped, environment_id,
pos, create_user, create_time
id, test_plan_id, parent_id, `name`, `type`, execute_method, extended, grouped, environment_id,
test_resource_pool_id, retry_on_fail, retry_type, retry_times, retry_interval, stop_on_fail,
create_user, create_time, pos
</sql>
<select id="selectByExample" parameterType="io.metersphere.plan.domain.TestPlanCollectionExample" resultMap="BaseResultMap">
select
@ -106,14 +115,20 @@
</if>
</delete>
<insert id="insert" parameterType="io.metersphere.plan.domain.TestPlanCollection">
insert into test_plan_collection (id, test_plan_id, test_collection_type_id,
`name`, execute_method, grouped,
environment_id, pos, create_user,
create_time)
values (#{id,jdbcType=VARCHAR}, #{testPlanId,jdbcType=VARCHAR}, #{testCollectionTypeId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{executeMethod,jdbcType=VARCHAR}, #{grouped,jdbcType=BIT},
#{environmentId,jdbcType=VARCHAR}, #{pos,jdbcType=BIGINT}, #{createUser,jdbcType=VARCHAR},
#{createTime,jdbcType=BIGINT})
insert into test_plan_collection (id, test_plan_id, parent_id,
`name`, `type`, execute_method,
extended, grouped, environment_id,
test_resource_pool_id, retry_on_fail, retry_type,
retry_times, retry_interval, stop_on_fail,
create_user, create_time, pos
)
values (#{id,jdbcType=VARCHAR}, #{testPlanId,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{executeMethod,jdbcType=VARCHAR},
#{extended,jdbcType=BIT}, #{grouped,jdbcType=BIT}, #{environmentId,jdbcType=VARCHAR},
#{testResourcePoolId,jdbcType=VARCHAR}, #{retryOnFail,jdbcType=BIT}, #{retryType,jdbcType=VARCHAR},
#{retryTimes,jdbcType=INTEGER}, #{retryInterval,jdbcType=INTEGER}, #{stopOnFail,jdbcType=BIT},
#{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{pos,jdbcType=BIGINT}
)
</insert>
<insert id="insertSelective" parameterType="io.metersphere.plan.domain.TestPlanCollection">
insert into test_plan_collection
@ -124,23 +139,44 @@
<if test="testPlanId != null">
test_plan_id,
</if>
<if test="testCollectionTypeId != null">
test_collection_type_id,
<if test="parentId != null">
parent_id,
</if>
<if test="name != null">
`name`,
</if>
<if test="type != null">
`type`,
</if>
<if test="executeMethod != null">
execute_method,
</if>
<if test="extended != null">
extended,
</if>
<if test="grouped != null">
grouped,
</if>
<if test="environmentId != null">
environment_id,
</if>
<if test="pos != null">
pos,
<if test="testResourcePoolId != null">
test_resource_pool_id,
</if>
<if test="retryOnFail != null">
retry_on_fail,
</if>
<if test="retryType != null">
retry_type,
</if>
<if test="retryTimes != null">
retry_times,
</if>
<if test="retryInterval != null">
retry_interval,
</if>
<if test="stopOnFail != null">
stop_on_fail,
</if>
<if test="createUser != null">
create_user,
@ -148,6 +184,9 @@
<if test="createTime != null">
create_time,
</if>
<if test="pos != null">
pos,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
@ -156,23 +195,44 @@
<if test="testPlanId != null">
#{testPlanId,jdbcType=VARCHAR},
</if>
<if test="testCollectionTypeId != null">
#{testCollectionTypeId,jdbcType=VARCHAR},
<if test="parentId != null">
#{parentId,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
#{type,jdbcType=VARCHAR},
</if>
<if test="executeMethod != null">
#{executeMethod,jdbcType=VARCHAR},
</if>
<if test="extended != null">
#{extended,jdbcType=BIT},
</if>
<if test="grouped != null">
#{grouped,jdbcType=BIT},
</if>
<if test="environmentId != null">
#{environmentId,jdbcType=VARCHAR},
</if>
<if test="pos != null">
#{pos,jdbcType=BIGINT},
<if test="testResourcePoolId != null">
#{testResourcePoolId,jdbcType=VARCHAR},
</if>
<if test="retryOnFail != null">
#{retryOnFail,jdbcType=BIT},
</if>
<if test="retryType != null">
#{retryType,jdbcType=VARCHAR},
</if>
<if test="retryTimes != null">
#{retryTimes,jdbcType=INTEGER},
</if>
<if test="retryInterval != null">
#{retryInterval,jdbcType=INTEGER},
</if>
<if test="stopOnFail != null">
#{stopOnFail,jdbcType=BIT},
</if>
<if test="createUser != null">
#{createUser,jdbcType=VARCHAR},
@ -180,6 +240,9 @@
<if test="createTime != null">
#{createTime,jdbcType=BIGINT},
</if>
<if test="pos != null">
#{pos,jdbcType=BIGINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.metersphere.plan.domain.TestPlanCollectionExample" resultType="java.lang.Long">
@ -197,23 +260,44 @@
<if test="record.testPlanId != null">
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR},
</if>
<if test="record.testCollectionTypeId != null">
test_collection_type_id = #{record.testCollectionTypeId,jdbcType=VARCHAR},
<if test="record.parentId != null">
parent_id = #{record.parentId,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
`name` = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.type != null">
`type` = #{record.type,jdbcType=VARCHAR},
</if>
<if test="record.executeMethod != null">
execute_method = #{record.executeMethod,jdbcType=VARCHAR},
</if>
<if test="record.extended != null">
extended = #{record.extended,jdbcType=BIT},
</if>
<if test="record.grouped != null">
grouped = #{record.grouped,jdbcType=BIT},
</if>
<if test="record.environmentId != null">
environment_id = #{record.environmentId,jdbcType=VARCHAR},
</if>
<if test="record.pos != null">
pos = #{record.pos,jdbcType=BIGINT},
<if test="record.testResourcePoolId != null">
test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
</if>
<if test="record.retryOnFail != null">
retry_on_fail = #{record.retryOnFail,jdbcType=BIT},
</if>
<if test="record.retryType != null">
retry_type = #{record.retryType,jdbcType=VARCHAR},
</if>
<if test="record.retryTimes != null">
retry_times = #{record.retryTimes,jdbcType=INTEGER},
</if>
<if test="record.retryInterval != null">
retry_interval = #{record.retryInterval,jdbcType=INTEGER},
</if>
<if test="record.stopOnFail != null">
stop_on_fail = #{record.stopOnFail,jdbcType=BIT},
</if>
<if test="record.createUser != null">
create_user = #{record.createUser,jdbcType=VARCHAR},
@ -221,6 +305,9 @@
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=BIGINT},
</if>
<if test="record.pos != null">
pos = #{record.pos,jdbcType=BIGINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
@ -230,14 +317,22 @@
update test_plan_collection
set id = #{record.id,jdbcType=VARCHAR},
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR},
test_collection_type_id = #{record.testCollectionTypeId,jdbcType=VARCHAR},
parent_id = #{record.parentId,jdbcType=VARCHAR},
`name` = #{record.name,jdbcType=VARCHAR},
`type` = #{record.type,jdbcType=VARCHAR},
execute_method = #{record.executeMethod,jdbcType=VARCHAR},
extended = #{record.extended,jdbcType=BIT},
grouped = #{record.grouped,jdbcType=BIT},
environment_id = #{record.environmentId,jdbcType=VARCHAR},
pos = #{record.pos,jdbcType=BIGINT},
test_resource_pool_id = #{record.testResourcePoolId,jdbcType=VARCHAR},
retry_on_fail = #{record.retryOnFail,jdbcType=BIT},
retry_type = #{record.retryType,jdbcType=VARCHAR},
retry_times = #{record.retryTimes,jdbcType=INTEGER},
retry_interval = #{record.retryInterval,jdbcType=INTEGER},
stop_on_fail = #{record.stopOnFail,jdbcType=BIT},
create_user = #{record.createUser,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT}
create_time = #{record.createTime,jdbcType=BIGINT},
pos = #{record.pos,jdbcType=BIGINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
@ -248,23 +343,44 @@
<if test="testPlanId != null">
test_plan_id = #{testPlanId,jdbcType=VARCHAR},
</if>
<if test="testCollectionTypeId != null">
test_collection_type_id = #{testCollectionTypeId,jdbcType=VARCHAR},
<if test="parentId != null">
parent_id = #{parentId,jdbcType=VARCHAR},
</if>
<if test="name != null">
`name` = #{name,jdbcType=VARCHAR},
</if>
<if test="type != null">
`type` = #{type,jdbcType=VARCHAR},
</if>
<if test="executeMethod != null">
execute_method = #{executeMethod,jdbcType=VARCHAR},
</if>
<if test="extended != null">
extended = #{extended,jdbcType=BIT},
</if>
<if test="grouped != null">
grouped = #{grouped,jdbcType=BIT},
</if>
<if test="environmentId != null">
environment_id = #{environmentId,jdbcType=VARCHAR},
</if>
<if test="pos != null">
pos = #{pos,jdbcType=BIGINT},
<if test="testResourcePoolId != null">
test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
</if>
<if test="retryOnFail != null">
retry_on_fail = #{retryOnFail,jdbcType=BIT},
</if>
<if test="retryType != null">
retry_type = #{retryType,jdbcType=VARCHAR},
</if>
<if test="retryTimes != null">
retry_times = #{retryTimes,jdbcType=INTEGER},
</if>
<if test="retryInterval != null">
retry_interval = #{retryInterval,jdbcType=INTEGER},
</if>
<if test="stopOnFail != null">
stop_on_fail = #{stopOnFail,jdbcType=BIT},
</if>
<if test="createUser != null">
create_user = #{createUser,jdbcType=VARCHAR},
@ -272,32 +388,47 @@
<if test="createTime != null">
create_time = #{createTime,jdbcType=BIGINT},
</if>
<if test="pos != null">
pos = #{pos,jdbcType=BIGINT},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="io.metersphere.plan.domain.TestPlanCollection">
update test_plan_collection
set test_plan_id = #{testPlanId,jdbcType=VARCHAR},
test_collection_type_id = #{testCollectionTypeId,jdbcType=VARCHAR},
parent_id = #{parentId,jdbcType=VARCHAR},
`name` = #{name,jdbcType=VARCHAR},
`type` = #{type,jdbcType=VARCHAR},
execute_method = #{executeMethod,jdbcType=VARCHAR},
extended = #{extended,jdbcType=BIT},
grouped = #{grouped,jdbcType=BIT},
environment_id = #{environmentId,jdbcType=VARCHAR},
pos = #{pos,jdbcType=BIGINT},
test_resource_pool_id = #{testResourcePoolId,jdbcType=VARCHAR},
retry_on_fail = #{retryOnFail,jdbcType=BIT},
retry_type = #{retryType,jdbcType=VARCHAR},
retry_times = #{retryTimes,jdbcType=INTEGER},
retry_interval = #{retryInterval,jdbcType=INTEGER},
stop_on_fail = #{stopOnFail,jdbcType=BIT},
create_user = #{createUser,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT}
create_time = #{createTime,jdbcType=BIGINT},
pos = #{pos,jdbcType=BIGINT}
where id = #{id,jdbcType=VARCHAR}
</update>
<insert id="batchInsert" parameterType="map">
insert into test_plan_collection
(id, test_plan_id, test_collection_type_id, `name`, execute_method, grouped, environment_id,
pos, create_user, create_time)
(id, test_plan_id, parent_id, `name`, `type`, execute_method, extended, grouped,
environment_id, test_resource_pool_id, retry_on_fail, retry_type, retry_times,
retry_interval, stop_on_fail, create_user, create_time, pos)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=VARCHAR}, #{item.testPlanId,jdbcType=VARCHAR}, #{item.testCollectionTypeId,jdbcType=VARCHAR},
#{item.name,jdbcType=VARCHAR}, #{item.executeMethod,jdbcType=VARCHAR}, #{item.grouped,jdbcType=BIT},
#{item.environmentId,jdbcType=VARCHAR}, #{item.pos,jdbcType=BIGINT}, #{item.createUser,jdbcType=VARCHAR},
#{item.createTime,jdbcType=BIGINT})
(#{item.id,jdbcType=VARCHAR}, #{item.testPlanId,jdbcType=VARCHAR}, #{item.parentId,jdbcType=VARCHAR},
#{item.name,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.executeMethod,jdbcType=VARCHAR},
#{item.extended,jdbcType=BIT}, #{item.grouped,jdbcType=BIT}, #{item.environmentId,jdbcType=VARCHAR},
#{item.testResourcePoolId,jdbcType=VARCHAR}, #{item.retryOnFail,jdbcType=BIT},
#{item.retryType,jdbcType=VARCHAR}, #{item.retryTimes,jdbcType=INTEGER}, #{item.retryInterval,jdbcType=INTEGER},
#{item.stopOnFail,jdbcType=BIT}, #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=BIGINT},
#{item.pos,jdbcType=BIGINT})
</foreach>
</insert>
<insert id="batchInsertSelective" parameterType="map">
@ -316,23 +447,44 @@
<if test="'test_plan_id'.toString() == column.value">
#{item.testPlanId,jdbcType=VARCHAR}
</if>
<if test="'test_collection_type_id'.toString() == column.value">
#{item.testCollectionTypeId,jdbcType=VARCHAR}
<if test="'parent_id'.toString() == column.value">
#{item.parentId,jdbcType=VARCHAR}
</if>
<if test="'name'.toString() == column.value">
#{item.name,jdbcType=VARCHAR}
</if>
<if test="'type'.toString() == column.value">
#{item.type,jdbcType=VARCHAR}
</if>
<if test="'execute_method'.toString() == column.value">
#{item.executeMethod,jdbcType=VARCHAR}
</if>
<if test="'extended'.toString() == column.value">
#{item.extended,jdbcType=BIT}
</if>
<if test="'grouped'.toString() == column.value">
#{item.grouped,jdbcType=BIT}
</if>
<if test="'environment_id'.toString() == column.value">
#{item.environmentId,jdbcType=VARCHAR}
</if>
<if test="'pos'.toString() == column.value">
#{item.pos,jdbcType=BIGINT}
<if test="'test_resource_pool_id'.toString() == column.value">
#{item.testResourcePoolId,jdbcType=VARCHAR}
</if>
<if test="'retry_on_fail'.toString() == column.value">
#{item.retryOnFail,jdbcType=BIT}
</if>
<if test="'retry_type'.toString() == column.value">
#{item.retryType,jdbcType=VARCHAR}
</if>
<if test="'retry_times'.toString() == column.value">
#{item.retryTimes,jdbcType=INTEGER}
</if>
<if test="'retry_interval'.toString() == column.value">
#{item.retryInterval,jdbcType=INTEGER}
</if>
<if test="'stop_on_fail'.toString() == column.value">
#{item.stopOnFail,jdbcType=BIT}
</if>
<if test="'create_user'.toString() == column.value">
#{item.createUser,jdbcType=VARCHAR}
@ -340,6 +492,9 @@
<if test="'create_time'.toString() == column.value">
#{item.createTime,jdbcType=BIGINT}
</if>
<if test="'pos'.toString() == column.value">
#{item.pos,jdbcType=BIGINT}
</if>
</foreach>
)
</foreach>

24
backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_13__ga_ddl.sql
View File

@ -59,7 +59,7 @@ ALTER TABLE test_plan_report_bug MODIFY `bug_case_count` BIGINT NOT NULL DEFAUL
-- 修改测试计划关联接口表字段
ALTER TABLE test_plan_api_case DROP COLUMN num;
ALTER TABLE test_plan_api_case ADD COLUMN test_plan_collection_id VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '测试计划集id';
ALTER TABLE test_plan_api_case ADD COLUMN test_plan_collection_id VARCHAR(50) NOT NULL COMMENT '测试计划集id';
ALTER TABLE test_plan_api_case ADD COLUMN last_exec_time BIGINT COMMENT '最后执行时间';
CREATE INDEX idx_test_plan_collection_id ON test_plan_api_case(test_plan_collection_id);
CREATE INDEX idx_pos ON test_plan_api_case(pos);
@ -103,20 +103,26 @@ CREATE INDEX idx_test_plan_id ON test_plan_allocation_type(test_plan_id);
CREATE TABLE IF NOT EXISTS test_plan_collection(
`id` VARCHAR(50) NOT NULL COMMENT 'ID' ,
`test_plan_id` VARCHAR(50) NOT NULL COMMENT '测试计划ID' ,
`test_collection_type_id` VARCHAR(50) NOT NULL COMMENT '所属测试集类型ID' ,
`parent_id` VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '父级ID' ,
`name` VARCHAR(255) NOT NULL COMMENT '测试集名称' ,
`execute_method` VARCHAR(50) NOT NULL COMMENT '执行方式(串行/并行)' ,
`type` VARCHAR(255) NOT NULL COMMENT '测试集类型(功能/接口/场景)' ,
`execute_method` VARCHAR(50) NOT NULL DEFAULT 'SERIAL' COMMENT '执行方式(串行/并行)' ,
`extended` BIT NOT NULL DEFAULT 1 COMMENT '是否继承' ,
`grouped` BIT NOT NULL DEFAULT 0 COMMENT '是否使用环境组' ,
`environment_id` VARCHAR(50) NOT NULL COMMENT '环境ID/环境组ID' ,
`pos` BIGINT NOT NULL COMMENT '自定义排序，间隔为2的N次幂' ,
`environment_id` VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '环境ID/环境组ID' ,
`test_resource_pool_id` VARCHAR(50) NOT NULL COMMENT '测试资源池ID' ,
`retry_on_fail` BIT NOT NULL DEFAULT 0 COMMENT '是否失败重试' ,
`retry_type` VARCHAR(50) NOT NULL DEFAULT 'STEP' COMMENT '失败重试类型(步骤/场景)' ,
`retry_times` INT NOT NULL DEFAULT 1 COMMENT '失败重试次数' ,
`retry_interval` INT NOT NULL DEFAULT 1000 COMMENT '失败重试间隔(单位: ms)' ,
`stop_on_fail` BIT NOT NULL DEFAULT 0 COMMENT '是否失败停止' ,
`create_user` VARCHAR(50) NOT NULL COMMENT '创建人' ,
`create_time` BIGINT NOT NULL COMMENT '创建时间' ,
`pos` BIGINT NOT NULL COMMENT '自定义排序，间隔为4096' ,
PRIMARY KEY (id)
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '测试集';
CREATE INDEX idx_test_plan_id ON test_plan_collection(test_plan_id);
CREATE INDEX idx_collection_type_id ON test_plan_collection(test_collection_type_id);
CREATE INDEX idx_env_id ON test_plan_collection(environment_id);
CREATE INDEX idx_create_user ON test_plan_collection(create_user);
CREATE INDEX idx_test_plan_id_and_type ON test_plan_collection(test_plan_id,type);
CREATE INDEX idx_parent_id ON test_plan_collection(parent_id);
ALTER TABLE api_report ADD COLUMN exec_status VARCHAR(20) NOT NULL DEFAULT 'PENDING' COMMENT '执行状态';

11
backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/CaseType.java
View File

@ -9,15 +9,15 @@ public enum CaseType {
/**
* 功能用例
*/
FUNCTIONAL_CASE("FUNCTIONAL", "test_case", PermissionConstants.FUNCTIONAL_CASE_READ, "functional_case", "functional_case_module", "functional_case.module.default.name"),
FUNCTIONAL_CASE("FUNCTIONAL", "test_case", PermissionConstants.FUNCTIONAL_CASE_READ, "functional_case", "functional_case_module", "functional_case.module.default.name", "test_plan_default_functional_collection_name"),
/**
* 接口用例
*/
API_CASE("API", "api_case", PermissionConstants.PROJECT_API_DEFINITION_CASE_READ, "api_test_case", "api_definition_module", "api_unplanned_request"),
API_CASE("API", "api_case", PermissionConstants.PROJECT_API_DEFINITION_CASE_READ, "api_test_case", "api_definition_module", "api_unplanned_request", "test_plan_default_api_collection_name"),
/**
* 场景用例
*/
SCENARIO_CASE("SCENARIO", "scenario_case", PermissionConstants.PROJECT_API_SCENARIO_READ, "api_scenario", "api_scenario_module", "api_unplanned_scenario");
SCENARIO_CASE("SCENARIO", "scenario_case", PermissionConstants.PROJECT_API_SCENARIO_READ, "api_scenario", "api_scenario_module", "api_unplanned_scenario", "test_plan_default_scenario_collection_name");
private final String key;
@ -31,13 +31,16 @@ public enum CaseType {
private final String unPlanName;
CaseType(String key, String type, String usePermission, String caseTable, String moduleTable, String unPlanName) {
private final String planDefaultCollection;
CaseType(String key, String type, String usePermission, String caseTable, String moduleTable, String unPlanName, String planDefaultCollection) {
this.key = key;
this.type = type;
this.usePermission = usePermission;
this.caseTable = caseTable;
this.moduleTable = moduleTable;
this.unPlanName = unPlanName;
this.planDefaultCollection = planDefaultCollection;
}
public static CaseType getType(String key) {

6
backend/framework/sdk/src/main/resources/i18n/plan.properties
View File

@ -113,5 +113,7 @@ test_plan.is.archived=测试计划已归档
test_plan.cannot.archived=测试计划不符合归档操作条件
test_plan_module_already_exists=同名模块已存在
test_plan_report_name_length_range=报告名称长度过长
test_plan_allocation_type_param_error=测试集所属分类参数错误
test_plan_schedule=测试计划-定時任務
test_plan_schedule=测试计划-定時任務
test_plan_default_functional_collection_name=基本功能点
test_plan_default_api_collection_name=单接口验证
test_plan_default_scenario_collection_name=业务流程验证

6
backend/framework/sdk/src/main/resources/i18n/plan_en_US.properties
View File

@ -116,5 +116,7 @@ test_plan.is.archived=Test plan has been archived
test_plan.cannot.archived=Test plan cannot be archived
test_plan_module_already_exists=The module with the same name already exists
test_plan_report_name_length_range=The report name is too long
test_plan_allocation_type_param_error=The parameter of the allocation type is not correct
test_plan_schedule=Test plan schedule
test_plan_schedule=Test plan schedule
test_plan_default_functional_collection_name=Basic function point
test_plan_default_api_collection_name=Single interface verification
test_plan_default_scenario_collection_name=Business process verification

6
backend/framework/sdk/src/main/resources/i18n/plan_zh_CN.properties
View File

@ -116,5 +116,7 @@ test_plan.is.archived=测试计划已归档
test_plan.cannot.archived=测试计划不符合归档操作条件
test_plan_module_already_exists=同名模块已存在
test_plan_report_name_length_range=报告名称长度过长
test_plan_allocation_type_param_error=测试集所属分类参数错误
test_plan_schedule=测试计划-定時任務
test_plan_schedule=测试计划-定時任務
test_plan_default_functional_collection_name=基本功能点
test_plan_default_api_collection_name=单接口验证
test_plan_default_scenario_collection_name=业务流程验证

6
backend/framework/sdk/src/main/resources/i18n/plan_zh_TW.properties
View File

@ -115,5 +115,7 @@ test_plan.is.archived=測試計劃已歸檔
test_plan.cannot.archived=測試計劃不符合歸檔操作條件
test_plan_module_already_exists=同名模塊已存在
test_plan_report_name_length_range=报告名称长度过长
test_plan_allocation_type_param_error=測試集所屬分類參數錯誤
test_plan_schedule=測試計劃-定時任務
test_plan_schedule=測試計劃-定時任務
test_plan_default_functional_collection_name=基本功能點
test_plan_default_api_collection_name=單接口驗證
test_plan_default_scenario_collection_name=業務流程驗證

2
backend/services/system-setting/src/main/java/io/metersphere/system/config/interceptor/TestPlanInterceptor.java
View File

@ -1,6 +1,5 @@
package io.metersphere.system.config.interceptor;
import io.metersphere.plan.domain.TestPlanAllocation;
import io.metersphere.plan.domain.TestPlanCaseExecuteHistory;
import io.metersphere.sdk.util.CompressUtils;
import io.metersphere.system.utils.MybatisInterceptorConfig;
@ -16,7 +15,6 @@ public class TestPlanInterceptor {
public List<MybatisInterceptorConfig> tstPlanCompressConfigs() {
List<MybatisInterceptorConfig> configList = new ArrayList<>();
configList.add(new MybatisInterceptorConfig(TestPlanAllocation.class, "runModeConfig", CompressUtils.class, "zip", "unzip"));
configList.add(new MybatisInterceptorConfig(TestPlanCaseExecuteHistory.class, "content", CompressUtils.class, "zip", "unzip"));
configList.add(new MybatisInterceptorConfig(TestPlanCaseExecuteHistory.class, "steps", CompressUtils.class, "zip", "unzip"));

14
backend/services/test-plan/src/main/java/io/metersphere/plan/dto/TestPlanCollectionDTO.java Normal file
View File

@ -0,0 +1,14 @@
package io.metersphere.plan.dto;
import io.metersphere.plan.domain.TestPlanCollection;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.List;
@Data
public class TestPlanCollectionDTO extends TestPlanCollection {
@Schema(description = "测试子集")
private List<TestPlanCollectionDTO> children;
}

14
backend/services/test-plan/src/main/java/io/metersphere/plan/enums/RetryType.java Normal file
View File

@ -0,0 +1,14 @@
package io.metersphere.plan.enums;
public enum RetryType {
/**
* 步骤
*/
STEP,
/**
* 场景
*/
SCENARIO
}

83
backend/services/test-plan/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -1,11 +1,16 @@
package io.metersphere.plan.service;
import io.metersphere.plan.domain.*;
import io.metersphere.plan.dto.TestPlanCollectionDTO;
import io.metersphere.plan.dto.request.*;
import io.metersphere.plan.dto.response.TestPlanDetailResponse;
import io.metersphere.plan.dto.response.TestPlanOperationResponse;
import io.metersphere.plan.enums.ExecuteMethod;
import io.metersphere.plan.enums.RetryType;
import io.metersphere.plan.job.TestPlanScheduleJob;
import io.metersphere.plan.mapper.*;
import io.metersphere.project.request.ProjectApplicationRequest;
import io.metersphere.project.service.ProjectApplicationService;
import io.metersphere.sdk.constants.*;
import io.metersphere.sdk.exception.MSException;
import io.metersphere.sdk.util.BeanUtils;
@ -66,8 +71,6 @@ public class TestPlanService extends TestPlanBaseUtilsService {
@Resource
private TestPlanFollowerMapper testPlanFollowerMapper;
@Resource
private TestPlanAllocationMapper testPlanAllocationMapper;
@Resource
private TestPlanBatchOperationService testPlanBatchOperationService;
@Resource
private TestPlanBatchArchivedService testPlanBatchArchivedService;
@ -87,6 +90,10 @@ public class TestPlanService extends TestPlanBaseUtilsService {
private TestPlanCaseExecuteHistoryMapper testPlanCaseExecuteHistoryMapper;
@Resource
private ScheduleService scheduleService;
@Resource
private ProjectApplicationService projectApplicationService;
@Resource
private TestPlanCollectionMapper testPlanCollectionMapper;
private static final int MAX_TAG_SIZE = 10;
@ -270,10 +277,6 @@ public class TestPlanService extends TestPlanBaseUtilsService {
testPlanFollowerExample.createCriteria().andTestPlanIdIn(testPlanIds);
testPlanFollowerMapper.deleteByExample(testPlanFollowerExample);
TestPlanAllocationExample allocationExample = new TestPlanAllocationExample();
allocationExample.createCriteria().andTestPlanIdIn(testPlanIds);
testPlanAllocationMapper.deleteByExample(allocationExample);
TestPlanCaseExecuteHistoryExample historyExample = new TestPlanCaseExecuteHistoryExample();
historyExample.createCriteria().andTestPlanIdIn(testPlanIds);
testPlanCaseExecuteHistoryMapper.deleteByExample(historyExample);
@ -737,4 +740,72 @@ public class TestPlanService extends TestPlanBaseUtilsService {
example.setOrderByClause("pos asc");
return testPlanMapper.selectByExample(example);
}
/**
* 初始化测试规划默认节点
*
* @param planId 计划ID
* @param currentUser 当前用户
*/
public List<TestPlanCollectionDTO> initDefaultPlanCollection(String planId, String currentUser) {
List<TestPlanCollectionDTO> collectionDTOS = new ArrayList<>();
// 获取项目下默认资源池
TestPlan testPlan = testPlanMapper.selectByPrimaryKey(planId);
ProjectApplicationRequest projectApplicationRequest = new ProjectApplicationRequest();
projectApplicationRequest.setProjectId(testPlan.getProjectId());
projectApplicationRequest.setType("apiTest");
Map<String, Object> configMap = projectApplicationService.get(projectApplicationRequest, Arrays.stream(ProjectApplicationType.API.values()).map(ProjectApplicationType.API::name).collect(Collectors.toList()));
// 批量插入测试集
List<TestPlanCollection> collections = new ArrayList<>();
TestPlanCollection defaultCollection = new TestPlanCollection();
defaultCollection.setTestPlanId(planId);
defaultCollection.setExecuteMethod(ExecuteMethod.SERIAL.name());
defaultCollection.setExtended(true);
defaultCollection.setGrouped(false);
defaultCollection.setEnvironmentId("NONE");
defaultCollection.setTestResourcePoolId(configMap.getOrDefault(ProjectApplicationType.API.API_RESOURCE_POOL_ID.name(), StringUtils.EMPTY).toString());
defaultCollection.setRetryOnFail(false);
defaultCollection.setRetryType(RetryType.STEP.name());
defaultCollection.setRetryTimes(10);
defaultCollection.setRetryInterval(1);
defaultCollection.setStopOnFail(false);
defaultCollection.setCreateUser(currentUser);
defaultCollection.setCreateTime(System.currentTimeMillis());
Long initPos = 1L;
for (CaseType caseType : CaseType.values()) {
// 测试集分类
TestPlanCollectionDTO parentCollectionDTO = new TestPlanCollectionDTO();
TestPlanCollection parentCollection = new TestPlanCollection();
BeanUtils.copyBean(parentCollection, defaultCollection);
parentCollection.setId(IDGenerator.nextStr());
parentCollection.setParentId("NONE");
parentCollection.setName(caseType.getType());
parentCollection.setType(caseType.getKey());
parentCollection.setPos(initPos << 12);
collections.add(parentCollection);
BeanUtils.copyBean(parentCollectionDTO, parentCollection);
// 测试集
TestPlanCollectionDTO childCollectionDTO = new TestPlanCollectionDTO();
TestPlanCollection childCollection = new TestPlanCollection();
BeanUtils.copyBean(childCollection, defaultCollection);
childCollection.setId(IDGenerator.nextStr());
childCollection.setParentId(parentCollection.getId());
childCollection.setName(caseType.getPlanDefaultCollection());
childCollection.setType(caseType.getKey());
childCollection.setPos(1L << 12);
collections.add(childCollection);
BeanUtils.copyBean(childCollectionDTO, childCollection);
parentCollectionDTO.setChildren(List.of(childCollectionDTO));
// 更新pos
initPos ++;
collectionDTOS.add(parentCollectionDTO);
}
testPlanCollectionMapper.batchInsertSelective(collections, TestPlanCollection.Column.id, TestPlanCollection.Column.testPlanId,
TestPlanCollection.Column.parentId, TestPlanCollection.Column.name, TestPlanCollection.Column.type, TestPlanCollection.Column.testResourcePoolId,
TestPlanCollection.Column.createUser, TestPlanCollection.Column.createTime, TestPlanCollection.Column.pos);
return collectionDTOS;
}
}

6
backend/services/test-plan/src/test/java/io/metersphere/plan/controller/TestPlanTests.java
View File

@ -2235,4 +2235,10 @@ public class TestPlanTests extends BaseTest {
request.setSelectIds(Arrays.asList("wx_test_plan_id_1"));
this.requestPostWithOk(URL_TEST_PLAN_BATCH_EDIT, request);
}
@Test
@Order(308)
void testInitDefaultCollection() {
testPlanService.initDefaultPlanCollection("init_plan_id", "admin");
}
}

6
backend/services/test-plan/src/test/java/io/metersphere/plan/service/TestPlanTestService.java
View File

@ -47,8 +47,6 @@ public class TestPlanTestService {
@Resource
private TestPlanFollowerMapper testPlanFollowerMapper;
@Resource
private TestPlanAllocationMapper testPlanAllocationMapper;
@Resource
private TestPlanReportMapper testPlanReportMapper;
@Resource
private TestPlanFunctionalCaseMapper testPlanFunctionalCaseMapper;
@ -428,10 +426,6 @@ public class TestPlanTestService {
testPlanFollowerExample.createCriteria().andTestPlanIdIn(subList);
Assertions.assertEquals(testPlanFollowerMapper.countByExample(testPlanFollowerExample), 0);
TestPlanAllocationExample testPlanAllocationExample = new TestPlanAllocationExample();
testPlanAllocationExample.createCriteria().andTestPlanIdIn(subList);
Assertions.assertEquals(testPlanAllocationMapper.countByExample(testPlanAllocationExample), 0);
TestPlanReportExample testPlanReportExample = new TestPlanReportExample();
testPlanReportExample.createCriteria().andTestPlanIdIn(subList);
Assertions.assertEquals(testPlanReportMapper.countByExample(testPlanReportExample), 0);

6
backend/services/test-plan/src/test/resources/dml/init_test_plan_api_case.sql
View File

@ -34,10 +34,10 @@ VALUES
('wxxx_2', 'wxxx_1', 'wxxx_api_case_2', '1', NULL, NULL, 'admin', 1716370415311, 'admin', 2, 'wxxx_2', 1716370415311),
('wxxx_3', 'wxxx_2', 'wxxx_api_case_3', '1', NULL, NULL, 'admin', 1716370415311, 'admin', 2, 'wxxx_2', 1716370415311);
INSERT INTO `test_plan_collection`(`id`, `test_plan_id`, `test_collection_type_id`, `name`, `execute_method`, `grouped`, `environment_id`, `pos`, `create_user`, `create_time`)
INSERT INTO `test_plan_collection`(`id`, `test_plan_id`, `name`, `type`, `environment_id`, `test_resource_pool_id`, `pos`, `create_user`, `create_time`)
VALUES
('wxxx_1', 'wxxx_1', 'wxxx_1', '123', 'wx', b'0', 'NONE', 2, 'admin', 1716370415311),
('wxxx_2', 'wxxx_1', 'wxxx_2', '12223', 'wx', b'0', '123', 2, 'admin', 1716370415311);
('wxxx_1', 'wxxx_1', 'wxxx_1', 'API', 'NONE', 'NONE', 1, 'admin', 1716370415311),
('wxxx_2', 'wxxx_1', 'wxxx_2', 'API', '123', 'NONE', 2, 'admin', 1716370415311);

10
backend/services/test-plan/src/test/resources/dml/init_test_plan_test.sql
View File

@ -50,11 +50,6 @@ VALUES
('wx_test_plan_id_7', b'0', b'0', 100);
INSERT INTO `test_plan_allocation`(`id`, `test_plan_id`, `test_resource_pool_id`, `retry_on_fail`, `retry_type`, `retry_times`, `retry_interval`, `stop_on_fail`)
VALUES ('1', 'wx_test_plan_id_1', '111', b'0', 'scenario', '10', '1000', b'0');
INSERT INTO functional_case(id, num, module_id, project_id, template_id, name, review_status, tags, case_edit_type, pos, version_id, ref_id, last_execute_result, deleted, public_case, latest, create_user, update_user, delete_user, create_time, update_time, delete_time)
VALUES ('my_test_1', 1, '1', 'songtianyang-fix-wx', '100001', '1111', 'UN_REVIEWED', NULL, 'TEXT', 55000, 'v3.0.0',
'TEST_FUNCTIONAL_MINDER_CASE_ID_7', 'UN_EXECUTED', b'0', b'0', b'1', 'admin', 'admin', '', 1698058347559,
@ -66,3 +61,8 @@ VALUES ('my_test_1', 1, '1', 'songtianyang-fix-wx', '100001', '1111', 'UN_REVIEW
'TEST_FUNCTIONAL_MINDER_CASE_ID_7', 'UN_EXECUTED', b'0', b'0', b'1', 'admin', 'admin', '', 1698058347559,
1698058347559, NULL);
-- 初始化计划默认节点
INSERT INTO `test_plan`(`id`, `num`, `project_id`, `group_id`, `module_id`, `name`, `status`, `type`, `tags`, `create_time`, `create_user`, `update_time`, `update_user`, `planned_start_time`, `planned_end_time`, `actual_start_time`, `actual_end_time`, `description`)
VALUES ('init_plan_id', 5000, 'init_project', 'NONE', '1', '测试一下计划', 'PREPARED', 'TEST_PLAN', NULL,
unix_timestamp() * 1000, 'admin', unix_timestamp() * 1000, 'admin', unix_timestamp() * 1000, unix_timestamp() * 1000, unix_timestamp() * 1000, unix_timestamp() * 1000, '11');