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

build: 调整模块校验规则

This commit is contained in:
fit2-zhao 2023-05-31 17:58:18 +08:00 committed by fit2-zhao
parent e3714c7c7a
commit 8d76232722
41 changed files with 405 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinition.java
View File

@ -4,10 +4,12 @@ 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 java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
@Data
public class ApiDefinition implements Serializable {
@Schema(title = "接口pk", requiredMode = Schema.RequiredMode.REQUIRED)
@ -18,13 +20,13 @@ public class ApiDefinition implements Serializable {
@Schema(title = "创建时间")
private Long createTime;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "修改时间")
private Long updateTime;
@Schema(title = "修改人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "修改人")
private String updateUser;
@Schema(title = "删除人")
@ -34,8 +36,7 @@ public class ApiDefinition implements Serializable {
private Long deleteTime;
@Schema(title = "删除状态", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition.deleted.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_definition.deleted.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition.deleted.not_blank}", groups = {Created.class})
private Boolean deleted;
@Schema(title = "接口名称", requiredMode = Schema.RequiredMode.REQUIRED)
@ -74,13 +75,11 @@ public class ApiDefinition implements Serializable {
private String tags;
@Schema(title = "自定义排序", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition.pos.not_blank}", groups = {Created.class})
@Size(min = 1, max = 19, message = "{api_definition.pos.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition.pos.not_blank}", groups = {Created.class})
private Long pos;
@Schema(title = "是否启用同步", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition.sync_enable.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_definition.sync_enable.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition.sync_enable.not_blank}", groups = {Created.class})
private Boolean syncEnable;
@Schema(title = "同步开始时间")
@ -95,8 +94,7 @@ public class ApiDefinition implements Serializable {
private String environmentId;
@Schema(title = "是否为最新版本 0:否，1:是", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition.latest.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_definition.latest.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition.latest.not_blank}", groups = {Created.class})
private Boolean latest;
@Schema(title = "版本fk")

3
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionBlob.java
View File

@ -5,9 +5,10 @@ import io.metersphere.validation.groups.Updated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
@Data
public class ApiDefinitionBlob implements Serializable {
@Schema(title = "接口fk/ 一对一关系", requiredMode = Schema.RequiredMode.REQUIRED)

24
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionFollow.java
View File

@ -1,24 +0,0 @@
package io.metersphere.api.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.Size;
import java.io.Serializable;
import lombok.Data;
@Data
public class ApiDefinitionFollow implements Serializable {
@Schema(title = "接口fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_follow.api_definition_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_definition_follow.api_definition_id.length_range}", groups = {Created.class, Updated.class})
private String apiDefinitionId;
@Schema(title = "关注人/用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_follow.follow_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_definition_follow.follow_id.length_range}", groups = {Created.class, Updated.class})
private String followId;
private static final long serialVersionUID = 1L;
}

22
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionFollower.java Normal file
View File

@ -0,0 +1,22 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@Data
public class ApiDefinitionFollower implements Serializable {
@Schema(title = "接口fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_follower.api_definition_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_definition_follower.api_definition_id.length_range}", groups = {Created.class, Updated.class})
private String apiDefinitionId;
@Schema(title = "关注人/用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_follower.user_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_definition_follower.user_id.length_range}", groups = {Created.class, Updated.class})
private String userId;
private static final long serialVersionUID = 1L;
}

60
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionFollowExample.java → backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionFollowerExample.java
View File

@ -3,14 +3,14 @@ package io.metersphere.api.domain;
import java.util.ArrayList;
import java.util.List;
public class ApiDefinitionFollowExample {
public class ApiDefinitionFollowerExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public ApiDefinitionFollowExample() {
public ApiDefinitionFollowerExample() {
oredCriteria = new ArrayList<Criteria>();
}
@ -174,73 +174,73 @@ public class ApiDefinitionFollowExample {
return (Criteria) this;
}
public Criteria andFollowIdIsNull() {
addCriterion("follow_id is null");
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andFollowIdIsNotNull() {
addCriterion("follow_id is not null");
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andFollowIdEqualTo(String value) {
addCriterion("follow_id =", value, "followId");
public Criteria andUserIdEqualTo(String value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotEqualTo(String value) {
addCriterion("follow_id <>", value, "followId");
public Criteria andUserIdNotEqualTo(String value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdGreaterThan(String value) {
addCriterion("follow_id >", value, "followId");
public Criteria andUserIdGreaterThan(String value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
addCriterion("follow_id >=", value, "followId");
public Criteria andUserIdGreaterThanOrEqualTo(String value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLessThan(String value) {
addCriterion("follow_id <", value, "followId");
public Criteria andUserIdLessThan(String value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLessThanOrEqualTo(String value) {
addCriterion("follow_id <=", value, "followId");
public Criteria andUserIdLessThanOrEqualTo(String value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLike(String value) {
addCriterion("follow_id like", value, "followId");
public Criteria andUserIdLike(String value) {
addCriterion("user_id like", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotLike(String value) {
addCriterion("follow_id not like", value, "followId");
public Criteria andUserIdNotLike(String value) {
addCriterion("user_id not like", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdIn(List<String> values) {
addCriterion("follow_id in", values, "followId");
public Criteria andUserIdIn(List<String> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotIn(List<String> values) {
addCriterion("follow_id not in", values, "followId");
public Criteria andUserIdNotIn(List<String> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andFollowIdBetween(String value1, String value2) {
addCriterion("follow_id between", value1, value2, "followId");
public Criteria andUserIdBetween(String value1, String value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotBetween(String value1, String value2) {
addCriterion("follow_id not between", value1, value2, "followId");
public Criteria andUserIdNotBetween(String value1, String value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
}

9
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMock.java
View File

@ -4,10 +4,12 @@ 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 java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
@Data
public class ApiDefinitionMock implements Serializable {
@Schema(title = "mock pk", requiredMode = Schema.RequiredMode.REQUIRED)
@ -27,7 +29,7 @@ public class ApiDefinitionMock implements Serializable {
@Schema(title = "修改时间")
private Long updateTime;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "mock 名称", requiredMode = Schema.RequiredMode.REQUIRED)
@ -39,8 +41,7 @@ public class ApiDefinitionMock implements Serializable {
private String tags;
@Schema(title = "启用/禁用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_mock.enable.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_definition_mock.enable.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition_mock.enable.not_blank}", groups = {Created.class})
private Boolean enable;
@Schema(title = "mock编号", requiredMode = Schema.RequiredMode.REQUIRED)

3
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMockConfig.java
View File

@ -5,9 +5,10 @@ import io.metersphere.validation.groups.Updated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
@Data
public class ApiDefinitionMockConfig implements Serializable {
@Schema(title = "接口mock pk", requiredMode = Schema.RequiredMode.REQUIRED)

14
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionModule.java
View File

@ -4,10 +4,12 @@ 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 java.io.Serializable;
import lombok.Data;
import java.io.Serializable;
@Data
public class ApiDefinitionModule implements Serializable {
@Schema(title = "接口模块pk", requiredMode = Schema.RequiredMode.REQUIRED)
@ -21,10 +23,10 @@ public class ApiDefinitionModule implements Serializable {
@Schema(title = "修改时间")
private Long updateTime;
@Schema(title = "修改人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "修改人")
private String updateUser;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "模块名称", requiredMode = Schema.RequiredMode.REQUIRED)
@ -48,13 +50,11 @@ public class ApiDefinitionModule implements Serializable {
private String projectId;
@Schema(title = "树节点级别", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_module.level.not_blank}", groups = {Created.class})
@Size(min = 1, max = 10, message = "{api_definition_module.level.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition_module.level.not_blank}", groups = {Created.class})
private Integer level;
@Schema(title = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_definition_module.pos.not_blank}", groups = {Created.class})
@Size(min = 1, max = 10, message = "{api_definition_module.pos.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_definition_module.pos.not_blank}", groups = {Created.class})
private Integer pos;
private static final long serialVersionUID = 1L;

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionSwagger.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

8
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiEnvironmentConfig.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -21,7 +19,7 @@ public class ApiEnvironmentConfig implements Serializable {
@Schema(title = "修改时间")
private Long updateTime;
@Schema(title = "用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "用户fk")
private String createUser;
@Schema(title = "环境fk", requiredMode = Schema.RequiredMode.REQUIRED)

16
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReport.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -31,15 +29,14 @@ public class ApiReport implements Serializable {
@Schema(title = "修改时间")
private Long updateTime;
@Schema(title = "创建人fk", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人fk")
private String createUser;
@Schema(title = "修改人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "修改人")
private String updateUser;
@Schema(title = "删除状态", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_report.deleted.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_report.deleted.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_report.deleted.not_blank}", groups = {Created.class})
private Boolean deleted;
@Schema(title = "结果状态", requiredMode = Schema.RequiredMode.REQUIRED)
@ -82,8 +79,7 @@ public class ApiReport implements Serializable {
private String integratedReportId;
@Schema(title = "是否为集成报告，默认否", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_report.integrated.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_report.integrated.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_report.integrated.not_blank}", groups = {Created.class})
private Boolean integrated;
private static final long serialVersionUID = 1L;

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportBlob.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

25
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenario.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -20,7 +18,7 @@ public class ApiScenario implements Serializable {
@Size(min = 1, max = 255, message = "{api_scenario.name.length_range}", groups = {Created.class, Updated.class})
private String name;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "创建时间")
@ -32,7 +30,7 @@ public class ApiScenario implements Serializable {
@Schema(title = "删除人")
private String deleteUser;
@Schema(title = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "更新人")
private String updateUser;
@Schema(title = "更新时间")
@ -54,13 +52,11 @@ public class ApiScenario implements Serializable {
private String principal;
@Schema(title = "场景步骤总数", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario.step_total.not_blank}", groups = {Created.class})
@Size(min = 1, max = 10, message = "{api_scenario.step_total.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario.step_total.not_blank}", groups = {Created.class})
private Integer stepTotal;
@Schema(title = "通过率", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario.pass_rate.not_blank}", groups = {Created.class})
@Size(min = 1, max = 19, message = "{api_scenario.pass_rate.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario.pass_rate.not_blank}", groups = {Created.class})
private Long passRate;
@Schema(title = "最后一次执行的结果状态")
@ -73,13 +69,11 @@ public class ApiScenario implements Serializable {
private String customNum;
@Schema(title = "删除状态", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario.deleted.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_scenario.deleted.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario.deleted.not_blank}", groups = {Created.class})
private Boolean deleted;
@Schema(title = "自定义排序", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario.pos.not_blank}", groups = {Created.class})
@Size(min = 1, max = 19, message = "{api_scenario.pos.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario.pos.not_blank}", groups = {Created.class})
private Long pos;
@Schema(title = "版本fk")
@ -112,8 +106,7 @@ public class ApiScenario implements Serializable {
private String tags;
@Schema(title = "是否为环境组", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario.grouped.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_scenario.grouped.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario.grouped.not_blank}", groups = {Created.class})
private Boolean grouped;
private static final long serialVersionUID = 1L;

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioBlob.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioEnvironment.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

24
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioFollow.java
View File

@ -1,24 +0,0 @@
package io.metersphere.api.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.Size;
import java.io.Serializable;
import lombok.Data;
@Data
public class ApiScenarioFollow implements Serializable {
@Schema(title = "场景fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_follow.api_scenario_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_scenario_follow.api_scenario_id.length_range}", groups = {Created.class, Updated.class})
private String apiScenarioId;
@Schema(title = "关注人/用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_follow.follow_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_scenario_follow.follow_id.length_range}", groups = {Created.class, Updated.class})
private String followId;
private static final long serialVersionUID = 1L;
}

22
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioFollower.java Normal file
View File

@ -0,0 +1,22 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@Data
public class ApiScenarioFollower implements Serializable {
@Schema(title = "场景fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_follower.api_scenario_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_scenario_follower.api_scenario_id.length_range}", groups = {Created.class, Updated.class})
private String apiScenarioId;
@Schema(title = "关注人/用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_follower.user_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_scenario_follower.user_id.length_range}", groups = {Created.class, Updated.class})
private String userId;
private static final long serialVersionUID = 1L;
}

60
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioFollowExample.java → backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioFollowerExample.java
View File

@ -3,14 +3,14 @@ package io.metersphere.api.domain;
import java.util.ArrayList;
import java.util.List;
public class ApiScenarioFollowExample {
public class ApiScenarioFollowerExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public ApiScenarioFollowExample() {
public ApiScenarioFollowerExample() {
oredCriteria = new ArrayList<Criteria>();
}
@ -174,73 +174,73 @@ public class ApiScenarioFollowExample {
return (Criteria) this;
}
public Criteria andFollowIdIsNull() {
addCriterion("follow_id is null");
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andFollowIdIsNotNull() {
addCriterion("follow_id is not null");
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andFollowIdEqualTo(String value) {
addCriterion("follow_id =", value, "followId");
public Criteria andUserIdEqualTo(String value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotEqualTo(String value) {
addCriterion("follow_id <>", value, "followId");
public Criteria andUserIdNotEqualTo(String value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdGreaterThan(String value) {
addCriterion("follow_id >", value, "followId");
public Criteria andUserIdGreaterThan(String value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
addCriterion("follow_id >=", value, "followId");
public Criteria andUserIdGreaterThanOrEqualTo(String value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLessThan(String value) {
addCriterion("follow_id <", value, "followId");
public Criteria andUserIdLessThan(String value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLessThanOrEqualTo(String value) {
addCriterion("follow_id <=", value, "followId");
public Criteria andUserIdLessThanOrEqualTo(String value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLike(String value) {
addCriterion("follow_id like", value, "followId");
public Criteria andUserIdLike(String value) {
addCriterion("user_id like", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotLike(String value) {
addCriterion("follow_id not like", value, "followId");
public Criteria andUserIdNotLike(String value) {
addCriterion("user_id not like", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdIn(List<String> values) {
addCriterion("follow_id in", values, "followId");
public Criteria andUserIdIn(List<String> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotIn(List<String> values) {
addCriterion("follow_id not in", values, "followId");
public Criteria andUserIdNotIn(List<String> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andFollowIdBetween(String value1, String value2) {
addCriterion("follow_id between", value1, value2, "followId");
public Criteria andUserIdBetween(String value1, String value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotBetween(String value1, String value2) {
addCriterion("follow_id not between", value1, value2, "followId");
public Criteria andUserIdNotBetween(String value1, String value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
}

16
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioModule.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -21,13 +19,11 @@ public class ApiScenarioModule implements Serializable {
private String name;
@Schema(title = "模块级别", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_module.level.not_blank}", groups = {Created.class})
@Size(min = 1, max = 10, message = "{api_scenario_module.level.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario_module.level.not_blank}", groups = {Created.class})
private Integer level;
@Schema(title = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_module.pos.not_blank}", groups = {Created.class})
@Size(min = 1, max = 10, message = "{api_scenario_module.pos.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario_module.pos.not_blank}", groups = {Created.class})
private Integer pos;
@Schema(title = "创建时间")
@ -36,10 +32,10 @@ public class ApiScenarioModule implements Serializable {
@Schema(title = "更新时间")
private Long updateTime;
@Schema(title = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "更新人")
private String updateUser;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "项目fk", requiredMode = Schema.RequiredMode.REQUIRED)

8
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReference.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -23,7 +21,7 @@ public class ApiScenarioReference implements Serializable {
@Schema(title = "创建时间")
private Long createTime;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "引用步骤fk", requiredMode = Schema.RequiredMode.REQUIRED)

16
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReport.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -23,7 +21,7 @@ public class ApiScenarioReport implements Serializable {
@Schema(title = "创建时间")
private Long createTime;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "删除时间")
@ -33,11 +31,10 @@ public class ApiScenarioReport implements Serializable {
private String deleteUser;
@Schema(title = "删除标识", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_report.deleted.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_scenario_report.deleted.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario_report.deleted.not_blank}", groups = {Created.class})
private Boolean deleted;
@Schema(title = "修改人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "修改人")
private String updateUser;
@Schema(title = "更新时间")
@ -70,8 +67,7 @@ public class ApiScenarioReport implements Serializable {
private String versionId;
@Schema(title = "是否是集成报告", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_report.integrated.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_scenario_report.integrated.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_scenario_report.integrated.not_blank}", groups = {Created.class})
private Boolean integrated;
@Schema(title = "项目fk", requiredMode = Schema.RequiredMode.REQUIRED)

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetail.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportLog.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportStructure.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

15
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiSyncConfig.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -29,18 +27,15 @@ public class ApiSyncConfig implements Serializable {
private Boolean hide;
@Schema(title = "是否通知用例创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_sync_config.notify_case_creator.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_sync_config.notify_case_creator.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_sync_config.notify_case_creator.not_blank}", groups = {Created.class})
private Boolean notifyCaseCreator;
@Schema(title = "是否通知场景创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_sync_config.notify_scenario_creator.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_sync_config.notify_scenario_creator.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_sync_config.notify_scenario_creator.not_blank}", groups = {Created.class})
private Boolean notifyScenarioCreator;
@Schema(title = "是否同步用例", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_sync_config.sync_enable.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_sync_config.sync_enable.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_sync_config.sync_enable.not_blank}", groups = {Created.class})
private Boolean syncEnable;
@Schema(title = "是否发送通知")

19
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCase.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@ -23,13 +21,13 @@ public class ApiTestCase implements Serializable {
@Schema(title = "创建时间")
private Long createTime;
@Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "创建人")
private String createUser;
@Schema(title = "更新时间")
private Long updateTime;
@Schema(title = "更新人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "更新人")
private String updateUser;
@Schema(title = "删除时间")
@ -39,8 +37,7 @@ public class ApiTestCase implements Serializable {
private String deleteUser;
@Schema(title = "删除标识", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case.deleted.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_test_case.deleted.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_test_case.deleted.not_blank}", groups = {Created.class})
private Boolean deleted;
@Schema(title = "用例等级", requiredMode = Schema.RequiredMode.REQUIRED)
@ -66,13 +63,11 @@ public class ApiTestCase implements Serializable {
private String apiReportId;
@Schema(title = "自定义排序", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case.pos.not_blank}", groups = {Created.class})
@Size(min = 1, max = 19, message = "{api_test_case.pos.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_test_case.pos.not_blank}", groups = {Created.class})
private Long pos;
@Schema(title = "是否开启同步", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case.sync_enable.not_blank}", groups = {Created.class})
@Size(min = 1, max = 1, message = "{api_test_case.sync_enable.length_range}", groups = {Created.class, Updated.class})
@NotNull(message = "{api_test_case.sync_enable.not_blank}", groups = {Created.class})
private Boolean syncEnable;
@Schema(title = "需要同步的开始时间")

6
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseBlob.java
View File

@ -1,10 +1,8 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.Created;
import io.metersphere.validation.groups.Updated;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;

24
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseFollow.java
View File

@ -1,24 +0,0 @@
package io.metersphere.api.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.Size;
import java.io.Serializable;
import lombok.Data;
@Data
public class ApiTestCaseFollow implements Serializable {
@Schema(title = "用例fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case_follow.case_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_test_case_follow.case_id.length_range}", groups = {Created.class, Updated.class})
private String caseId;
@Schema(title = "关注人/用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case_follow.follow_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_test_case_follow.follow_id.length_range}", groups = {Created.class, Updated.class})
private String followId;
private static final long serialVersionUID = 1L;
}

22
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseFollower.java Normal file
View File

@ -0,0 +1,22 @@
package io.metersphere.api.domain;
import io.metersphere.validation.groups.*;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.*;
import java.io.Serializable;
import lombok.Data;
@Data
public class ApiTestCaseFollower implements Serializable {
@Schema(title = "用例fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case_follower.case_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_test_case_follower.case_id.length_range}", groups = {Created.class, Updated.class})
private String caseId;
@Schema(title = "关注人/用户fk", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_test_case_follower.user_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_test_case_follower.user_id.length_range}", groups = {Created.class, Updated.class})
private String userId;
private static final long serialVersionUID = 1L;
}

60
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseFollowExample.java → backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCaseFollowerExample.java
View File

@ -3,14 +3,14 @@ package io.metersphere.api.domain;
import java.util.ArrayList;
import java.util.List;
public class ApiTestCaseFollowExample {
public class ApiTestCaseFollowerExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public ApiTestCaseFollowExample() {
public ApiTestCaseFollowerExample() {
oredCriteria = new ArrayList<Criteria>();
}
@ -174,73 +174,73 @@ public class ApiTestCaseFollowExample {
return (Criteria) this;
}
public Criteria andFollowIdIsNull() {
addCriterion("follow_id is null");
public Criteria andUserIdIsNull() {
addCriterion("user_id is null");
return (Criteria) this;
}
public Criteria andFollowIdIsNotNull() {
addCriterion("follow_id is not null");
public Criteria andUserIdIsNotNull() {
addCriterion("user_id is not null");
return (Criteria) this;
}
public Criteria andFollowIdEqualTo(String value) {
addCriterion("follow_id =", value, "followId");
public Criteria andUserIdEqualTo(String value) {
addCriterion("user_id =", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotEqualTo(String value) {
addCriterion("follow_id <>", value, "followId");
public Criteria andUserIdNotEqualTo(String value) {
addCriterion("user_id <>", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdGreaterThan(String value) {
addCriterion("follow_id >", value, "followId");
public Criteria andUserIdGreaterThan(String value) {
addCriterion("user_id >", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdGreaterThanOrEqualTo(String value) {
addCriterion("follow_id >=", value, "followId");
public Criteria andUserIdGreaterThanOrEqualTo(String value) {
addCriterion("user_id >=", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLessThan(String value) {
addCriterion("follow_id <", value, "followId");
public Criteria andUserIdLessThan(String value) {
addCriterion("user_id <", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLessThanOrEqualTo(String value) {
addCriterion("follow_id <=", value, "followId");
public Criteria andUserIdLessThanOrEqualTo(String value) {
addCriterion("user_id <=", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdLike(String value) {
addCriterion("follow_id like", value, "followId");
public Criteria andUserIdLike(String value) {
addCriterion("user_id like", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotLike(String value) {
addCriterion("follow_id not like", value, "followId");
public Criteria andUserIdNotLike(String value) {
addCriterion("user_id not like", value, "userId");
return (Criteria) this;
}
public Criteria andFollowIdIn(List<String> values) {
addCriterion("follow_id in", values, "followId");
public Criteria andUserIdIn(List<String> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotIn(List<String> values) {
addCriterion("follow_id not in", values, "followId");
public Criteria andUserIdNotIn(List<String> values) {
addCriterion("user_id not in", values, "userId");
return (Criteria) this;
}
public Criteria andFollowIdBetween(String value1, String value2) {
addCriterion("follow_id between", value1, value2, "followId");
public Criteria andUserIdBetween(String value1, String value2) {
addCriterion("user_id between", value1, value2, "userId");
return (Criteria) this;
}
public Criteria andFollowIdNotBetween(String value1, String value2) {
addCriterion("follow_id not between", value1, value2, "followId");
public Criteria andUserIdNotBetween(String value1, String value2) {
addCriterion("user_id not between", value1, value2, "userId");
return (Criteria) this;
}
}

24
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDefinitionFollowMapper.java
View File

@ -1,24 +0,0 @@
package io.metersphere.api.mapper;
import io.metersphere.api.domain.ApiDefinitionFollow;
import io.metersphere.api.domain.ApiDefinitionFollowExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ApiDefinitionFollowMapper {
long countByExample(ApiDefinitionFollowExample example);
int deleteByExample(ApiDefinitionFollowExample example);
int deleteByPrimaryKey(@Param("apiDefinitionId") String apiDefinitionId, @Param("followId") String followId);
int insert(ApiDefinitionFollow record);
int insertSelective(ApiDefinitionFollow record);
List<ApiDefinitionFollow> selectByExample(ApiDefinitionFollowExample example);
int updateByExampleSelective(@Param("record") ApiDefinitionFollow record, @Param("example") ApiDefinitionFollowExample example);
int updateByExample(@Param("record") ApiDefinitionFollow record, @Param("example") ApiDefinitionFollowExample example);
}

24
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDefinitionFollowerMapper.java Normal file
View File

@ -0,0 +1,24 @@
package io.metersphere.api.mapper;
import io.metersphere.api.domain.ApiDefinitionFollower;
import io.metersphere.api.domain.ApiDefinitionFollowerExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ApiDefinitionFollowerMapper {
long countByExample(ApiDefinitionFollowerExample example);
int deleteByExample(ApiDefinitionFollowerExample example);
int deleteByPrimaryKey(@Param("apiDefinitionId") String apiDefinitionId, @Param("userId") String userId);
int insert(ApiDefinitionFollower record);
int insertSelective(ApiDefinitionFollower record);
List<ApiDefinitionFollower> selectByExample(ApiDefinitionFollowerExample example);
int updateByExampleSelective(@Param("record") ApiDefinitionFollower record, @Param("example") ApiDefinitionFollowerExample example);
int updateByExample(@Param("record") ApiDefinitionFollower record, @Param("example") ApiDefinitionFollowerExample example);
}

52
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDefinitionFollowMapper.xml → backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDefinitionFollowerMapper.xml
View File

@ -1,9 +1,9 @@
<?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.api.mapper.ApiDefinitionFollowMapper">
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiDefinitionFollow">
<mapper namespace="io.metersphere.api.mapper.ApiDefinitionFollowerMapper">
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiDefinitionFollower">
<id column="api_definition_id" jdbcType="VARCHAR" property="apiDefinitionId" />
<id column="follow_id" jdbcType="VARCHAR" property="followId" />
<id column="user_id" jdbcType="VARCHAR" property="userId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -64,15 +64,15 @@
</where>
</sql>
<sql id="Base_Column_List">
api_definition_id, follow_id
api_definition_id, user_id
</sql>
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiDefinitionFollowExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiDefinitionFollowerExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from api_definition_follow
from api_definition_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
@ -81,53 +81,53 @@
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="map">
delete from api_definition_follow
delete from api_definition_follower
where api_definition_id = #{apiDefinitionId,jdbcType=VARCHAR}
and follow_id = #{followId,jdbcType=VARCHAR}
and user_id = #{userId,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="io.metersphere.api.domain.ApiDefinitionFollowExample">
delete from api_definition_follow
<delete id="deleteByExample" parameterType="io.metersphere.api.domain.ApiDefinitionFollowerExample">
delete from api_definition_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="io.metersphere.api.domain.ApiDefinitionFollow">
insert into api_definition_follow (api_definition_id, follow_id)
values (#{apiDefinitionId,jdbcType=VARCHAR}, #{followId,jdbcType=VARCHAR})
<insert id="insert" parameterType="io.metersphere.api.domain.ApiDefinitionFollower">
insert into api_definition_follower (api_definition_id, user_id)
values (#{apiDefinitionId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiDefinitionFollow">
insert into api_definition_follow
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiDefinitionFollower">
insert into api_definition_follower
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="apiDefinitionId != null">
api_definition_id,
</if>
<if test="followId != null">
follow_id,
<if test="userId != null">
user_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="apiDefinitionId != null">
#{apiDefinitionId,jdbcType=VARCHAR},
</if>
<if test="followId != null">
#{followId,jdbcType=VARCHAR},
<if test="userId != null">
#{userId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiDefinitionFollowExample" resultType="java.lang.Long">
select count(*) from api_definition_follow
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiDefinitionFollowerExample" resultType="java.lang.Long">
select count(*) from api_definition_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update api_definition_follow
update api_definition_follower
<set>
<if test="record.apiDefinitionId != null">
api_definition_id = #{record.apiDefinitionId,jdbcType=VARCHAR},
</if>
<if test="record.followId != null">
follow_id = #{record.followId,jdbcType=VARCHAR},
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
@ -135,9 +135,9 @@
</if>
</update>
<update id="updateByExample" parameterType="map">
update api_definition_follow
update api_definition_follower
set api_definition_id = #{record.apiDefinitionId,jdbcType=VARCHAR},
follow_id = #{record.followId,jdbcType=VARCHAR}
user_id = #{record.userId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>

24
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioFollowMapper.java
View File

@ -1,24 +0,0 @@
package io.metersphere.api.mapper;
import io.metersphere.api.domain.ApiScenarioFollow;
import io.metersphere.api.domain.ApiScenarioFollowExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ApiScenarioFollowMapper {
long countByExample(ApiScenarioFollowExample example);
int deleteByExample(ApiScenarioFollowExample example);
int deleteByPrimaryKey(@Param("apiScenarioId") String apiScenarioId, @Param("followId") String followId);
int insert(ApiScenarioFollow record);
int insertSelective(ApiScenarioFollow record);
List<ApiScenarioFollow> selectByExample(ApiScenarioFollowExample example);
int updateByExampleSelective(@Param("record") ApiScenarioFollow record, @Param("example") ApiScenarioFollowExample example);
int updateByExample(@Param("record") ApiScenarioFollow record, @Param("example") ApiScenarioFollowExample example);
}

24
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioFollowerMapper.java Normal file
View File

@ -0,0 +1,24 @@
package io.metersphere.api.mapper;
import io.metersphere.api.domain.ApiScenarioFollower;
import io.metersphere.api.domain.ApiScenarioFollowerExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ApiScenarioFollowerMapper {
long countByExample(ApiScenarioFollowerExample example);
int deleteByExample(ApiScenarioFollowerExample example);
int deleteByPrimaryKey(@Param("apiScenarioId") String apiScenarioId, @Param("userId") String userId);
int insert(ApiScenarioFollower record);
int insertSelective(ApiScenarioFollower record);
List<ApiScenarioFollower> selectByExample(ApiScenarioFollowerExample example);
int updateByExampleSelective(@Param("record") ApiScenarioFollower record, @Param("example") ApiScenarioFollowerExample example);
int updateByExample(@Param("record") ApiScenarioFollower record, @Param("example") ApiScenarioFollowerExample example);
}

52
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioFollowMapper.xml → backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioFollowerMapper.xml
View File

@ -1,9 +1,9 @@
<?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.api.mapper.ApiScenarioFollowMapper">
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiScenarioFollow">
<mapper namespace="io.metersphere.api.mapper.ApiScenarioFollowerMapper">
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiScenarioFollower">
<id column="api_scenario_id" jdbcType="VARCHAR" property="apiScenarioId" />
<id column="follow_id" jdbcType="VARCHAR" property="followId" />
<id column="user_id" jdbcType="VARCHAR" property="userId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -64,15 +64,15 @@
</where>
</sql>
<sql id="Base_Column_List">
api_scenario_id, follow_id
api_scenario_id, user_id
</sql>
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiScenarioFollowExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiScenarioFollowerExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from api_scenario_follow
from api_scenario_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
@ -81,53 +81,53 @@
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="map">
delete from api_scenario_follow
delete from api_scenario_follower
where api_scenario_id = #{apiScenarioId,jdbcType=VARCHAR}
and follow_id = #{followId,jdbcType=VARCHAR}
and user_id = #{userId,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="io.metersphere.api.domain.ApiScenarioFollowExample">
delete from api_scenario_follow
<delete id="deleteByExample" parameterType="io.metersphere.api.domain.ApiScenarioFollowerExample">
delete from api_scenario_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="io.metersphere.api.domain.ApiScenarioFollow">
insert into api_scenario_follow (api_scenario_id, follow_id)
values (#{apiScenarioId,jdbcType=VARCHAR}, #{followId,jdbcType=VARCHAR})
<insert id="insert" parameterType="io.metersphere.api.domain.ApiScenarioFollower">
insert into api_scenario_follower (api_scenario_id, user_id)
values (#{apiScenarioId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiScenarioFollow">
insert into api_scenario_follow
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiScenarioFollower">
insert into api_scenario_follower
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="apiScenarioId != null">
api_scenario_id,
</if>
<if test="followId != null">
follow_id,
<if test="userId != null">
user_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="apiScenarioId != null">
#{apiScenarioId,jdbcType=VARCHAR},
</if>
<if test="followId != null">
#{followId,jdbcType=VARCHAR},
<if test="userId != null">
#{userId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiScenarioFollowExample" resultType="java.lang.Long">
select count(*) from api_scenario_follow
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiScenarioFollowerExample" resultType="java.lang.Long">
select count(*) from api_scenario_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update api_scenario_follow
update api_scenario_follower
<set>
<if test="record.apiScenarioId != null">
api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
</if>
<if test="record.followId != null">
follow_id = #{record.followId,jdbcType=VARCHAR},
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
@ -135,9 +135,9 @@
</if>
</update>
<update id="updateByExample" parameterType="map">
update api_scenario_follow
update api_scenario_follower
set api_scenario_id = #{record.apiScenarioId,jdbcType=VARCHAR},
follow_id = #{record.followId,jdbcType=VARCHAR}
user_id = #{record.userId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>

24
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiTestCaseFollowMapper.java
View File

@ -1,24 +0,0 @@
package io.metersphere.api.mapper;
import io.metersphere.api.domain.ApiTestCaseFollow;
import io.metersphere.api.domain.ApiTestCaseFollowExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ApiTestCaseFollowMapper {
long countByExample(ApiTestCaseFollowExample example);
int deleteByExample(ApiTestCaseFollowExample example);
int deleteByPrimaryKey(@Param("caseId") String caseId, @Param("followId") String followId);
int insert(ApiTestCaseFollow record);
int insertSelective(ApiTestCaseFollow record);
List<ApiTestCaseFollow> selectByExample(ApiTestCaseFollowExample example);
int updateByExampleSelective(@Param("record") ApiTestCaseFollow record, @Param("example") ApiTestCaseFollowExample example);
int updateByExample(@Param("record") ApiTestCaseFollow record, @Param("example") ApiTestCaseFollowExample example);
}

24
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiTestCaseFollowerMapper.java Normal file
View File

@ -0,0 +1,24 @@
package io.metersphere.api.mapper;
import io.metersphere.api.domain.ApiTestCaseFollower;
import io.metersphere.api.domain.ApiTestCaseFollowerExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ApiTestCaseFollowerMapper {
long countByExample(ApiTestCaseFollowerExample example);
int deleteByExample(ApiTestCaseFollowerExample example);
int deleteByPrimaryKey(@Param("caseId") String caseId, @Param("userId") String userId);
int insert(ApiTestCaseFollower record);
int insertSelective(ApiTestCaseFollower record);
List<ApiTestCaseFollower> selectByExample(ApiTestCaseFollowerExample example);
int updateByExampleSelective(@Param("record") ApiTestCaseFollower record, @Param("example") ApiTestCaseFollowerExample example);
int updateByExample(@Param("record") ApiTestCaseFollower record, @Param("example") ApiTestCaseFollowerExample example);
}

52
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiTestCaseFollowMapper.xml → backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiTestCaseFollowerMapper.xml
View File

@ -1,9 +1,9 @@
<?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.api.mapper.ApiTestCaseFollowMapper">
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiTestCaseFollow">
<mapper namespace="io.metersphere.api.mapper.ApiTestCaseFollowerMapper">
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiTestCaseFollower">
<id column="case_id" jdbcType="VARCHAR" property="caseId" />
<id column="follow_id" jdbcType="VARCHAR" property="followId" />
<id column="user_id" jdbcType="VARCHAR" property="userId" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
@ -64,15 +64,15 @@
</where>
</sql>
<sql id="Base_Column_List">
case_id, follow_id
case_id, user_id
</sql>
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiTestCaseFollowExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiTestCaseFollowerExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from api_test_case_follow
from api_test_case_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
@ -81,53 +81,53 @@
</if>
</select>
<delete id="deleteByPrimaryKey" parameterType="map">
delete from api_test_case_follow
delete from api_test_case_follower
where case_id = #{caseId,jdbcType=VARCHAR}
and follow_id = #{followId,jdbcType=VARCHAR}
and user_id = #{userId,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="io.metersphere.api.domain.ApiTestCaseFollowExample">
delete from api_test_case_follow
<delete id="deleteByExample" parameterType="io.metersphere.api.domain.ApiTestCaseFollowerExample">
delete from api_test_case_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="io.metersphere.api.domain.ApiTestCaseFollow">
insert into api_test_case_follow (case_id, follow_id)
values (#{caseId,jdbcType=VARCHAR}, #{followId,jdbcType=VARCHAR})
<insert id="insert" parameterType="io.metersphere.api.domain.ApiTestCaseFollower">
insert into api_test_case_follower (case_id, user_id)
values (#{caseId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiTestCaseFollow">
insert into api_test_case_follow
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiTestCaseFollower">
insert into api_test_case_follower
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="caseId != null">
case_id,
</if>
<if test="followId != null">
follow_id,
<if test="userId != null">
user_id,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="caseId != null">
#{caseId,jdbcType=VARCHAR},
</if>
<if test="followId != null">
#{followId,jdbcType=VARCHAR},
<if test="userId != null">
#{userId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiTestCaseFollowExample" resultType="java.lang.Long">
select count(*) from api_test_case_follow
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiTestCaseFollowerExample" resultType="java.lang.Long">
select count(*) from api_test_case_follower
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update api_test_case_follow
update api_test_case_follower
<set>
<if test="record.caseId != null">
case_id = #{record.caseId,jdbcType=VARCHAR},
</if>
<if test="record.followId != null">
follow_id = #{record.followId,jdbcType=VARCHAR},
<if test="record.userId != null">
user_id = #{record.userId,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
@ -135,9 +135,9 @@
</if>
</update>
<update id="updateByExample" parameterType="map">
update api_test_case_follow
update api_test_case_follower
set case_id = #{record.caseId,jdbcType=VARCHAR},
follow_id = #{record.followId,jdbcType=VARCHAR}
user_id = #{record.userId,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>

12
backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiDefinitionDTO.java
View File

@ -1,7 +1,19 @@
package io.metersphere.api.dto;
import io.metersphere.api.domain.ApiDefinition;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class ApiDefinitionDTO extends ApiDefinition {
@Schema(title = "请求内容")
private byte[] request;
@Schema(title = "响应内容")
private byte[] response;
@Schema(title = "备注")
private byte[] remark;
}

2
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiDefinitionService.java
View File

@ -10,6 +10,6 @@ import java.util.List;
public class ApiDefinitionService {
public ApiDefinitionDTO create(ApiDefinitionDTO request, List<MultipartFile> bodyFiles) {
return new ApiDefinitionDTO();
return request;
}
}