From 3d85293decc85040eafc0d1355cb25fdc7954502 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Fri, 24 Apr 2020 11:41:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B2=A1=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/base/domain/LoadTest.java | 10 --- .../base/domain/LoadTestExample.java | 70 ------------------- .../base/mapper/LoadTestMapper.xml | 36 +++------- .../db/migration/V2__metersphere_ddl.sql | 1 - 4 files changed, 9 insertions(+), 108 deletions(-) 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 7fcf64246d..0bf8f56015 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTest.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTest.java @@ -11,8 +11,6 @@ public class LoadTest implements Serializable { private String description; - private String scenarioDefinition; - private Long createTime; private Long updateTime; @@ -55,14 +53,6 @@ public class LoadTest implements Serializable { this.description = description == null ? null : description.trim(); } - public String getScenarioDefinition() { - return scenarioDefinition; - } - - public void setScenarioDefinition(String scenarioDefinition) { - this.scenarioDefinition = scenarioDefinition == null ? null : scenarioDefinition.trim(); - } - public Long getCreateTime() { return createTime; } 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 897e84cd22..b3e74f1cd1 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java @@ -384,76 +384,6 @@ public class LoadTestExample { return (Criteria) this; } - public Criteria andScenarioDefinitionIsNull() { - addCriterion("scenario_definition is null"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionIsNotNull() { - addCriterion("scenario_definition is not null"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionEqualTo(String value) { - addCriterion("scenario_definition =", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionNotEqualTo(String value) { - addCriterion("scenario_definition <>", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionGreaterThan(String value) { - addCriterion("scenario_definition >", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionGreaterThanOrEqualTo(String value) { - addCriterion("scenario_definition >=", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionLessThan(String value) { - addCriterion("scenario_definition <", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionLessThanOrEqualTo(String value) { - addCriterion("scenario_definition <=", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionLike(String value) { - addCriterion("scenario_definition like", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionNotLike(String value) { - addCriterion("scenario_definition not like", value, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionIn(List values) { - addCriterion("scenario_definition in", values, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionNotIn(List values) { - addCriterion("scenario_definition not in", values, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionBetween(String value1, String value2) { - addCriterion("scenario_definition between", value1, value2, "scenarioDefinition"); - return (Criteria) this; - } - - public Criteria andScenarioDefinitionNotBetween(String value1, String value2) { - addCriterion("scenario_definition not between", value1, value2, "scenarioDefinition"); - return (Criteria) this; - } - public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; 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 0af4139ca6..f2a7b7188f 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml @@ -6,7 +6,6 @@ - @@ -76,8 +75,7 @@ - id, project_id, name, description, scenario_definition, create_time, update_time, - status, test_resource_pool_id + id, project_id, name, description, create_time, update_time, status, test_resource_pool_id load_configuration, advanced_configuration, schedule @@ -132,15 +130,15 @@ insert into load_test (id, project_id, name, - description, scenario_definition, create_time, - update_time, status, test_resource_pool_id, - load_configuration, advanced_configuration, - schedule) + 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}, #{scenarioDefinition,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, - #{updateTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, #{testResourcePoolId,jdbcType=VARCHAR}, - #{loadConfiguration,jdbcType=LONGVARCHAR}, #{advancedConfiguration,jdbcType=LONGVARCHAR}, - #{schedule,jdbcType=LONGVARCHAR}) + #{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 @@ -157,9 +155,6 @@ description, - - scenario_definition, - create_time, @@ -195,9 +190,6 @@ #{description,jdbcType=VARCHAR}, - - #{scenarioDefinition,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, @@ -242,9 +234,6 @@ description = #{record.description,jdbcType=VARCHAR}, - - scenario_definition = #{record.scenarioDefinition,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, @@ -277,7 +266,6 @@ project_id = #{record.projectId,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR}, - scenario_definition = #{record.scenarioDefinition,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, status = #{record.status,jdbcType=VARCHAR}, @@ -295,7 +283,6 @@ project_id = #{record.projectId,jdbcType=VARCHAR}, name = #{record.name,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR}, - scenario_definition = #{record.scenarioDefinition,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, update_time = #{record.updateTime,jdbcType=BIGINT}, status = #{record.status,jdbcType=VARCHAR}, @@ -316,9 +303,6 @@ description = #{description,jdbcType=VARCHAR}, - - scenario_definition = #{scenarioDefinition,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, @@ -348,7 +332,6 @@ set project_id = #{projectId,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, - scenario_definition = #{scenarioDefinition,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, status = #{status,jdbcType=VARCHAR}, @@ -363,7 +346,6 @@ set project_id = #{projectId,jdbcType=VARCHAR}, name = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, - scenario_definition = #{scenarioDefinition,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, update_time = #{updateTime,jdbcType=BIGINT}, status = #{status,jdbcType=VARCHAR}, diff --git a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql index ae5c0fa8d0..facbb21e3f 100644 --- a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql @@ -25,7 +25,6 @@ CREATE TABLE IF NOT EXISTS `load_test` ( `project_id` varchar(50) NOT NULL COMMENT 'Project ID this test belongs to', `name` varchar(64) NOT NULL COMMENT 'Test name', `description` varchar(255) DEFAULT NULL COMMENT 'Test description', - `scenario_definition` varchar(255) DEFAULT NULL COMMENT 'Scenario definition (JSON format)', `load_configuration` longtext COMMENT 'Load configuration (JSON format)', `advanced_configuration` longtext COMMENT 'Load configuration (JSON format)', `schedule` longtext COMMENT 'Test schedule (cron list)',