diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTest.java b/backend/src/main/java/io/metersphere/base/domain/LoadTest.java index 8c8c89a1a6..b8db5990ea 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTest.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTest.java @@ -22,5 +22,7 @@ public class LoadTest implements Serializable { private String testResourcePoolId; + private String user; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java index b3e74f1cd1..14eb1e475c 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java @@ -643,6 +643,76 @@ public class LoadTestExample { addCriterion("test_resource_pool_id not between", value1, value2, "testResourcePoolId"); return (Criteria) this; } + + public Criteria andUserIsNull() { + addCriterion("user is null"); + return (Criteria) this; + } + + public Criteria andUserIsNotNull() { + addCriterion("user is not null"); + return (Criteria) this; + } + + public Criteria andUserEqualTo(String value) { + addCriterion("user =", value, "user"); + return (Criteria) this; + } + + public Criteria andUserNotEqualTo(String value) { + addCriterion("user <>", value, "user"); + return (Criteria) this; + } + + public Criteria andUserGreaterThan(String value) { + addCriterion("user >", value, "user"); + return (Criteria) this; + } + + public Criteria andUserGreaterThanOrEqualTo(String value) { + addCriterion("user >=", value, "user"); + return (Criteria) this; + } + + public Criteria andUserLessThan(String value) { + addCriterion("user <", value, "user"); + return (Criteria) this; + } + + public Criteria andUserLessThanOrEqualTo(String value) { + addCriterion("user <=", value, "user"); + return (Criteria) this; + } + + public Criteria andUserLike(String value) { + addCriterion("user like", value, "user"); + return (Criteria) this; + } + + public Criteria andUserNotLike(String value) { + addCriterion("user not like", value, "user"); + return (Criteria) this; + } + + public Criteria andUserIn(List values) { + addCriterion("user in", values, "user"); + return (Criteria) this; + } + + public Criteria andUserNotIn(List values) { + addCriterion("user not in", values, "user"); + return (Criteria) this; + } + + public Criteria andUserBetween(String value1, String value2) { + addCriterion("user between", value1, value2, "user"); + return (Criteria) this; + } + + public Criteria andUserNotBetween(String value1, String value2) { + addCriterion("user not between", value1, value2, "user"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestReport.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestReport.java index 2a60c2d011..79f55c3d4f 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestReport.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestReport.java @@ -18,6 +18,8 @@ public class LoadTestReport implements Serializable { private String status; + private String user; + private String description; private static final long serialVersionUID = 1L; diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportExample.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportExample.java index cd996e4714..cc39b3d9ee 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportExample.java @@ -503,6 +503,76 @@ public class LoadTestReportExample { addCriterion("status not between", value1, value2, "status"); return (Criteria) this; } + + public Criteria andUserIsNull() { + addCriterion("user is null"); + return (Criteria) this; + } + + public Criteria andUserIsNotNull() { + addCriterion("user is not null"); + return (Criteria) this; + } + + public Criteria andUserEqualTo(String value) { + addCriterion("user =", value, "user"); + return (Criteria) this; + } + + public Criteria andUserNotEqualTo(String value) { + addCriterion("user <>", value, "user"); + return (Criteria) this; + } + + public Criteria andUserGreaterThan(String value) { + addCriterion("user >", value, "user"); + return (Criteria) this; + } + + public Criteria andUserGreaterThanOrEqualTo(String value) { + addCriterion("user >=", value, "user"); + return (Criteria) this; + } + + public Criteria andUserLessThan(String value) { + addCriterion("user <", value, "user"); + return (Criteria) this; + } + + public Criteria andUserLessThanOrEqualTo(String value) { + addCriterion("user <=", value, "user"); + return (Criteria) this; + } + + public Criteria andUserLike(String value) { + addCriterion("user like", value, "user"); + return (Criteria) this; + } + + public Criteria andUserNotLike(String value) { + addCriterion("user not like", value, "user"); + return (Criteria) this; + } + + public Criteria andUserIn(List values) { + addCriterion("user in", values, "user"); + return (Criteria) this; + } + + public Criteria andUserNotIn(List values) { + addCriterion("user not in", values, "user"); + return (Criteria) this; + } + + public Criteria andUserBetween(String value1, String value2) { + addCriterion("user between", value1, value2, "user"); + return (Criteria) this; + } + + public Criteria andUserNotBetween(String value1, String value2) { + addCriterion("user not between", value1, value2, "user"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml index f2a7b7188f..5778aa602a 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml @@ -10,6 +10,7 @@ + @@ -75,7 +76,15 @@ - id, project_id, name, description, create_time, update_time, status, test_resource_pool_id + id, + project_id, + name, + description, + create_time, + update_time, + status, + test_resource_pool_id, + user load_configuration, advanced_configuration, schedule @@ -129,16 +138,16 @@ - insert into load_test (id, project_id, name, - description, create_time, update_time, - status, test_resource_pool_id, load_configuration, - advanced_configuration, schedule - ) - values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, - #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, - #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARCHAR}, - #{advancedConfiguration,jdbcType=LONGVARCHAR}, #{schedule,jdbcType=LONGVARCHAR} - ) + insert into load_test (id, project_id, name, + description, create_time, update_time, + status, test_resource_pool_id, user, + load_configuration, advanced_configuration, + schedule) + values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, + #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, #{user,jdbcType=VARCHAR}, + #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR}, + #{schedule,jdbcType=LONGVARCHAR}) insert into load_test @@ -156,26 +165,29 @@ description, - create_time, - - - update_time, - - - status, - - - test_resource_pool_id, - - - load_configuration, - - - advanced_configuration, - - - schedule, + create_time, + + update_time, + + + status, + + + test_resource_pool_id, + + + user, + + + load_configuration, + + + advanced_configuration, + + + schedule, + @@ -193,24 +205,27 @@ #{createTime,jdbcType=BIGINT}, - - #{updateTime,jdbcType=BIGINT}, - - - #{status,jdbcType=VARCHAR}, - - - #{testResourcePoolId,jdbcType=VARCHAR}, - - - #{loadConfiguration,jdbcType=LONGVARCHAR}, - - - #{advancedConfiguration,jdbcType=LONGVARCHAR}, - - - #{schedule,jdbcType=LONGVARCHAR}, - + + #{updateTime,jdbcType=BIGINT}, + + + #{status,jdbcType=VARCHAR}, + + + #{testResourcePoolId,jdbcType=VARCHAR}, + + + #{user,jdbcType=VARCHAR}, + + + #{loadConfiguration,jdbcType=LONGVARCHAR}, + + + #{advancedConfiguration,jdbcType=LONGVARCHAR}, + + + #{schedule,jdbcType=LONGVARCHAR}, + - - delete from load_test_report - where id = #{id,jdbcType=VARCHAR} - - - delete from load_test_report - - - - + + DELETE FROM load_test_report + WHERE id = #{id,jdbcType=VARCHAR} + + + DELETE FROM load_test_report + + + + INSERT INTO load_test_report (id, test_id, name, create_time, update_time, status, - description) + user, description) VALUES (#{id,jdbcType=VARCHAR}, #{testId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, - #{description,jdbcType=LONGVARCHAR}) + #{user,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}) insert into load_test_report @@ -143,20 +150,23 @@ name, - - - create_time, - - - update_time, - - - status, - - - description, - - + + + create_time, + + + update_time, + + + status, + + + user, + + + description, + + #{id,jdbcType=VARCHAR}, @@ -167,18 +177,21 @@ #{name,jdbcType=VARCHAR}, - - #{createTime,jdbcType=BIGINT}, - - - #{updateTime,jdbcType=BIGINT}, - - - #{status,jdbcType=VARCHAR}, - - - #{description,jdbcType=LONGVARCHAR}, - + + #{createTime,jdbcType=BIGINT}, + + + #{updateTime,jdbcType=BIGINT}, + + + #{status,jdbcType=VARCHAR}, + + + #{user,jdbcType=VARCHAR}, + + + #{description,jdbcType=LONGVARCHAR}, +