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

去掉没用到的字段

This commit is contained in:
Captain.B 2020-04-24 11:41:30 +08:00
parent 24be510be8
commit 3d85293dec
4 changed files with 9 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/metersphere/base/domain/LoadTest.java
View File

@ -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;
}

70
backend/src/main/java/io/metersphere/base/domain/LoadTestExample.java
View File

@ -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<String> values) {
addCriterion("scenario_definition in", values, "scenarioDefinition");
return (Criteria) this;
}
public Criteria andScenarioDefinitionNotIn(List<String> 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;

36
backend/src/main/java/io/metersphere/base/mapper/LoadTestMapper.xml
View File

@ -6,7 +6,6 @@
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="scenario_definition" jdbcType="VARCHAR" property="scenarioDefinition" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="update_time" jdbcType="BIGINT" property="updateTime" />
<result column="status" jdbcType="VARCHAR" property="status" />
@ -76,8 +75,7 @@
</where>
</sql>
<sql id="Base_Column_List">
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
</sql>
<sql id="Blob_Column_List">
load_configuration, advanced_configuration, schedule
@ -132,15 +130,15 @@
</delete>
<insert id="insert" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
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>
<insert id="insertSelective" parameterType="io.metersphere.base.domain.LoadTestWithBLOBs">
insert into load_test
@ -157,9 +155,6 @@
<if test="description != null">
description,
</if>
<if test="scenarioDefinition != null">
scenario_definition,
</if>
<if test="createTime != null">
create_time,
</if>
@ -195,9 +190,6 @@
<if test="description != null">
#{description,jdbcType=VARCHAR},
</if>
<if test="scenarioDefinition != null">
#{scenarioDefinition,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=BIGINT},
</if>
@ -242,9 +234,6 @@
<if test="record.description != null">
description = #{record.description,jdbcType=VARCHAR},
</if>
<if test="record.scenarioDefinition != null">
scenario_definition = #{record.scenarioDefinition,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=BIGINT},
</if>
@ -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 @@
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
</if>
<if test="scenarioDefinition != null">
scenario_definition = #{scenarioDefinition,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=BIGINT},
</if>
@ -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},

1
backend/src/main/resources/db/migration/V2__metersphere_ddl.sql
View File

@ -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)',