From 666fce56a49eade1129b8ca7db9b9c53cff4f738 Mon Sep 17 00:00:00 2001 From: WangXu10 Date: Thu, 7 Sep 2023 15:37:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=AF=AF=E6=8A=A5=E5=BA=93?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/project/domain/FakeError.java | 52 ++- .../project/domain/FakeErrorBlob.java | 98 ----- .../project/domain/FakeErrorBlobExample.java | 270 ------------- .../project/domain/FakeErrorExample.java | 370 ++++++++++++++---- .../project/mapper/FakeErrorBlobMapper.java | 38 -- .../project/mapper/FakeErrorBlobMapper.xml | 243 ------------ .../project/mapper/FakeErrorMapper.xml | 161 +++++--- .../ddl/V3.0.0_4__project_management.sql | 22 +- .../interceptor/ProjectInterceptor.java | 3 - .../resources/i18n/project_en_US.properties | 11 + .../resources/i18n/project_zh_CN.properties | 11 + .../resources/i18n/project_zh_TW.properties | 11 + 12 files changed, 477 insertions(+), 813 deletions(-) delete mode 100644 backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java delete mode 100644 backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java delete mode 100644 backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java delete mode 100644 backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java index 6ebbd1038c..3288fdd34e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeError.java @@ -1,8 +1,10 @@ package io.metersphere.project.domain; -import io.metersphere.validation.groups.*; +import io.metersphere.validation.groups.Created; +import io.metersphere.validation.groups.Updated; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -20,6 +22,11 @@ public class FakeError implements Serializable { @Size(min = 1, max = 50, message = "{fake_error.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; + @Schema(description = "误报名称", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{fake_error.name.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 255, message = "{fake_error.name.length_range}", groups = {Created.class, Updated.class}) + private String name; + @Schema(description = "创建时间") private Long createTime; @@ -32,31 +39,46 @@ public class FakeError implements Serializable { @Schema(description = "更新人") private String updateUser; - @Schema(description = "错误码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{fake_error.error_code.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 255, message = "{fake_error.error_code.length_range}", groups = {Created.class, Updated.class}) - private String errorCode; + @Schema(description = "匹配类型/文本内容", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{fake_error.type.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 20, message = "{fake_error.type.length_range}", groups = {Created.class, Updated.class}) + private String type; - @Schema(description = "匹配类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{fake_error.match_type.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 255, message = "{fake_error.match_type.length_range}", groups = {Created.class, Updated.class}) - private String matchType; + @Schema(description = "响应内容类型/header/data/body", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{fake_error.resp_type.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 20, message = "{fake_error.resp_type.length_range}", groups = {Created.class, Updated.class}) + private String respType; - @Schema(description = "状态") - private Boolean status; + @Schema(description = "操作类型/大于/等于/小于", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{fake_error.relation.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 20, message = "{fake_error.relation.length_range}", groups = {Created.class, Updated.class}) + private String relation; + + @Schema(description = "表达式", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{fake_error.expression.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 255, message = "{fake_error.expression.length_range}", groups = {Created.class, Updated.class}) + private String expression; + + @Schema(description = "启用/禁用", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{fake_error.enable.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 1, message = "{fake_error.enable.length_range}", groups = {Created.class, Updated.class}) + private Boolean enable; private static final long serialVersionUID = 1L; public enum Column { id("id", "id", "VARCHAR", false), projectId("project_id", "projectId", "VARCHAR", false), + name("name", "name", "VARCHAR", true), createTime("create_time", "createTime", "BIGINT", false), updateTime("update_time", "updateTime", "BIGINT", false), createUser("create_user", "createUser", "VARCHAR", false), updateUser("update_user", "updateUser", "VARCHAR", false), - errorCode("error_code", "errorCode", "VARCHAR", false), - matchType("match_type", "matchType", "VARCHAR", false), - status("status", "status", "BIT", true); + type("type", "type", "VARCHAR", true), + respType("resp_type", "respType", "VARCHAR", false), + relation("relation", "relation", "VARCHAR", false), + expression("expression", "expression", "VARCHAR", false), + enable("enable", "enable", "BIT", true); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java deleted file mode 100644 index c1ee558f72..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java +++ /dev/null @@ -1,98 +0,0 @@ -package io.metersphere.project.domain; - -import io.metersphere.validation.groups.*; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.*; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import lombok.Data; - -@Data -public class FakeErrorBlob implements Serializable { - @Schema(description = "Test ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{fake_error_blob.id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{fake_error_blob.id.length_range}", groups = {Created.class, Updated.class}) - private String id; - - @Schema(description = "内容") - private byte[] content; - - @Schema(description = "报告内容") - private byte[] description; - - private static final long serialVersionUID = 1L; - - public enum Column { - id("id", "id", "VARCHAR", false), - content("content", "content", "LONGVARBINARY", false), - description("description", "description", "LONGVARBINARY", 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 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(); - } - } -} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java deleted file mode 100644 index 52786985a8..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java +++ /dev/null @@ -1,270 +0,0 @@ -package io.metersphere.project.domain; - -import java.util.ArrayList; -import java.util.List; - -public class FakeErrorBlobExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public FakeErrorBlobExample() { - oredCriteria = new ArrayList(); - } - - 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 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 criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List 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 values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List 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 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); - } - } -} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorExample.java index deacade00f..5cbd93d360 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorExample.java @@ -244,6 +244,76 @@ public class FakeErrorExample { 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 values) { + addCriterion("`name` in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List 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 andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; @@ -504,203 +574,343 @@ public class FakeErrorExample { return (Criteria) this; } - public Criteria andErrorCodeIsNull() { - addCriterion("error_code is null"); + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); return (Criteria) this; } - public Criteria andErrorCodeIsNotNull() { - addCriterion("error_code is not null"); + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); return (Criteria) this; } - public Criteria andErrorCodeEqualTo(String value) { - addCriterion("error_code =", value, "errorCode"); + public Criteria andTypeEqualTo(String value) { + addCriterion("`type` =", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeNotEqualTo(String value) { - addCriterion("error_code <>", value, "errorCode"); + public Criteria andTypeNotEqualTo(String value) { + addCriterion("`type` <>", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeGreaterThan(String value) { - addCriterion("error_code >", value, "errorCode"); + public Criteria andTypeGreaterThan(String value) { + addCriterion("`type` >", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeGreaterThanOrEqualTo(String value) { - addCriterion("error_code >=", value, "errorCode"); + public Criteria andTypeGreaterThanOrEqualTo(String value) { + addCriterion("`type` >=", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeLessThan(String value) { - addCriterion("error_code <", value, "errorCode"); + public Criteria andTypeLessThan(String value) { + addCriterion("`type` <", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeLessThanOrEqualTo(String value) { - addCriterion("error_code <=", value, "errorCode"); + public Criteria andTypeLessThanOrEqualTo(String value) { + addCriterion("`type` <=", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeLike(String value) { - addCriterion("error_code like", value, "errorCode"); + public Criteria andTypeLike(String value) { + addCriterion("`type` like", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeNotLike(String value) { - addCriterion("error_code not like", value, "errorCode"); + public Criteria andTypeNotLike(String value) { + addCriterion("`type` not like", value, "type"); return (Criteria) this; } - public Criteria andErrorCodeIn(List values) { - addCriterion("error_code in", values, "errorCode"); + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); return (Criteria) this; } - public Criteria andErrorCodeNotIn(List values) { - addCriterion("error_code not in", values, "errorCode"); + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); return (Criteria) this; } - public Criteria andErrorCodeBetween(String value1, String value2) { - addCriterion("error_code between", value1, value2, "errorCode"); + public Criteria andTypeBetween(String value1, String value2) { + addCriterion("`type` between", value1, value2, "type"); return (Criteria) this; } - public Criteria andErrorCodeNotBetween(String value1, String value2) { - addCriterion("error_code not between", value1, value2, "errorCode"); + public Criteria andTypeNotBetween(String value1, String value2) { + addCriterion("`type` not between", value1, value2, "type"); return (Criteria) this; } - public Criteria andMatchTypeIsNull() { - addCriterion("match_type is null"); + public Criteria andRespTypeIsNull() { + addCriterion("resp_type is null"); return (Criteria) this; } - public Criteria andMatchTypeIsNotNull() { - addCriterion("match_type is not null"); + public Criteria andRespTypeIsNotNull() { + addCriterion("resp_type is not null"); return (Criteria) this; } - public Criteria andMatchTypeEqualTo(String value) { - addCriterion("match_type =", value, "matchType"); + public Criteria andRespTypeEqualTo(String value) { + addCriterion("resp_type =", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeNotEqualTo(String value) { - addCriterion("match_type <>", value, "matchType"); + public Criteria andRespTypeNotEqualTo(String value) { + addCriterion("resp_type <>", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeGreaterThan(String value) { - addCriterion("match_type >", value, "matchType"); + public Criteria andRespTypeGreaterThan(String value) { + addCriterion("resp_type >", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeGreaterThanOrEqualTo(String value) { - addCriterion("match_type >=", value, "matchType"); + public Criteria andRespTypeGreaterThanOrEqualTo(String value) { + addCriterion("resp_type >=", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeLessThan(String value) { - addCriterion("match_type <", value, "matchType"); + public Criteria andRespTypeLessThan(String value) { + addCriterion("resp_type <", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeLessThanOrEqualTo(String value) { - addCriterion("match_type <=", value, "matchType"); + public Criteria andRespTypeLessThanOrEqualTo(String value) { + addCriterion("resp_type <=", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeLike(String value) { - addCriterion("match_type like", value, "matchType"); + public Criteria andRespTypeLike(String value) { + addCriterion("resp_type like", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeNotLike(String value) { - addCriterion("match_type not like", value, "matchType"); + public Criteria andRespTypeNotLike(String value) { + addCriterion("resp_type not like", value, "respType"); return (Criteria) this; } - public Criteria andMatchTypeIn(List values) { - addCriterion("match_type in", values, "matchType"); + public Criteria andRespTypeIn(List values) { + addCriterion("resp_type in", values, "respType"); return (Criteria) this; } - public Criteria andMatchTypeNotIn(List values) { - addCriterion("match_type not in", values, "matchType"); + public Criteria andRespTypeNotIn(List values) { + addCriterion("resp_type not in", values, "respType"); return (Criteria) this; } - public Criteria andMatchTypeBetween(String value1, String value2) { - addCriterion("match_type between", value1, value2, "matchType"); + public Criteria andRespTypeBetween(String value1, String value2) { + addCriterion("resp_type between", value1, value2, "respType"); return (Criteria) this; } - public Criteria andMatchTypeNotBetween(String value1, String value2) { - addCriterion("match_type not between", value1, value2, "matchType"); + public Criteria andRespTypeNotBetween(String value1, String value2) { + addCriterion("resp_type not between", value1, value2, "respType"); return (Criteria) this; } - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); + public Criteria andRelationIsNull() { + addCriterion("relation is null"); return (Criteria) this; } - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); + public Criteria andRelationIsNotNull() { + addCriterion("relation is not null"); return (Criteria) this; } - public Criteria andStatusEqualTo(Boolean value) { - addCriterion("`status` =", value, "status"); + public Criteria andRelationEqualTo(String value) { + addCriterion("relation =", value, "relation"); return (Criteria) this; } - public Criteria andStatusNotEqualTo(Boolean value) { - addCriterion("`status` <>", value, "status"); + public Criteria andRelationNotEqualTo(String value) { + addCriterion("relation <>", value, "relation"); return (Criteria) this; } - public Criteria andStatusGreaterThan(Boolean value) { - addCriterion("`status` >", value, "status"); + public Criteria andRelationGreaterThan(String value) { + addCriterion("relation >", value, "relation"); return (Criteria) this; } - public Criteria andStatusGreaterThanOrEqualTo(Boolean value) { - addCriterion("`status` >=", value, "status"); + public Criteria andRelationGreaterThanOrEqualTo(String value) { + addCriterion("relation >=", value, "relation"); return (Criteria) this; } - public Criteria andStatusLessThan(Boolean value) { - addCriterion("`status` <", value, "status"); + public Criteria andRelationLessThan(String value) { + addCriterion("relation <", value, "relation"); return (Criteria) this; } - public Criteria andStatusLessThanOrEqualTo(Boolean value) { - addCriterion("`status` <=", value, "status"); + public Criteria andRelationLessThanOrEqualTo(String value) { + addCriterion("relation <=", value, "relation"); return (Criteria) this; } - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); + public Criteria andRelationLike(String value) { + addCriterion("relation like", value, "relation"); return (Criteria) this; } - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); + public Criteria andRelationNotLike(String value) { + addCriterion("relation not like", value, "relation"); return (Criteria) this; } - public Criteria andStatusBetween(Boolean value1, Boolean value2) { - addCriterion("`status` between", value1, value2, "status"); + public Criteria andRelationIn(List values) { + addCriterion("relation in", values, "relation"); return (Criteria) this; } - public Criteria andStatusNotBetween(Boolean value1, Boolean value2) { - addCriterion("`status` not between", value1, value2, "status"); + public Criteria andRelationNotIn(List values) { + addCriterion("relation not in", values, "relation"); + return (Criteria) this; + } + + public Criteria andRelationBetween(String value1, String value2) { + addCriterion("relation between", value1, value2, "relation"); + return (Criteria) this; + } + + public Criteria andRelationNotBetween(String value1, String value2) { + addCriterion("relation not between", value1, value2, "relation"); + return (Criteria) this; + } + + public Criteria andExpressionIsNull() { + addCriterion("expression is null"); + return (Criteria) this; + } + + public Criteria andExpressionIsNotNull() { + addCriterion("expression is not null"); + return (Criteria) this; + } + + public Criteria andExpressionEqualTo(String value) { + addCriterion("expression =", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionNotEqualTo(String value) { + addCriterion("expression <>", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionGreaterThan(String value) { + addCriterion("expression >", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionGreaterThanOrEqualTo(String value) { + addCriterion("expression >=", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionLessThan(String value) { + addCriterion("expression <", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionLessThanOrEqualTo(String value) { + addCriterion("expression <=", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionLike(String value) { + addCriterion("expression like", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionNotLike(String value) { + addCriterion("expression not like", value, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionIn(List values) { + addCriterion("expression in", values, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionNotIn(List values) { + addCriterion("expression not in", values, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionBetween(String value1, String value2) { + addCriterion("expression between", value1, value2, "expression"); + return (Criteria) this; + } + + public Criteria andExpressionNotBetween(String value1, String value2) { + addCriterion("expression not between", value1, value2, "expression"); + return (Criteria) this; + } + + public Criteria andEnableIsNull() { + addCriterion("`enable` is null"); + return (Criteria) this; + } + + public Criteria andEnableIsNotNull() { + addCriterion("`enable` is not null"); + return (Criteria) this; + } + + public Criteria andEnableEqualTo(Boolean value) { + addCriterion("`enable` =", value, "enable"); + return (Criteria) this; + } + + public Criteria andEnableNotEqualTo(Boolean value) { + addCriterion("`enable` <>", value, "enable"); + return (Criteria) this; + } + + public Criteria andEnableGreaterThan(Boolean value) { + addCriterion("`enable` >", value, "enable"); + return (Criteria) this; + } + + public Criteria andEnableGreaterThanOrEqualTo(Boolean value) { + addCriterion("`enable` >=", value, "enable"); + return (Criteria) this; + } + + public Criteria andEnableLessThan(Boolean value) { + addCriterion("`enable` <", value, "enable"); + return (Criteria) this; + } + + public Criteria andEnableLessThanOrEqualTo(Boolean value) { + addCriterion("`enable` <=", value, "enable"); + return (Criteria) this; + } + + public Criteria andEnableIn(List values) { + addCriterion("`enable` in", values, "enable"); + return (Criteria) this; + } + + public Criteria andEnableNotIn(List values) { + addCriterion("`enable` not in", values, "enable"); + return (Criteria) this; + } + + public Criteria andEnableBetween(Boolean value1, Boolean value2) { + addCriterion("`enable` between", value1, value2, "enable"); + return (Criteria) this; + } + + public Criteria andEnableNotBetween(Boolean value1, Boolean value2) { + addCriterion("`enable` not between", value1, value2, "enable"); return (Criteria) this; } } diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java deleted file mode 100644 index 7df42ba6b4..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.metersphere.project.mapper; - -import io.metersphere.project.domain.FakeErrorBlob; -import io.metersphere.project.domain.FakeErrorBlobExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface FakeErrorBlobMapper { - long countByExample(FakeErrorBlobExample example); - - int deleteByExample(FakeErrorBlobExample example); - - int deleteByPrimaryKey(String id); - - int insert(FakeErrorBlob record); - - int insertSelective(FakeErrorBlob record); - - List selectByExampleWithBLOBs(FakeErrorBlobExample example); - - List selectByExample(FakeErrorBlobExample example); - - FakeErrorBlob selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") FakeErrorBlob record, @Param("example") FakeErrorBlobExample example); - - int updateByExampleWithBLOBs(@Param("record") FakeErrorBlob record, @Param("example") FakeErrorBlobExample example); - - int updateByExample(@Param("record") FakeErrorBlob record, @Param("example") FakeErrorBlobExample example); - - int updateByPrimaryKeySelective(FakeErrorBlob record); - - int updateByPrimaryKeyWithBLOBs(FakeErrorBlob record); - - int batchInsert(@Param("list") List list); - - int batchInsertSelective(@Param("list") List list, @Param("selective") FakeErrorBlob.Column ... selective); -} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml deleted file mode 100644 index fae0f1d902..0000000000 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - id - - - content, description - - - - - - delete from fake_error_blob - where id = #{id,jdbcType=VARCHAR} - - - delete from fake_error_blob - - - - - - insert into fake_error_blob (id, content, description - ) - values (#{id,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, #{description,jdbcType=LONGVARBINARY} - ) - - - insert into fake_error_blob - - - id, - - - content, - - - description, - - - - - #{id,jdbcType=VARCHAR}, - - - #{content,jdbcType=LONGVARBINARY}, - - - #{description,jdbcType=LONGVARBINARY}, - - - - - - update fake_error_blob - - - id = #{record.id,jdbcType=VARCHAR}, - - - content = #{record.content,jdbcType=LONGVARBINARY}, - - - description = #{record.description,jdbcType=LONGVARBINARY}, - - - - - - - - update fake_error_blob - set id = #{record.id,jdbcType=VARCHAR}, - content = #{record.content,jdbcType=LONGVARBINARY}, - description = #{record.description,jdbcType=LONGVARBINARY} - - - - - - update fake_error_blob - set id = #{record.id,jdbcType=VARCHAR} - - - - - - update fake_error_blob - - - content = #{content,jdbcType=LONGVARBINARY}, - - - description = #{description,jdbcType=LONGVARBINARY}, - - - where id = #{id,jdbcType=VARCHAR} - - - update fake_error_blob - set content = #{content,jdbcType=LONGVARBINARY}, - description = #{description,jdbcType=LONGVARBINARY} - where id = #{id,jdbcType=VARCHAR} - - - insert into fake_error_blob - (id, content, description) - values - - (#{item.id,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY}, #{item.description,jdbcType=LONGVARBINARY} - ) - - - - insert into fake_error_blob ( - - ${column.escapedColumnName} - - ) - values - - ( - - - #{item.id,jdbcType=VARCHAR} - - - #{item.content,jdbcType=LONGVARBINARY} - - - #{item.description,jdbcType=LONGVARBINARY} - - - ) - - - \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorMapper.xml index ded6d6feb8..c9ca263495 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorMapper.xml @@ -4,13 +4,16 @@ + - - - + + + + + @@ -71,8 +74,8 @@ - id, project_id, create_time, update_time, create_user, update_user, error_code, match_type, - `status` + id, project_id, `name`, create_time, update_time, create_user, update_user, `type`, + resp_type, relation, expression, `enable`