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

refactor(接口测试): 优化接口报告

This commit is contained in:
wxg0103 2024-06-06 20:09:40 +08:00 committed by Craftsman
parent 0bd0b29298
commit c31b5a6ff0
17 changed files with 410 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@ public class ApiReport implements Serializable {
@Size(min = 1, max = 300, message = "{api_report.name.length_range}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 300, message = "{api_report.name.length_range}", groups = {Created.class, Updated.class})
private String name; private String name;
@Schema(description = "测试计划id", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "测试计划关联用例表ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_report.test_plan_id.not_blank}", groups = {Created.class}) @NotBlank(message = "{api_report.test_plan_case_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_report.test_plan_id.length_range}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{api_report.test_plan_case_id.length_range}", groups = {Created.class, Updated.class})
private String testPlanId; private String testPlanCaseId;
@Schema(description = "创建人") @Schema(description = "创建人")
private String createUser; private String createUser;
@ -144,12 +144,16 @@ public class ApiReport implements Serializable {
@Size(min = 1, max = 20, message = "{api_report.exec_status.length_range}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 20, message = "{api_report.exec_status.length_range}", groups = {Created.class, Updated.class})
private String execStatus; private String execStatus;
@Schema(description = "是否是测试计划整体执行", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{api_report.plan.not_blank}", groups = {Created.class})
private Boolean plan;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public enum Column { public enum Column {
id("id", "id", "VARCHAR", false), id("id", "id", "VARCHAR", false),
name("name", "name", "VARCHAR", true), name("name", "name", "VARCHAR", true),
testPlanId("test_plan_id", "testPlanId", "VARCHAR", false), testPlanCaseId("test_plan_case_id", "testPlanCaseId", "VARCHAR", false),
createUser("create_user", "createUser", "VARCHAR", false), createUser("create_user", "createUser", "VARCHAR", false),
deleteTime("delete_time", "deleteTime", "BIGINT", false), deleteTime("delete_time", "deleteTime", "BIGINT", false),
deleteUser("delete_user", "deleteUser", "VARCHAR", false), deleteUser("delete_user", "deleteUser", "VARCHAR", false),
@ -178,7 +182,8 @@ public class ApiReport implements Serializable {
requestPassRate("request_pass_rate", "requestPassRate", "VARCHAR", false), requestPassRate("request_pass_rate", "requestPassRate", "VARCHAR", false),
assertionPassRate("assertion_pass_rate", "assertionPassRate", "VARCHAR", false), assertionPassRate("assertion_pass_rate", "assertionPassRate", "VARCHAR", false),
scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false), scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false),
execStatus("exec_status", "execStatus", "VARCHAR", false); execStatus("exec_status", "execStatus", "VARCHAR", false),
plan("plan", "plan", "BIT", true);
private static final String BEGINNING_DELIMITER = "`"; private static final String BEGINNING_DELIMITER = "`";

116
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportExample.java
View File

@ -244,73 +244,73 @@ public class ApiReportExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdIsNull() { public Criteria andTestPlanCaseIdIsNull() {
addCriterion("test_plan_id is null"); addCriterion("test_plan_case_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdIsNotNull() { public Criteria andTestPlanCaseIdIsNotNull() {
addCriterion("test_plan_id is not null"); addCriterion("test_plan_case_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdEqualTo(String value) { public Criteria andTestPlanCaseIdEqualTo(String value) {
addCriterion("test_plan_id =", value, "testPlanId"); addCriterion("test_plan_case_id =", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotEqualTo(String value) { public Criteria andTestPlanCaseIdNotEqualTo(String value) {
addCriterion("test_plan_id <>", value, "testPlanId"); addCriterion("test_plan_case_id <>", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdGreaterThan(String value) { public Criteria andTestPlanCaseIdGreaterThan(String value) {
addCriterion("test_plan_id >", value, "testPlanId"); addCriterion("test_plan_case_id >", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdGreaterThanOrEqualTo(String value) { public Criteria andTestPlanCaseIdGreaterThanOrEqualTo(String value) {
addCriterion("test_plan_id >=", value, "testPlanId"); addCriterion("test_plan_case_id >=", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdLessThan(String value) { public Criteria andTestPlanCaseIdLessThan(String value) {
addCriterion("test_plan_id <", value, "testPlanId"); addCriterion("test_plan_case_id <", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdLessThanOrEqualTo(String value) { public Criteria andTestPlanCaseIdLessThanOrEqualTo(String value) {
addCriterion("test_plan_id <=", value, "testPlanId"); addCriterion("test_plan_case_id <=", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdLike(String value) { public Criteria andTestPlanCaseIdLike(String value) {
addCriterion("test_plan_id like", value, "testPlanId"); addCriterion("test_plan_case_id like", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotLike(String value) { public Criteria andTestPlanCaseIdNotLike(String value) {
addCriterion("test_plan_id not like", value, "testPlanId"); addCriterion("test_plan_case_id not like", value, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdIn(List<String> values) { public Criteria andTestPlanCaseIdIn(List<String> values) {
addCriterion("test_plan_id in", values, "testPlanId"); addCriterion("test_plan_case_id in", values, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotIn(List<String> values) { public Criteria andTestPlanCaseIdNotIn(List<String> values) {
addCriterion("test_plan_id not in", values, "testPlanId"); addCriterion("test_plan_case_id not in", values, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdBetween(String value1, String value2) { public Criteria andTestPlanCaseIdBetween(String value1, String value2) {
addCriterion("test_plan_id between", value1, value2, "testPlanId"); addCriterion("test_plan_case_id between", value1, value2, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotBetween(String value1, String value2) { public Criteria andTestPlanCaseIdNotBetween(String value1, String value2) {
addCriterion("test_plan_id not between", value1, value2, "testPlanId"); addCriterion("test_plan_case_id not between", value1, value2, "testPlanCaseId");
return (Criteria) this; return (Criteria) this;
} }
@ -2213,6 +2213,66 @@ public class ApiReportExample {
addCriterion("exec_status not between", value1, value2, "execStatus"); addCriterion("exec_status not between", value1, value2, "execStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlanIsNull() {
addCriterion("`plan` is null");
return (Criteria) this;
}
public Criteria andPlanIsNotNull() {
addCriterion("`plan` is not null");
return (Criteria) this;
}
public Criteria andPlanEqualTo(Boolean value) {
addCriterion("`plan` =", value, "plan");
return (Criteria) this;
}
public Criteria andPlanNotEqualTo(Boolean value) {
addCriterion("`plan` <>", value, "plan");
return (Criteria) this;
}
public Criteria andPlanGreaterThan(Boolean value) {
addCriterion("`plan` >", value, "plan");
return (Criteria) this;
}
public Criteria andPlanGreaterThanOrEqualTo(Boolean value) {
addCriterion("`plan` >=", value, "plan");
return (Criteria) this;
}
public Criteria andPlanLessThan(Boolean value) {
addCriterion("`plan` <", value, "plan");
return (Criteria) this;
}
public Criteria andPlanLessThanOrEqualTo(Boolean value) {
addCriterion("`plan` <=", value, "plan");
return (Criteria) this;
}
public Criteria andPlanIn(List<Boolean> values) {
addCriterion("`plan` in", values, "plan");
return (Criteria) this;
}
public Criteria andPlanNotIn(List<Boolean> values) {
addCriterion("`plan` not in", values, "plan");
return (Criteria) this;
}
public Criteria andPlanBetween(Boolean value1, Boolean value2) {
addCriterion("`plan` between", value1, value2, "plan");
return (Criteria) this;
}
public Criteria andPlanNotBetween(Boolean value1, Boolean value2) {
addCriterion("`plan` not between", value1, value2, "plan");
return (Criteria) this;
}
} }
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {

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

@ -20,10 +20,10 @@ public class ApiScenarioReport implements Serializable {
@Size(min = 1, max = 300, message = "{api_scenario_report.name.length_range}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 300, message = "{api_scenario_report.name.length_range}", groups = {Created.class, Updated.class})
private String name; private String name;
@Schema(description = "测试计划id", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "测试计划关联场景表ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{api_scenario_report.test_plan_id.not_blank}", groups = {Created.class}) @NotBlank(message = "{api_scenario_report.test_plan_scenario_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{api_scenario_report.test_plan_id.length_range}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 50, message = "{api_scenario_report.test_plan_scenario_id.length_range}", groups = {Created.class, Updated.class})
private String testPlanId; private String testPlanScenarioId;
@Schema(description = "创建人") @Schema(description = "创建人")
private String createUser; private String createUser;
@ -147,12 +147,16 @@ public class ApiScenarioReport implements Serializable {
@Size(min = 1, max = 20, message = "{api_scenario_report.exec_status.length_range}", groups = {Created.class, Updated.class}) @Size(min = 1, max = 20, message = "{api_scenario_report.exec_status.length_range}", groups = {Created.class, Updated.class})
private String execStatus; private String execStatus;
@Schema(description = "是否是测试计划整体执行", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{api_scenario_report.plan.not_blank}", groups = {Created.class})
private Boolean plan;
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public enum Column { public enum Column {
id("id", "id", "VARCHAR", false), id("id", "id", "VARCHAR", false),
name("name", "name", "VARCHAR", true), name("name", "name", "VARCHAR", true),
testPlanId("test_plan_id", "testPlanId", "VARCHAR", false), testPlanScenarioId("test_plan_scenario_id", "testPlanScenarioId", "VARCHAR", false),
createUser("create_user", "createUser", "VARCHAR", false), createUser("create_user", "createUser", "VARCHAR", false),
deleteTime("delete_time", "deleteTime", "BIGINT", false), deleteTime("delete_time", "deleteTime", "BIGINT", false),
deleteUser("delete_user", "deleteUser", "VARCHAR", false), deleteUser("delete_user", "deleteUser", "VARCHAR", false),
@ -182,7 +186,8 @@ public class ApiScenarioReport implements Serializable {
assertionPassRate("assertion_pass_rate", "assertionPassRate", "VARCHAR", false), assertionPassRate("assertion_pass_rate", "assertionPassRate", "VARCHAR", false),
scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false), scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false),
waitingTime("waiting_time", "waitingTime", "BIGINT", false), waitingTime("waiting_time", "waitingTime", "BIGINT", false),
execStatus("exec_status", "execStatus", "VARCHAR", false); execStatus("exec_status", "execStatus", "VARCHAR", false),
plan("plan", "plan", "BIT", true);
private static final String BEGINNING_DELIMITER = "`"; private static final String BEGINNING_DELIMITER = "`";

116
backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportExample.java
View File

@ -244,73 +244,73 @@ public class ApiScenarioReportExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdIsNull() { public Criteria andTestPlanScenarioIdIsNull() {
addCriterion("test_plan_id is null"); addCriterion("test_plan_scenario_id is null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdIsNotNull() { public Criteria andTestPlanScenarioIdIsNotNull() {
addCriterion("test_plan_id is not null"); addCriterion("test_plan_scenario_id is not null");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdEqualTo(String value) { public Criteria andTestPlanScenarioIdEqualTo(String value) {
addCriterion("test_plan_id =", value, "testPlanId"); addCriterion("test_plan_scenario_id =", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotEqualTo(String value) { public Criteria andTestPlanScenarioIdNotEqualTo(String value) {
addCriterion("test_plan_id <>", value, "testPlanId"); addCriterion("test_plan_scenario_id <>", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdGreaterThan(String value) { public Criteria andTestPlanScenarioIdGreaterThan(String value) {
addCriterion("test_plan_id >", value, "testPlanId"); addCriterion("test_plan_scenario_id >", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdGreaterThanOrEqualTo(String value) { public Criteria andTestPlanScenarioIdGreaterThanOrEqualTo(String value) {
addCriterion("test_plan_id >=", value, "testPlanId"); addCriterion("test_plan_scenario_id >=", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdLessThan(String value) { public Criteria andTestPlanScenarioIdLessThan(String value) {
addCriterion("test_plan_id <", value, "testPlanId"); addCriterion("test_plan_scenario_id <", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdLessThanOrEqualTo(String value) { public Criteria andTestPlanScenarioIdLessThanOrEqualTo(String value) {
addCriterion("test_plan_id <=", value, "testPlanId"); addCriterion("test_plan_scenario_id <=", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdLike(String value) { public Criteria andTestPlanScenarioIdLike(String value) {
addCriterion("test_plan_id like", value, "testPlanId"); addCriterion("test_plan_scenario_id like", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotLike(String value) { public Criteria andTestPlanScenarioIdNotLike(String value) {
addCriterion("test_plan_id not like", value, "testPlanId"); addCriterion("test_plan_scenario_id not like", value, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdIn(List<String> values) { public Criteria andTestPlanScenarioIdIn(List<String> values) {
addCriterion("test_plan_id in", values, "testPlanId"); addCriterion("test_plan_scenario_id in", values, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotIn(List<String> values) { public Criteria andTestPlanScenarioIdNotIn(List<String> values) {
addCriterion("test_plan_id not in", values, "testPlanId"); addCriterion("test_plan_scenario_id not in", values, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdBetween(String value1, String value2) { public Criteria andTestPlanScenarioIdBetween(String value1, String value2) {
addCriterion("test_plan_id between", value1, value2, "testPlanId"); addCriterion("test_plan_scenario_id between", value1, value2, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andTestPlanIdNotBetween(String value1, String value2) { public Criteria andTestPlanScenarioIdNotBetween(String value1, String value2) {
addCriterion("test_plan_id not between", value1, value2, "testPlanId"); addCriterion("test_plan_scenario_id not between", value1, value2, "testPlanScenarioId");
return (Criteria) this; return (Criteria) this;
} }
@ -2273,6 +2273,66 @@ public class ApiScenarioReportExample {
addCriterion("exec_status not between", value1, value2, "execStatus"); addCriterion("exec_status not between", value1, value2, "execStatus");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andPlanIsNull() {
addCriterion("`plan` is null");
return (Criteria) this;
}
public Criteria andPlanIsNotNull() {
addCriterion("`plan` is not null");
return (Criteria) this;
}
public Criteria andPlanEqualTo(Boolean value) {
addCriterion("`plan` =", value, "plan");
return (Criteria) this;
}
public Criteria andPlanNotEqualTo(Boolean value) {
addCriterion("`plan` <>", value, "plan");
return (Criteria) this;
}
public Criteria andPlanGreaterThan(Boolean value) {
addCriterion("`plan` >", value, "plan");
return (Criteria) this;
}
public Criteria andPlanGreaterThanOrEqualTo(Boolean value) {
addCriterion("`plan` >=", value, "plan");
return (Criteria) this;
}
public Criteria andPlanLessThan(Boolean value) {
addCriterion("`plan` <", value, "plan");
return (Criteria) this;
}
public Criteria andPlanLessThanOrEqualTo(Boolean value) {
addCriterion("`plan` <=", value, "plan");
return (Criteria) this;
}
public Criteria andPlanIn(List<Boolean> values) {
addCriterion("`plan` in", values, "plan");
return (Criteria) this;
}
public Criteria andPlanNotIn(List<Boolean> values) {
addCriterion("`plan` not in", values, "plan");
return (Criteria) this;
}
public Criteria andPlanBetween(Boolean value1, Boolean value2) {
addCriterion("`plan` between", value1, value2, "plan");
return (Criteria) this;
}
public Criteria andPlanNotBetween(Boolean value1, Boolean value2) {
addCriterion("`plan` not between", value1, value2, "plan");
return (Criteria) this;
}
} }
public static class Criteria extends GeneratedCriteria { public static class Criteria extends GeneratedCriteria {

69
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportMapper.xml
View File

@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiReport"> <resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiReport">
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="test_plan_id" jdbcType="VARCHAR" property="testPlanId" /> <result column="test_plan_case_id" jdbcType="VARCHAR" property="testPlanCaseId" />
<result column="create_user" jdbcType="VARCHAR" property="createUser" /> <result column="create_user" jdbcType="VARCHAR" property="createUser" />
<result column="delete_time" jdbcType="BIGINT" property="deleteTime" /> <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
<result column="delete_user" jdbcType="VARCHAR" property="deleteUser" /> <result column="delete_user" jdbcType="VARCHAR" property="deleteUser" />
@ -34,6 +34,7 @@
<result column="assertion_pass_rate" jdbcType="VARCHAR" property="assertionPassRate" /> <result column="assertion_pass_rate" jdbcType="VARCHAR" property="assertionPassRate" />
<result column="script_identifier" jdbcType="VARCHAR" property="scriptIdentifier" /> <result column="script_identifier" jdbcType="VARCHAR" property="scriptIdentifier" />
<result column="exec_status" jdbcType="VARCHAR" property="execStatus" /> <result column="exec_status" jdbcType="VARCHAR" property="execStatus" />
<result column="plan" jdbcType="BIT" property="plan" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -94,12 +95,12 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, `name`, test_plan_id, create_user, delete_time, delete_user, deleted, update_user, id, `name`, test_plan_case_id, create_user, delete_time, delete_user, deleted, update_user,
update_time, start_time, end_time, request_duration, `status`, trigger_mode, run_mode, update_time, start_time, end_time, request_duration, `status`, trigger_mode, run_mode,
pool_id, integrated, project_id, environment_id, error_count, fake_error_count, pending_count, pool_id, integrated, project_id, environment_id, error_count, fake_error_count, pending_count,
success_count, assertion_count, assertion_success_count, request_error_rate, request_pending_rate, success_count, assertion_count, assertion_success_count, request_error_rate, request_pending_rate,
request_fake_error_rate, request_pass_rate, assertion_pass_rate, script_identifier, request_fake_error_rate, request_pass_rate, assertion_pass_rate, script_identifier,
exec_status exec_status, `plan`
</sql> </sql>
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiReportExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="io.metersphere.api.domain.ApiReportExample" resultMap="BaseResultMap">
select select
@ -132,7 +133,7 @@
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="io.metersphere.api.domain.ApiReport"> <insert id="insert" parameterType="io.metersphere.api.domain.ApiReport">
insert into api_report (id, `name`, test_plan_id, insert into api_report (id, `name`, test_plan_case_id,
create_user, delete_time, delete_user, create_user, delete_time, delete_user,
deleted, update_user, update_time, deleted, update_user, update_time,
start_time, end_time, request_duration, start_time, end_time, request_duration,
@ -143,8 +144,8 @@
assertion_success_count, request_error_rate, assertion_success_count, request_error_rate,
request_pending_rate, request_fake_error_rate, request_pending_rate, request_fake_error_rate,
request_pass_rate, assertion_pass_rate, script_identifier, request_pass_rate, assertion_pass_rate, script_identifier,
exec_status) exec_status, `plan`)
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{testPlanId,jdbcType=VARCHAR}, values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{testPlanCaseId,jdbcType=VARCHAR},
#{createUser,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, #{deleteUser,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, #{deleteUser,jdbcType=VARCHAR},
#{deleted,jdbcType=BIT}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}, #{deleted,jdbcType=BIT}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT},
#{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{requestDuration,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{requestDuration,jdbcType=BIGINT},
@ -155,7 +156,7 @@
#{assertionSuccessCount,jdbcType=BIGINT}, #{requestErrorRate,jdbcType=VARCHAR}, #{assertionSuccessCount,jdbcType=BIGINT}, #{requestErrorRate,jdbcType=VARCHAR},
#{requestPendingRate,jdbcType=VARCHAR}, #{requestFakeErrorRate,jdbcType=VARCHAR}, #{requestPendingRate,jdbcType=VARCHAR}, #{requestFakeErrorRate,jdbcType=VARCHAR},
#{requestPassRate,jdbcType=VARCHAR}, #{assertionPassRate,jdbcType=VARCHAR}, #{scriptIdentifier,jdbcType=VARCHAR}, #{requestPassRate,jdbcType=VARCHAR}, #{assertionPassRate,jdbcType=VARCHAR}, #{scriptIdentifier,jdbcType=VARCHAR},
#{execStatus,jdbcType=VARCHAR}) #{execStatus,jdbcType=VARCHAR}, #{plan,jdbcType=BIT})
</insert> </insert>
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiReport"> <insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiReport">
insert into api_report insert into api_report
@ -166,8 +167,8 @@
<if test="name != null"> <if test="name != null">
`name`, `name`,
</if> </if>
<if test="testPlanId != null"> <if test="testPlanCaseId != null">
test_plan_id, test_plan_case_id,
</if> </if>
<if test="createUser != null"> <if test="createUser != null">
create_user, create_user,
@ -256,6 +257,9 @@
<if test="execStatus != null"> <if test="execStatus != null">
exec_status, exec_status,
</if> </if>
<if test="plan != null">
`plan`,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -264,8 +268,8 @@
<if test="name != null"> <if test="name != null">
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="testPlanId != null"> <if test="testPlanCaseId != null">
#{testPlanId,jdbcType=VARCHAR}, #{testPlanCaseId,jdbcType=VARCHAR},
</if> </if>
<if test="createUser != null"> <if test="createUser != null">
#{createUser,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR},
@ -354,6 +358,9 @@
<if test="execStatus != null"> <if test="execStatus != null">
#{execStatus,jdbcType=VARCHAR}, #{execStatus,jdbcType=VARCHAR},
</if> </if>
<if test="plan != null">
#{plan,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiReportExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="io.metersphere.api.domain.ApiReportExample" resultType="java.lang.Long">
@ -371,8 +378,8 @@
<if test="record.name != null"> <if test="record.name != null">
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.testPlanId != null"> <if test="record.testPlanCaseId != null">
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR}, test_plan_case_id = #{record.testPlanCaseId,jdbcType=VARCHAR},
</if> </if>
<if test="record.createUser != null"> <if test="record.createUser != null">
create_user = #{record.createUser,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR},
@ -461,6 +468,9 @@
<if test="record.execStatus != null"> <if test="record.execStatus != null">
exec_status = #{record.execStatus,jdbcType=VARCHAR}, exec_status = #{record.execStatus,jdbcType=VARCHAR},
</if> </if>
<if test="record.plan != null">
`plan` = #{record.plan,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -470,7 +480,7 @@
update api_report update api_report
set id = #{record.id,jdbcType=VARCHAR}, set id = #{record.id,jdbcType=VARCHAR},
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR}, test_plan_case_id = #{record.testPlanCaseId,jdbcType=VARCHAR},
create_user = #{record.createUser,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR},
delete_time = #{record.deleteTime,jdbcType=BIGINT}, delete_time = #{record.deleteTime,jdbcType=BIGINT},
delete_user = #{record.deleteUser,jdbcType=VARCHAR}, delete_user = #{record.deleteUser,jdbcType=VARCHAR},
@ -499,7 +509,8 @@
request_pass_rate = #{record.requestPassRate,jdbcType=VARCHAR}, request_pass_rate = #{record.requestPassRate,jdbcType=VARCHAR},
assertion_pass_rate = #{record.assertionPassRate,jdbcType=VARCHAR}, assertion_pass_rate = #{record.assertionPassRate,jdbcType=VARCHAR},
script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR},
exec_status = #{record.execStatus,jdbcType=VARCHAR} exec_status = #{record.execStatus,jdbcType=VARCHAR},
`plan` = #{record.plan,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -510,8 +521,8 @@
<if test="name != null"> <if test="name != null">
`name` = #{name,jdbcType=VARCHAR}, `name` = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="testPlanId != null"> <if test="testPlanCaseId != null">
test_plan_id = #{testPlanId,jdbcType=VARCHAR}, test_plan_case_id = #{testPlanCaseId,jdbcType=VARCHAR},
</if> </if>
<if test="createUser != null"> <if test="createUser != null">
create_user = #{createUser,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR},
@ -600,13 +611,16 @@
<if test="execStatus != null"> <if test="execStatus != null">
exec_status = #{execStatus,jdbcType=VARCHAR}, exec_status = #{execStatus,jdbcType=VARCHAR},
</if> </if>
<if test="plan != null">
`plan` = #{plan,jdbcType=BIT},
</if>
</set> </set>
where id = #{id,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="io.metersphere.api.domain.ApiReport"> <update id="updateByPrimaryKey" parameterType="io.metersphere.api.domain.ApiReport">
update api_report update api_report
set `name` = #{name,jdbcType=VARCHAR}, set `name` = #{name,jdbcType=VARCHAR},
test_plan_id = #{testPlanId,jdbcType=VARCHAR}, test_plan_case_id = #{testPlanCaseId,jdbcType=VARCHAR},
create_user = #{createUser,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR},
delete_time = #{deleteTime,jdbcType=BIGINT}, delete_time = #{deleteTime,jdbcType=BIGINT},
delete_user = #{deleteUser,jdbcType=VARCHAR}, delete_user = #{deleteUser,jdbcType=VARCHAR},
@ -635,20 +649,21 @@
request_pass_rate = #{requestPassRate,jdbcType=VARCHAR}, request_pass_rate = #{requestPassRate,jdbcType=VARCHAR},
assertion_pass_rate = #{assertionPassRate,jdbcType=VARCHAR}, assertion_pass_rate = #{assertionPassRate,jdbcType=VARCHAR},
script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, script_identifier = #{scriptIdentifier,jdbcType=VARCHAR},
exec_status = #{execStatus,jdbcType=VARCHAR} exec_status = #{execStatus,jdbcType=VARCHAR},
`plan` = #{plan,jdbcType=BIT}
where id = #{id,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}
</update> </update>
<insert id="batchInsert" parameterType="map"> <insert id="batchInsert" parameterType="map">
insert into api_report insert into api_report
(id, `name`, test_plan_id, create_user, delete_time, delete_user, deleted, update_user, (id, `name`, test_plan_case_id, create_user, delete_time, delete_user, deleted, update_user,
update_time, start_time, end_time, request_duration, `status`, trigger_mode, run_mode, update_time, start_time, end_time, request_duration, `status`, trigger_mode, run_mode,
pool_id, integrated, project_id, environment_id, error_count, fake_error_count, pool_id, integrated, project_id, environment_id, error_count, fake_error_count,
pending_count, success_count, assertion_count, assertion_success_count, request_error_rate, pending_count, success_count, assertion_count, assertion_success_count, request_error_rate,
request_pending_rate, request_fake_error_rate, request_pass_rate, assertion_pass_rate, request_pending_rate, request_fake_error_rate, request_pass_rate, assertion_pass_rate,
script_identifier, exec_status) script_identifier, exec_status, `plan`)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.testPlanId,jdbcType=VARCHAR}, (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.testPlanCaseId,jdbcType=VARCHAR},
#{item.createUser,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=BIGINT}, #{item.deleteUser,jdbcType=VARCHAR}, #{item.createUser,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=BIGINT}, #{item.deleteUser,jdbcType=VARCHAR},
#{item.deleted,jdbcType=BIT}, #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=BIGINT}, #{item.deleted,jdbcType=BIT}, #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=BIGINT},
#{item.startTime,jdbcType=BIGINT}, #{item.endTime,jdbcType=BIGINT}, #{item.requestDuration,jdbcType=BIGINT}, #{item.startTime,jdbcType=BIGINT}, #{item.endTime,jdbcType=BIGINT}, #{item.requestDuration,jdbcType=BIGINT},
@ -659,7 +674,8 @@
#{item.assertionSuccessCount,jdbcType=BIGINT}, #{item.requestErrorRate,jdbcType=VARCHAR}, #{item.assertionSuccessCount,jdbcType=BIGINT}, #{item.requestErrorRate,jdbcType=VARCHAR},
#{item.requestPendingRate,jdbcType=VARCHAR}, #{item.requestFakeErrorRate,jdbcType=VARCHAR}, #{item.requestPendingRate,jdbcType=VARCHAR}, #{item.requestFakeErrorRate,jdbcType=VARCHAR},
#{item.requestPassRate,jdbcType=VARCHAR}, #{item.assertionPassRate,jdbcType=VARCHAR}, #{item.requestPassRate,jdbcType=VARCHAR}, #{item.assertionPassRate,jdbcType=VARCHAR},
#{item.scriptIdentifier,jdbcType=VARCHAR}, #{item.execStatus,jdbcType=VARCHAR}) #{item.scriptIdentifier,jdbcType=VARCHAR}, #{item.execStatus,jdbcType=VARCHAR},
#{item.plan,jdbcType=BIT})
</foreach> </foreach>
</insert> </insert>
<insert id="batchInsertSelective" parameterType="map"> <insert id="batchInsertSelective" parameterType="map">
@ -678,8 +694,8 @@
<if test="'name'.toString() == column.value"> <if test="'name'.toString() == column.value">
#{item.name,jdbcType=VARCHAR} #{item.name,jdbcType=VARCHAR}
</if> </if>
<if test="'test_plan_id'.toString() == column.value"> <if test="'test_plan_case_id'.toString() == column.value">
#{item.testPlanId,jdbcType=VARCHAR} #{item.testPlanCaseId,jdbcType=VARCHAR}
</if> </if>
<if test="'create_user'.toString() == column.value"> <if test="'create_user'.toString() == column.value">
#{item.createUser,jdbcType=VARCHAR} #{item.createUser,jdbcType=VARCHAR}
@ -768,6 +784,9 @@
<if test="'exec_status'.toString() == column.value"> <if test="'exec_status'.toString() == column.value">
#{item.execStatus,jdbcType=VARCHAR} #{item.execStatus,jdbcType=VARCHAR}
</if> </if>
<if test="'plan'.toString() == column.value">
#{item.plan,jdbcType=BIT}
</if>
</foreach> </foreach>
) )
</foreach> </foreach>

82
backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportMapper.xml
View File

@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiScenarioReport"> <resultMap id="BaseResultMap" type="io.metersphere.api.domain.ApiScenarioReport">
<id column="id" jdbcType="VARCHAR" property="id" /> <id column="id" jdbcType="VARCHAR" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" /> <result column="name" jdbcType="VARCHAR" property="name" />
<result column="test_plan_id" jdbcType="VARCHAR" property="testPlanId" /> <result column="test_plan_scenario_id" jdbcType="VARCHAR" property="testPlanScenarioId" />
<result column="create_user" jdbcType="VARCHAR" property="createUser" /> <result column="create_user" jdbcType="VARCHAR" property="createUser" />
<result column="delete_time" jdbcType="BIGINT" property="deleteTime" /> <result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
<result column="delete_user" jdbcType="VARCHAR" property="deleteUser" /> <result column="delete_user" jdbcType="VARCHAR" property="deleteUser" />
@ -35,6 +35,7 @@
<result column="script_identifier" jdbcType="VARCHAR" property="scriptIdentifier" /> <result column="script_identifier" jdbcType="VARCHAR" property="scriptIdentifier" />
<result column="waiting_time" jdbcType="BIGINT" property="waitingTime" /> <result column="waiting_time" jdbcType="BIGINT" property="waitingTime" />
<result column="exec_status" jdbcType="VARCHAR" property="execStatus" /> <result column="exec_status" jdbcType="VARCHAR" property="execStatus" />
<result column="plan" jdbcType="BIT" property="plan" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<where> <where>
@ -95,12 +96,12 @@
</where> </where>
</sql> </sql>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, `name`, test_plan_id, create_user, delete_time, delete_user, deleted, update_user, id, `name`, test_plan_scenario_id, create_user, delete_time, delete_user, deleted,
update_time, start_time, end_time, request_duration, `status`, trigger_mode, run_mode, update_user, update_time, start_time, end_time, request_duration, `status`, trigger_mode,
pool_id, integrated, project_id, environment_id, error_count, fake_error_count, pending_count, run_mode, pool_id, integrated, project_id, environment_id, error_count, fake_error_count,
success_count, assertion_count, assertion_success_count, request_error_rate, request_pending_rate, pending_count, success_count, assertion_count, assertion_success_count, request_error_rate,
request_fake_error_rate, request_pass_rate, assertion_pass_rate, script_identifier, request_pending_rate, request_fake_error_rate, request_pass_rate, assertion_pass_rate,
waiting_time, exec_status script_identifier, waiting_time, exec_status, `plan`
</sql> </sql>
<select id="selectByExample" parameterType="io.metersphere.api.domain.ApiScenarioReportExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="io.metersphere.api.domain.ApiScenarioReportExample" resultMap="BaseResultMap">
select select
@ -133,7 +134,7 @@
</if> </if>
</delete> </delete>
<insert id="insert" parameterType="io.metersphere.api.domain.ApiScenarioReport"> <insert id="insert" parameterType="io.metersphere.api.domain.ApiScenarioReport">
insert into api_scenario_report (id, `name`, test_plan_id, insert into api_scenario_report (id, `name`, test_plan_scenario_id,
create_user, delete_time, delete_user, create_user, delete_time, delete_user,
deleted, update_user, update_time, deleted, update_user, update_time,
start_time, end_time, request_duration, start_time, end_time, request_duration,
@ -144,8 +145,9 @@
assertion_success_count, request_error_rate, assertion_success_count, request_error_rate,
request_pending_rate, request_fake_error_rate, request_pending_rate, request_fake_error_rate,
request_pass_rate, assertion_pass_rate, script_identifier, request_pass_rate, assertion_pass_rate, script_identifier,
waiting_time, exec_status) waiting_time, exec_status, `plan`
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{testPlanId,jdbcType=VARCHAR}, )
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{testPlanScenarioId,jdbcType=VARCHAR},
#{createUser,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, #{deleteUser,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT}, #{deleteUser,jdbcType=VARCHAR},
#{deleted,jdbcType=BIT}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT}, #{deleted,jdbcType=BIT}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=BIGINT},
#{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{requestDuration,jdbcType=BIGINT}, #{startTime,jdbcType=BIGINT}, #{endTime,jdbcType=BIGINT}, #{requestDuration,jdbcType=BIGINT},
@ -156,7 +158,8 @@
#{assertionSuccessCount,jdbcType=BIGINT}, #{requestErrorRate,jdbcType=VARCHAR}, #{assertionSuccessCount,jdbcType=BIGINT}, #{requestErrorRate,jdbcType=VARCHAR},
#{requestPendingRate,jdbcType=VARCHAR}, #{requestFakeErrorRate,jdbcType=VARCHAR}, #{requestPendingRate,jdbcType=VARCHAR}, #{requestFakeErrorRate,jdbcType=VARCHAR},
#{requestPassRate,jdbcType=VARCHAR}, #{assertionPassRate,jdbcType=VARCHAR}, #{scriptIdentifier,jdbcType=VARCHAR}, #{requestPassRate,jdbcType=VARCHAR}, #{assertionPassRate,jdbcType=VARCHAR}, #{scriptIdentifier,jdbcType=VARCHAR},
#{waitingTime,jdbcType=BIGINT}, #{execStatus,jdbcType=VARCHAR}) #{waitingTime,jdbcType=BIGINT}, #{execStatus,jdbcType=VARCHAR}, #{plan,jdbcType=BIT}
)
</insert> </insert>
<insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiScenarioReport"> <insert id="insertSelective" parameterType="io.metersphere.api.domain.ApiScenarioReport">
insert into api_scenario_report insert into api_scenario_report
@ -167,8 +170,8 @@
<if test="name != null"> <if test="name != null">
`name`, `name`,
</if> </if>
<if test="testPlanId != null"> <if test="testPlanScenarioId != null">
test_plan_id, test_plan_scenario_id,
</if> </if>
<if test="createUser != null"> <if test="createUser != null">
create_user, create_user,
@ -260,6 +263,9 @@
<if test="execStatus != null"> <if test="execStatus != null">
exec_status, exec_status,
</if> </if>
<if test="plan != null">
`plan`,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -268,8 +274,8 @@
<if test="name != null"> <if test="name != null">
#{name,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
</if> </if>
<if test="testPlanId != null"> <if test="testPlanScenarioId != null">
#{testPlanId,jdbcType=VARCHAR}, #{testPlanScenarioId,jdbcType=VARCHAR},
</if> </if>
<if test="createUser != null"> <if test="createUser != null">
#{createUser,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR},
@ -361,6 +367,9 @@
<if test="execStatus != null"> <if test="execStatus != null">
#{execStatus,jdbcType=VARCHAR}, #{execStatus,jdbcType=VARCHAR},
</if> </if>
<if test="plan != null">
#{plan,jdbcType=BIT},
</if>
</trim> </trim>
</insert> </insert>
<select id="countByExample" parameterType="io.metersphere.api.domain.ApiScenarioReportExample" resultType="java.lang.Long"> <select id="countByExample" parameterType="io.metersphere.api.domain.ApiScenarioReportExample" resultType="java.lang.Long">
@ -378,8 +387,8 @@
<if test="record.name != null"> <if test="record.name != null">
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
</if> </if>
<if test="record.testPlanId != null"> <if test="record.testPlanScenarioId != null">
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR}, test_plan_scenario_id = #{record.testPlanScenarioId,jdbcType=VARCHAR},
</if> </if>
<if test="record.createUser != null"> <if test="record.createUser != null">
create_user = #{record.createUser,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR},
@ -471,6 +480,9 @@
<if test="record.execStatus != null"> <if test="record.execStatus != null">
exec_status = #{record.execStatus,jdbcType=VARCHAR}, exec_status = #{record.execStatus,jdbcType=VARCHAR},
</if> </if>
<if test="record.plan != null">
`plan` = #{record.plan,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
@ -480,7 +492,7 @@
update api_scenario_report update api_scenario_report
set id = #{record.id,jdbcType=VARCHAR}, set id = #{record.id,jdbcType=VARCHAR},
`name` = #{record.name,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR},
test_plan_id = #{record.testPlanId,jdbcType=VARCHAR}, test_plan_scenario_id = #{record.testPlanScenarioId,jdbcType=VARCHAR},
create_user = #{record.createUser,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR},
delete_time = #{record.deleteTime,jdbcType=BIGINT}, delete_time = #{record.deleteTime,jdbcType=BIGINT},
delete_user = #{record.deleteUser,jdbcType=VARCHAR}, delete_user = #{record.deleteUser,jdbcType=VARCHAR},
@ -510,7 +522,8 @@
assertion_pass_rate = #{record.assertionPassRate,jdbcType=VARCHAR}, assertion_pass_rate = #{record.assertionPassRate,jdbcType=VARCHAR},
script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR},
waiting_time = #{record.waitingTime,jdbcType=BIGINT}, waiting_time = #{record.waitingTime,jdbcType=BIGINT},
exec_status = #{record.execStatus,jdbcType=VARCHAR} exec_status = #{record.execStatus,jdbcType=VARCHAR},
`plan` = #{record.plan,jdbcType=BIT}
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
</if> </if>
@ -521,8 +534,8 @@
<if test="name != null"> <if test="name != null">
`name` = #{name,jdbcType=VARCHAR}, `name` = #{name,jdbcType=VARCHAR},
</if> </if>
<if test="testPlanId != null"> <if test="testPlanScenarioId != null">
test_plan_id = #{testPlanId,jdbcType=VARCHAR}, test_plan_scenario_id = #{testPlanScenarioId,jdbcType=VARCHAR},
</if> </if>
<if test="createUser != null"> <if test="createUser != null">
create_user = #{createUser,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR},
@ -614,13 +627,16 @@
<if test="execStatus != null"> <if test="execStatus != null">
exec_status = #{execStatus,jdbcType=VARCHAR}, exec_status = #{execStatus,jdbcType=VARCHAR},
</if> </if>
<if test="plan != null">
`plan` = #{plan,jdbcType=BIT},
</if>
</set> </set>
where id = #{id,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}
</update> </update>
<update id="updateByPrimaryKey" parameterType="io.metersphere.api.domain.ApiScenarioReport"> <update id="updateByPrimaryKey" parameterType="io.metersphere.api.domain.ApiScenarioReport">
update api_scenario_report update api_scenario_report
set `name` = #{name,jdbcType=VARCHAR}, set `name` = #{name,jdbcType=VARCHAR},
test_plan_id = #{testPlanId,jdbcType=VARCHAR}, test_plan_scenario_id = #{testPlanScenarioId,jdbcType=VARCHAR},
create_user = #{createUser,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR},
delete_time = #{deleteTime,jdbcType=BIGINT}, delete_time = #{deleteTime,jdbcType=BIGINT},
delete_user = #{deleteUser,jdbcType=VARCHAR}, delete_user = #{deleteUser,jdbcType=VARCHAR},
@ -650,20 +666,21 @@
assertion_pass_rate = #{assertionPassRate,jdbcType=VARCHAR}, assertion_pass_rate = #{assertionPassRate,jdbcType=VARCHAR},
script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, script_identifier = #{scriptIdentifier,jdbcType=VARCHAR},
waiting_time = #{waitingTime,jdbcType=BIGINT}, waiting_time = #{waitingTime,jdbcType=BIGINT},
exec_status = #{execStatus,jdbcType=VARCHAR} exec_status = #{execStatus,jdbcType=VARCHAR},
`plan` = #{plan,jdbcType=BIT}
where id = #{id,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}
</update> </update>
<insert id="batchInsert" parameterType="map"> <insert id="batchInsert" parameterType="map">
insert into api_scenario_report insert into api_scenario_report
(id, `name`, test_plan_id, create_user, delete_time, delete_user, deleted, update_user, (id, `name`, test_plan_scenario_id, create_user, delete_time, delete_user, deleted,
update_time, start_time, end_time, request_duration, `status`, trigger_mode, run_mode, update_user, update_time, start_time, end_time, request_duration, `status`, trigger_mode,
pool_id, integrated, project_id, environment_id, error_count, fake_error_count, run_mode, pool_id, integrated, project_id, environment_id, error_count, fake_error_count,
pending_count, success_count, assertion_count, assertion_success_count, request_error_rate, pending_count, success_count, assertion_count, assertion_success_count, request_error_rate,
request_pending_rate, request_fake_error_rate, request_pass_rate, assertion_pass_rate, request_pending_rate, request_fake_error_rate, request_pass_rate, assertion_pass_rate,
script_identifier, waiting_time, exec_status) script_identifier, waiting_time, exec_status, `plan`)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.testPlanId,jdbcType=VARCHAR}, (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.testPlanScenarioId,jdbcType=VARCHAR},
#{item.createUser,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=BIGINT}, #{item.deleteUser,jdbcType=VARCHAR}, #{item.createUser,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=BIGINT}, #{item.deleteUser,jdbcType=VARCHAR},
#{item.deleted,jdbcType=BIT}, #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=BIGINT}, #{item.deleted,jdbcType=BIT}, #{item.updateUser,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=BIGINT},
#{item.startTime,jdbcType=BIGINT}, #{item.endTime,jdbcType=BIGINT}, #{item.requestDuration,jdbcType=BIGINT}, #{item.startTime,jdbcType=BIGINT}, #{item.endTime,jdbcType=BIGINT}, #{item.requestDuration,jdbcType=BIGINT},
@ -675,7 +692,7 @@
#{item.requestPendingRate,jdbcType=VARCHAR}, #{item.requestFakeErrorRate,jdbcType=VARCHAR}, #{item.requestPendingRate,jdbcType=VARCHAR}, #{item.requestFakeErrorRate,jdbcType=VARCHAR},
#{item.requestPassRate,jdbcType=VARCHAR}, #{item.assertionPassRate,jdbcType=VARCHAR}, #{item.requestPassRate,jdbcType=VARCHAR}, #{item.assertionPassRate,jdbcType=VARCHAR},
#{item.scriptIdentifier,jdbcType=VARCHAR}, #{item.waitingTime,jdbcType=BIGINT}, #{item.scriptIdentifier,jdbcType=VARCHAR}, #{item.waitingTime,jdbcType=BIGINT},
#{item.execStatus,jdbcType=VARCHAR}) #{item.execStatus,jdbcType=VARCHAR}, #{item.plan,jdbcType=BIT})
</foreach> </foreach>
</insert> </insert>
<insert id="batchInsertSelective" parameterType="map"> <insert id="batchInsertSelective" parameterType="map">
@ -694,8 +711,8 @@
<if test="'name'.toString() == column.value"> <if test="'name'.toString() == column.value">
#{item.name,jdbcType=VARCHAR} #{item.name,jdbcType=VARCHAR}
</if> </if>
<if test="'test_plan_id'.toString() == column.value"> <if test="'test_plan_scenario_id'.toString() == column.value">
#{item.testPlanId,jdbcType=VARCHAR} #{item.testPlanScenarioId,jdbcType=VARCHAR}
</if> </if>
<if test="'create_user'.toString() == column.value"> <if test="'create_user'.toString() == column.value">
#{item.createUser,jdbcType=VARCHAR} #{item.createUser,jdbcType=VARCHAR}
@ -787,6 +804,9 @@
<if test="'exec_status'.toString() == column.value"> <if test="'exec_status'.toString() == column.value">
#{item.execStatus,jdbcType=VARCHAR} #{item.execStatus,jdbcType=VARCHAR}
</if> </if>
<if test="'plan'.toString() == column.value">
#{item.plan,jdbcType=BIT}
</if>
</foreach> </foreach>
) )
</foreach> </foreach>

16
backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_13__ga_ddl.sql
View File

@ -133,9 +133,6 @@ ALTER TABLE api_scenario_report ADD COLUMN exec_status VARCHAR(20) NOT NULL DEF
ALTER TABLE api_scenario_report ALTER COLUMN status set DEFAULT '-'; ALTER TABLE api_scenario_report ALTER COLUMN status set DEFAULT '-';
CREATE INDEX idx_exec_status ON api_scenario_report(exec_status); CREATE INDEX idx_exec_status ON api_scenario_report(exec_status);
-- set innodb lock wait timeout to default
SET SESSION innodb_lock_wait_timeout = DEFAULT;
-- 测试计划队列表 -- 测试计划队列表
CREATE TABLE IF NOT EXISTS test_plan_execution_queue CREATE TABLE IF NOT EXISTS test_plan_execution_queue
( (
@ -152,5 +149,18 @@ CREATE TABLE IF NOT EXISTS test_plan_execution_queue
DEFAULT CHARSET = utf8mb4 DEFAULT CHARSET = utf8mb4
COLLATE = utf8mb4_general_ci COMMENT = '测试计划执行队列'; COLLATE = utf8mb4_general_ci COMMENT = '测试计划执行队列';
ALTER TABLE api_report CHANGE COLUMN `test_plan_id` `test_plan_case_id` VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '测试计划关联用例表ID';
ALTER TABLE api_report DROP INDEX idx_test_plan_id;
CREATE INDEX idx_test_plan_case_id ON api_report(test_plan_case_id);
ALTER TABLE api_report ADD COLUMN `plan` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否是测试计划整体执行';
CREATE INDEX idx_plan ON api_report(`plan`);
ALTER TABLE api_scenario_report CHANGE COLUMN `test_plan_id` `test_plan_scenario_id` VARCHAR(50) NOT NULL DEFAULT 'NONE' COMMENT '测试计划关联场景表ID';
ALTER TABLE api_scenario_report DROP INDEX idx_test_plan_id;
CREATE INDEX idx_test_plan_scenario_id ON api_scenario_report(test_plan_scenario_id);
ALTER TABLE api_scenario_report ADD COLUMN `plan` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否是测试计划整体执行';
CREATE INDEX idx_plan ON api_scenario_report(`plan`);
-- set innodb lock wait timeout to default
SET SESSION innodb_lock_wait_timeout = DEFAULT;

4
backend/services/api-test/src/main/java/io/metersphere/api/dto/report/ReportDTO.java
View File

@ -23,6 +23,10 @@ public class ReportDTO implements Serializable {
private String organizationId; private String organizationId;
@Schema(description = "是否是集成报告") @Schema(description = "是否是集成报告")
private Boolean integrated; private Boolean integrated;
@Schema(description = "资源id")
private String resourceId;
@Schema(description = "测试计划id")
private String testPlanId;
} }

19
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiReportMapper.xml
View File

@ -28,7 +28,7 @@
select select
ar.* ar.*
from api_report ar where ar.deleted = false from api_report ar where ar.deleted = false
and ar.test_plan_id = 'NONE' and ar.test_plan_case_id = 'NONE'
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
and ( and (
ar.name like concat('%', #{request.keyword},'%') ar.name like concat('%', #{request.keyword},'%')
@ -45,7 +45,7 @@
select select
ar.id ar.id
from api_report ar where ar.deleted = false from api_report ar where ar.deleted = false
and ar.test_plan_id = 'NONE' and ar.test_plan_case_id = 'NONE'
<if test="request.condition.keyword != null"> <if test="request.condition.keyword != null">
and ( and (
ar.name like concat('%', #{request.condition.keyword},'%') ar.name like concat('%', #{request.condition.keyword},'%')
@ -62,7 +62,7 @@
select select
api_report.id, api_report.id,
api_report.name api_report.name
from api_report where api_report.test_plan_id = 'NONE' from api_report where api_report.test_plan_case_id = 'NONE'
and api_report.id in and api_report.id in
<foreach collection="ids" item="id" open="(" separator="," close=")"> <foreach collection="ids" item="id" open="(" separator="," close=")">
#{id} #{id}
@ -97,7 +97,7 @@
count(api_report.id) count(api_report.id)
from api_report inner join api_report_step on from api_report inner join api_report_step on
api_report_step.report_id = api_report.id api_report_step.report_id = api_report.id
where api_report.test_plan_id = 'NONE' where api_report.test_plan_case_id = 'NONE'
and api_report.start_time &lt;= #{time} and api_report.start_time &lt;= #{time}
and api_report.project_id = #{projectId} and api_report.project_id = #{projectId}
</select> </select>
@ -106,7 +106,7 @@
api_report.id api_report.id
from api_report inner join api_report_step on from api_report inner join api_report_step on
api_report_step.report_id = api_report.id api_report_step.report_id = api_report.id
where api_report.test_plan_id = 'NONE' where api_report.test_plan_case_id = 'NONE'
and api_report.start_time &lt;= #{time} and api_report.start_time &lt;= #{time}
and api_report.project_id = #{projectId} limit 500; and api_report.project_id = #{projectId} limit 500;
</select> </select>
@ -177,6 +177,7 @@
ar.create_user AS operationName, ar.create_user AS operationName,
ar.trigger_mode, ar.trigger_mode,
ar.start_time, ar.start_time,
ar.plan,
project.organization_id, project.organization_id,
if(ar.integrated, ar.id, c.num) AS resourceNum, if(ar.integrated, ar.id, c.num) AS resourceNum,
@ -192,7 +193,7 @@
left join project on ar.project_id = project.id left join project on ar.project_id = project.id
where where
ar.start_time BETWEEN #{startTime} AND #{endTime} ar.start_time BETWEEN #{startTime} AND #{endTime}
and ar.plan = 0
<if test="projectIds != null and projectIds.size() > 0"> <if test="projectIds != null and projectIds.size() > 0">
and and
ar.project_id IN ar.project_id IN
@ -211,12 +212,12 @@
</include> </include>
</select> </select>
<select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO"> <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
select distinct ar.* , project.organization_id from api_report ar select distinct ar.* , project.organization_id , a.api_test_case_id as resourceId from api_report ar
LEFT JOIN api_test_case_record a ON ar.id = a.api_report_id LEFT JOIN api_test_case_record a ON ar.id = a.api_report_id
LEFT JOIN api_test_case c ON a.api_test_case_id = c.id LEFT JOIN api_test_case c ON a.api_test_case_id = c.id
left join project on ar.project_id = project.id left join project on ar.project_id = project.id
where where
ar.deleted = false ar.deleted = false and ar.plan = 0
and ar.start_time BETWEEN #{startTime} AND #{endTime} and ar.start_time BETWEEN #{startTime} AND #{endTime}
and ar.exec_status in ('PENDING', 'RUNNING', 'RERUNNING') and ar.exec_status in ('PENDING', 'RUNNING', 'RERUNNING')
<if test="ids != null and ids.size() > 0"> <if test="ids != null and ids.size() > 0">
@ -252,7 +253,7 @@
name, name,
project_id project_id
from api_report where deleted = false from api_report where deleted = false
and test_plan_id = 'NONE' and test_plan_case_id = 'NONE'
and id in and id in
<foreach collection="ids" item="id" open="(" separator="," close=")"> <foreach collection="ids" item="id" open="(" separator="," close=")">
#{id} #{id}

2
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioMapper.xml
View File

@ -495,7 +495,7 @@
api_scenario_report.start_time, api_scenario_report.start_time,
api_scenario_report.create_user, api_scenario_report.create_user,
api_scenario_report.trigger_mode, api_scenario_report.trigger_mode,
api_scenario_report.test_plan_id, api_scenario_report.test_plan_scenario_id,
api_scenario_report.deleted api_scenario_report.deleted
from api_scenario_report from api_scenario_report
left join api_scenario_record t1 on t1.api_scenario_report_id = api_scenario_report.id left join api_scenario_record t1 on t1.api_scenario_report_id = api_scenario_report.id

17
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiScenarioReportMapper.xml
View File

@ -27,7 +27,7 @@
select select
asr.* asr.*
from api_scenario_report asr where asr.deleted = false from api_scenario_report asr where asr.deleted = false
and asr.test_plan_id = 'NONE' and asr.test_plan_scenario_id = 'NONE'
<if test="request.keyword != null and request.keyword != ''"> <if test="request.keyword != null and request.keyword != ''">
and ( and (
asr.name like concat('%', #{request.keyword},'%') asr.name like concat('%', #{request.keyword},'%')
@ -44,7 +44,7 @@
select select
asr.id asr.id
from api_scenario_report asr where asr.deleted = false from api_scenario_report asr where asr.deleted = false
and asr.test_plan_id = 'NONE' and asr.test_plan_scenario_id = 'NONE'
<if test="request.condition.keyword != null"> <if test="request.condition.keyword != null">
and ( and (
asr.name like concat('%', #{request.condition.keyword},'%') asr.name like concat('%', #{request.condition.keyword},'%')
@ -62,7 +62,7 @@
api_scenario_report.id, api_scenario_report.id,
api_scenario_report.name api_scenario_report.name
from api_scenario_report where from api_scenario_report where
api_scenario_report.test_plan_id = 'NONE' api_scenario_report.test_plan_scenario_id = 'NONE'
and api_scenario_report.id in and api_scenario_report.id in
<foreach collection="ids" item="id" open="(" separator="," close=")"> <foreach collection="ids" item="id" open="(" separator="," close=")">
#{id} #{id}
@ -90,7 +90,7 @@
count(api_scenario_report.id) count(api_scenario_report.id)
from api_scenario_report inner join api_scenario_report_step on from api_scenario_report inner join api_scenario_report_step on
api_scenario_report.id = api_scenario_report_step.report_id api_scenario_report.id = api_scenario_report_step.report_id
where api_scenario_report.test_plan_id = 'NONE' where api_scenario_report.test_plan_scenario_id = 'NONE'
and api_scenario_report.start_time &lt;= #{time} and api_scenario_report.start_time &lt;= #{time}
and api_scenario_report.project_id = #{projectId} and api_scenario_report.project_id = #{projectId}
</select> </select>
@ -99,18 +99,19 @@
api_scenario_report.id api_scenario_report.id
from api_scenario_report inner join api_scenario_report_step on from api_scenario_report inner join api_scenario_report_step on
api_scenario_report.id = api_scenario_report_step.report_id api_scenario_report.id = api_scenario_report_step.report_id
where api_scenario_report.test_plan_id = 'NONE' where api_scenario_report.test_plan_scenario_id = 'NONE'
and api_scenario_report.start_time &lt;= #{time} and api_scenario_report.start_time &lt;= #{time}
and api_scenario_report.project_id = #{projectId} limit 500 and api_scenario_report.project_id = #{projectId} limit 500
</select> </select>
<select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO"> <select id="getReports" resultType="io.metersphere.api.dto.report.ReportDTO">
select distinct asr.*, project.organization_id from api_scenario_report asr select distinct asr.*, project.organization_id, a.api_scenario_id as resourceId from api_scenario_report asr
left join api_scenario_record a on asr.id = a.api_scenario_report_id left join api_scenario_record a on asr.id = a.api_scenario_report_id
left JOIN api_scenario s on a.api_scenario_id = s.id left JOIN api_scenario s on a.api_scenario_id = s.id
left join project on asr.project_id = project.id left join project on asr.project_id = project.id
where where
asr.deleted = false asr.deleted = false
and asr.plan = 0
and asr.start_time BETWEEN #{startTime} AND #{endTime} and asr.start_time BETWEEN #{startTime} AND #{endTime}
and asr.exec_status in ('PENDING', 'RUNNING', 'RERUNNING') and asr.exec_status in ('PENDING', 'RUNNING', 'RERUNNING')
<if test="ids != null and ids.size() > 0"> <if test="ids != null and ids.size() > 0">
@ -150,6 +151,7 @@
asr.trigger_mode, asr.trigger_mode,
asr.script_identifier, asr.script_identifier,
asr.start_time, asr.start_time,
asr.plan,
project.organization_id, project.organization_id,
if(asr.integrated, asr.id, s.num) AS resourceNum, if(asr.integrated, asr.id, s.num) AS resourceNum,
@ -163,6 +165,7 @@
left JOIN test_resource_pool t on asr.pool_id = t.id left JOIN test_resource_pool t on asr.pool_id = t.id
left join project on asr.project_id = project.id left join project on asr.project_id = project.id
where asr.start_time BETWEEN #{startTime} AND #{endTime} where asr.start_time BETWEEN #{startTime} AND #{endTime}
and asr.plan = 0
<if test="projectIds != null and projectIds.size() > 0"> <if test="projectIds != null and projectIds.size() > 0">
and and
asr.project_id IN asr.project_id IN
@ -187,7 +190,7 @@
api_scenario_report.name, api_scenario_report.name,
api_scenario_report.project_id api_scenario_report.project_id
from api_scenario_report where api_scenario_report.deleted = false from api_scenario_report where api_scenario_report.deleted = false
and api_scenario_report.test_plan_id = 'NONE' and api_scenario_report.test_plan_scenario_id = 'NONE'
and api_scenario_report.id in and api_scenario_report.id in
<foreach collection="ids" item="id" open="(" separator="," close=")"> <foreach collection="ids" item="id" open="(" separator="," close=")">
#{id} #{id}

2
backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiTestCaseMapper.xml
View File

@ -255,7 +255,7 @@
api_report.start_time, api_report.start_time,
api_report.create_user, api_report.create_user,
api_report.trigger_mode, api_report.trigger_mode,
api_report.test_plan_id, api_report.test_plan_case_id,
api_report.deleted, api_report.deleted,
api_report.integrated api_report.integrated
from api_report from api_report

17
backend/services/api-test/src/main/java/io/metersphere/api/service/ApiTaskCenterService.java
View File

@ -253,14 +253,11 @@ public class ApiTaskCenterService {
String module) { String module) {
Map<String, List<String>> poolIdMap = reports.stream() Map<String, List<String>> poolIdMap = reports.stream()
.collect(Collectors.groupingBy(ReportDTO::getPoolId, Collectors.mapping(ReportDTO::getId, Collectors.toList()))); .collect(Collectors.groupingBy(ReportDTO::getPoolId, Collectors.mapping(ReportDTO::getId, Collectors.toList())));
// 根据报告id分组 key是报告id value是 是否集成
Map<String, Boolean> integrationMap = reports.stream()
.collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getIntegrated));
poolIdMap.forEach((poolId, reportList) -> { poolIdMap.forEach((poolId, reportList) -> {
TestResourcePoolReturnDTO testResourcePoolDTO = testResourcePoolService.getTestResourcePoolDetail(poolId); TestResourcePoolReturnDTO testResourcePoolDTO = testResourcePoolService.getTestResourcePoolDetail(poolId);
List<TestResourceNodeDTO> nodesList = testResourcePoolDTO.getTestResourceReturnDTO().getNodesList(); List<TestResourceNodeDTO> nodesList = testResourcePoolDTO.getTestResourceReturnDTO().getNodesList();
if (CollectionUtils.isNotEmpty(nodesList)) { if (CollectionUtils.isNotEmpty(nodesList)) {
stopTask(request, reportList, nodesList, userId, path, method, module, integrationMap); stopTask(request, reportList, nodesList, userId, path, method, module, reports);
} }
}); });
} }
@ -272,7 +269,12 @@ public class ApiTaskCenterService {
String path, String path,
String method, String method,
String module, String module,
Map<String, Boolean> integrationMap) { List<ReportDTO> reports) {
// 根据报告id分组 key是报告id value是 是否集成
Map<String, Boolean> integrationMap = reports.stream()
.collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getIntegrated));
Map<String, String> resourceIdMap = reports.stream()
.collect(Collectors.toMap(ReportDTO::getId, ReportDTO::getResourceId));
nodesList.parallelStream().forEach(node -> { nodesList.parallelStream().forEach(node -> {
String endpoint = TaskRunnerClient.getEndpoint(node.getIp(), node.getPort()); String endpoint = TaskRunnerClient.getEndpoint(node.getIp(), node.getPort());
//需要去除取消勾选的report //需要去除取消勾选的report
@ -297,13 +299,16 @@ public class ApiTaskCenterService {
subList.forEach(reportId -> { subList.forEach(reportId -> {
TaskInfo taskInfo = taskRequestDTO.getTaskInfo(); TaskInfo taskInfo = taskRequestDTO.getTaskInfo();
TaskItem taskItem = new TaskItem(); TaskItem taskItem = new TaskItem();
taskRequestDTO.setTaskItem(taskItem);
taskItem.setReportId(reportId); taskItem.setReportId(reportId);
taskItem.setResourceId(resourceIdMap.getOrDefault(reportId, null));
// TODO 这里需要兼容测试计划批量执行的类型
taskInfo.setResourceType(request.getModuleType()); taskInfo.setResourceType(request.getModuleType());
taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId)); taskInfo.getRunModeConfig().setIntegratedReport(integrationMap.get(reportId));
if (BooleanUtils.isTrue(integrationMap.get(reportId))) { if (BooleanUtils.isTrue(integrationMap.get(reportId))) {
taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId); taskInfo.getRunModeConfig().getCollectionReport().setReportId(reportId);
} }
taskRequestDTO.setTaskItem(taskItem);
result.setRequest(taskRequestDTO); result.setRequest(taskRequestDTO);
kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result)); kafkaTemplate.send(KafkaTopicConstants.API_REPORT_TOPIC, JSON.toJSONString(result));
}); });

80
backend/services/api-test/src/test/resources/dml/init_api_definition.sql
View File

@ -67,26 +67,26 @@ INSERT INTO `api_definition_mock_config` VALUES
DELETE FROM `api_report` WHERE `id` in ('1', '2', '3', '4','5','6', '7', '8', '9','10','11', '12', '13', '14','15','16', '17', '18', '19','20'); DELETE FROM `api_report` WHERE `id` in ('1', '2', '3', '4','5','6', '7', '8', '9','10','11', '12', '13', '14','15','16', '17', '18', '19','20');
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('1', 'Test Report 1', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642000001, UNIX_TIMESTAMP() * 1000, 1642002000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_1', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_1'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('1', 'Test Report 1', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642000001, UNIX_TIMESTAMP() * 1000, 1642002000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_1', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_1',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('10', 'Test Report 10', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642400101, UNIX_TIMESTAMP() * 1000, 1642402100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_5', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_10'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('10', 'Test Report 10', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642400101, UNIX_TIMESTAMP() * 1000, 1642402100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_5', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_10',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('11', 'Test Report 11', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642500001, UNIX_TIMESTAMP() * 1000, 1642502000, 1000, 'FAKE_ERROR', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_6', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_11'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('11', 'Test Report 11', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642500001, UNIX_TIMESTAMP() * 1000, 1642502000, 1000, 'FAKE_ERROR', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_6', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_11',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('12', 'Test Report 12', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642500101, UNIX_TIMESTAMP() * 1000, 1642502100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_6', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_12'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('12', 'Test Report 12', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642500101, UNIX_TIMESTAMP() * 1000, 1642502100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_6', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_12',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('13', 'Test Report 13', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642600001, UNIX_TIMESTAMP() * 1000, 1642602000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_7', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_13'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('13', 'Test Report 13', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642600001, UNIX_TIMESTAMP() * 1000, 1642602000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_7', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_13',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('14', 'Test Report 14', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642600101, UNIX_TIMESTAMP() * 1000, 1642602100, 1000, 'FAKE_ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_7', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_14'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('14', 'Test Report 14', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642600101, UNIX_TIMESTAMP() * 1000, 1642602100, 1000, 'FAKE_ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_7', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_14',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('15', 'Test Report 15', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642700001, UNIX_TIMESTAMP() * 1000, 1642702000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_8', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_15'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('15', 'Test Report 15', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642700001, UNIX_TIMESTAMP() * 1000, 1642702000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_8', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_15',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('16', 'Test Report 16', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642700101, UNIX_TIMESTAMP() * 1000, 1642702100, 1000, 'SUCCESS', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_8', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_16'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('16', 'Test Report 16', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642700101, UNIX_TIMESTAMP() * 1000, 1642702100, 1000, 'SUCCESS', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_8', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_16',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('17', 'Test Report 17', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642800001, UNIX_TIMESTAMP() * 1000, 1642802000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_9', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_17'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('17', 'Test Report 17', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642800001, UNIX_TIMESTAMP() * 1000, 1642802000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_9', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_17',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('18', 'Test Report 18', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642800101, UNIX_TIMESTAMP() * 1000, 1642802100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_9', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_18'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('18', 'Test Report 18', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642800101, UNIX_TIMESTAMP() * 1000, 1642802100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_9', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_18',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('19', 'Test Report 19', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642900001, UNIX_TIMESTAMP() * 1000, 1642902000, 1000, 'FAKE_ERROR', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_10', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_19'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('19', 'Test Report 19', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642900001, UNIX_TIMESTAMP() * 1000, 1642902000, 1000, 'FAKE_ERROR', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_10', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_19',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('2', 'Test Report 2', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642000101, UNIX_TIMESTAMP() * 1000, 1642002100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_1', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_2'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('2', 'Test Report 2', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642000101, UNIX_TIMESTAMP() * 1000, 1642002100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_1', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_2',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('20', 'Test Report 20', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642900101, UNIX_TIMESTAMP() * 1000, 1642902100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_10', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_20'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('20', 'Test Report 20', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642900101, UNIX_TIMESTAMP() * 1000, 1642902100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'0', '100001100001', 'env_10', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_20',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('3', 'Test Report 3', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642100001, UNIX_TIMESTAMP() * 1000, 1642102000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_2', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_3'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('3', 'Test Report 3', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642100001, UNIX_TIMESTAMP() * 1000, 1642102000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'0', '100001100001', 'env_2', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_3',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('4', 'Test Report 4', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642100101, UNIX_TIMESTAMP() * 1000, 1642102100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'1', '100001100001', 'env_2', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_4'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('4', 'Test Report 4', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642100101, UNIX_TIMESTAMP() * 1000, 1642102100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'1', '100001100001', 'env_2', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_4',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('5', 'Test Report 5', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642200001, UNIX_TIMESTAMP() * 1000, 1642202000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'1', '100001100001', 'env_3', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_5'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('5', 'Test Report 5', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642200001, UNIX_TIMESTAMP() * 1000, 1642202000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'1', '100001100001', 'env_3', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_5',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('6', 'Test Report 6', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642200101, UNIX_TIMESTAMP() * 1000, 1642202100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'1', '100001100001', 'env_3', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_6'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('6', 'Test Report 6', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642200101, UNIX_TIMESTAMP() * 1000, 1642202100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'1', '100001100001', 'env_3', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_6',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('7', 'Test Report 7', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642300001, UNIX_TIMESTAMP() * 1000, 1642302000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'1', '100001100001', 'env_4', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_7'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('7', 'Test Report 7', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642300001, UNIX_TIMESTAMP() * 1000, 1642302000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'1', '100001100001', 'env_4', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_7',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('8', 'Test Report 8', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642300101, UNIX_TIMESTAMP() * 1000, 1642302100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'1', '100001100001', 'env_4', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_8'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('8', 'Test Report 8', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642300101, UNIX_TIMESTAMP() * 1000, 1642302100, 1000, 'ERROR', 'AUTOMATED', 'PARALLEL', '100660357777795313', b'1', '100001100001', 'env_4', 10, 5, 10, 85, 150, 145, '50%', '10%', '5%', '80%', '90%', 'script_8',0);
INSERT INTO `api_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('9', 'Test Report 9', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642400001, UNIX_TIMESTAMP() * 1000, 1642402000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'1', '100001100001', 'env_5', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_9'); INSERT INTO `api_report` (`id`, `name`, `test_plan_case_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('9', 'Test Report 9', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1642400001, UNIX_TIMESTAMP() * 1000, 1642402000, 1000, 'SUCCESS', 'MANUAL', 'SEQUENTIAL', '100660357777795313', b'1', '100001100001', 'env_5', 0, 0, 0, 100, 150, 150, '50%', '10%', '5%', '80%', '90%', 'script_9',0);
DELETE FROM `api_test_case_record` WHERE `api_report_id` in ('1', '2', '3', '4','5','6', '7', '8', '9','10','11', '12', '13', '14','15','16', '17', '18', '19','20'); DELETE FROM `api_test_case_record` WHERE `api_report_id` in ('1', '2', '3', '4','5','6', '7', '8', '9','10','11', '12', '13', '14','15','16', '17', '18', '19','20');
INSERT INTO `api_test_case_record` (`api_report_id`, `api_test_case_id`) VALUES ('1', '12df5721-c5e6-a38b-e999-3eafcb992094'); INSERT INTO `api_test_case_record` (`api_report_id`, `api_test_case_id`) VALUES ('1', '12df5721-c5e6-a38b-e999-3eafcb992094');
@ -125,26 +125,26 @@ INSERT INTO `api_scenario` (`id`, `name`, `priority`, `status`, `step_total`, `r
INSERT INTO `api_scenario` (`id`, `name`, `priority`, `status`, `step_total`, `request_pass_rate`, `last_report_status`, `last_report_id`, `num`, `deleted`, `pos`, `version_id`, `ref_id`, `latest`, `project_id`, `module_id`, `description`, `tags`, `grouped`, `environment_id`, `create_user`, `create_time`, `delete_time`, `delete_user`, `update_user`, `update_time`) VALUES ('9', 'Scenario 9', 'P2', 'Not Planned', 16, 'Calculating', 'PENDING', NULL, 1009, b'0', 9, 'version_9', 'ref_9', b'1', '100001100001', 'module_9', 'Description 9', '[\"tag1\",\"tag3\"]', b'1', 'env_5', 'admin', 1640772869000, NULL, NULL, 'admin', 1640772869000); INSERT INTO `api_scenario` (`id`, `name`, `priority`, `status`, `step_total`, `request_pass_rate`, `last_report_status`, `last_report_id`, `num`, `deleted`, `pos`, `version_id`, `ref_id`, `latest`, `project_id`, `module_id`, `description`, `tags`, `grouped`, `environment_id`, `create_user`, `create_time`, `delete_time`, `delete_user`, `update_user`, `update_time`) VALUES ('9', 'Scenario 9', 'P2', 'Not Planned', 16, 'Calculating', 'PENDING', NULL, 1009, b'0', 9, 'version_9', 'ref_9', b'1', '100001100001', 'module_9', 'Description 9', '[\"tag1\",\"tag3\"]', b'1', 'env_5', 'admin', 1640772869000, NULL, NULL, 'admin', 1640772869000);
DELETE FROM `api_scenario_report` WHERE `id` in ('report_1', 'report_2', 'report_3', 'report_4','report_5','report_6', 'report_7', 'report_8', 'report_9','report_10','report_11', 'report_12', 'report_13', 'report_14','report_15','report_16', 'report_17', 'report_18', 'report_19','report_20'); DELETE FROM `api_scenario_report` WHERE `id` in ('report_1', 'report_2', 'report_3', 'report_4','report_5','report_6', 'report_7', 'report_8', 'report_9','report_10','report_11', 'report_12', 'report_13', 'report_14','report_15','report_16', 'report_17', 'report_18', 'report_19','report_20');
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_1', 'Report 1', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773000000, UNIX_TIMESTAMP() * 1000, 1640774000000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_1', 2, 0, 0, 2, 20, 18, '95%', 'Calculating', 'Calculating', '90%', '90%', 'script_1'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_1', 'Report 1', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773000000, UNIX_TIMESTAMP() * 1000, 1640774000000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_1', 2, 0, 0, 2, 20, 18, '95%', 'Calculating', 'Calculating', '90%', '90%', 'script_1',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_10', 'Report 10', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773900000, UNIX_TIMESTAMP() * 1000, 1640774900000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_10', 2, 0, 0, 2, 22, 20, '90%', 'Calculating', 'Calculating', '85%', '80%', 'script_10'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_10', 'Report 10', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773900000, UNIX_TIMESTAMP() * 1000, 1640774900000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_10', 2, 0, 0, 2, 22, 20, '90%', 'Calculating', 'Calculating', '85%', '80%', 'script_10',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_11', 'Report 11', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774000000, UNIX_TIMESTAMP() * 1000, 1640775000000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_11', 3, 1, 0, 2, 28, 26, '75%', 'Calculating', 'Calculating', '80%', '85%', 'script_11'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_11', 'Report 11', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774000000, UNIX_TIMESTAMP() * 1000, 1640775000000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_11', 3, 1, 0, 2, 28, 26, '75%', 'Calculating', 'Calculating', '80%', '85%', 'script_11',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_12', 'Report 12', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774100000, UNIX_TIMESTAMP() * 1000, 1640775100000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_12', 0, 0, 16, 16, 26, 24, 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_12'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_12', 'Report 12', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774100000, UNIX_TIMESTAMP() * 1000, 1640775100000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_12', 0, 0, 16, 16, 26, 24, 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_12',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_13', 'Report 13', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774200000, UNIX_TIMESTAMP() * 1000, 1640775200000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_13', 2, 0, 0, 2, 24, 22, '80%', 'Calculating', 'Calculating', '85%', '90%', 'script_13'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_13', 'Report 13', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774200000, UNIX_TIMESTAMP() * 1000, 1640775200000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_13', 2, 0, 0, 2, 24, 22, '80%', 'Calculating', 'Calculating', '85%', '90%', 'script_13',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_14', 'Report 14', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774300000, UNIX_TIMESTAMP() * 1000, 1640775300000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_14', 3, 1, 0, 2, 20, 18, '70%', 'Calculating', 'Calculating', '75%', '80%', 'script_14'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_14', 'Report 14', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774300000, UNIX_TIMESTAMP() * 1000, 1640775300000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_14', 3, 1, 0, 2, 20, 18, '70%', 'Calculating', 'Calculating', '75%', '80%', 'script_14',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_15', 'Report 15', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774400000, UNIX_TIMESTAMP() * 1000, 1640775400000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_15', 0, 0, 18, 18, 22, 20, 'Calculating','Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_15'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_15', 'Report 15', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774400000, UNIX_TIMESTAMP() * 1000, 1640775400000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_15', 0, 0, 18, 18, 22, 20, 'Calculating','Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_15',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_16', 'Report 16', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774500000, UNIX_TIMESTAMP() * 1000, 1640775500000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_16', 2, 0, 0, 2, 20, 18, '85%', 'Calculating', 'Calculating', '90%', '90%', 'script_16'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_16', 'Report 16', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774500000, UNIX_TIMESTAMP() * 1000, 1640775500000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_16', 2, 0, 0, 2, 20, 18, '85%', 'Calculating', 'Calculating', '90%', '90%', 'script_16',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_17', 'Report 17', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774600000, UNIX_TIMESTAMP() * 1000, 1640775600000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_17', 3, 1, 0, 2, 26, 24, '75%', 'Calculating', 'Calculating', '80%', '85%', 'script_17'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_17', 'Report 17', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774600000, UNIX_TIMESTAMP() * 1000, 1640775600000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_17', 3, 1, 0, 2, 26, 24, '75%', 'Calculating', 'Calculating', '80%', '85%', 'script_17',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_18', 'Report 18', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774700000, UNIX_TIMESTAMP() * 1000, 1640775700000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_18', 0, 0, 20, 20, 30, 28, 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_18'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_18', 'Report 18', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774700000, UNIX_TIMESTAMP() * 1000, 1640775700000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_18', 0, 0, 20, 20, 30, 28, 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_18',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_19', 'Report 19', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774800000, UNIX_TIMESTAMP() * 1000, 1640775800000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_19', 2, 0, 0, 2, 18, 16, '90%', 'Calculating', 'Calculating', '85%', '80%', 'script_19'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_19', 'Report 19', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774800000, UNIX_TIMESTAMP() * 1000, 1640775800000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_19', 2, 0, 0, 2, 18, 16, '90%', 'Calculating', 'Calculating', '85%', '80%', 'script_19',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_2', 'Report 2', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773100000, UNIX_TIMESTAMP() * 1000, 1640774100000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_2', 3, 1, 0, 2, 22, 20, '80%', 'Calculating', 'Calculating', '85%', '90%', 'script_2'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_2', 'Report 2', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773100000, UNIX_TIMESTAMP() * 1000, 1640774100000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_2', 3, 1, 0, 2, 22, 20, '80%', 'Calculating', 'Calculating', '85%', '90%', 'script_2',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_20', 'Report 20', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774900000, UNIX_TIMESTAMP() * 1000, 1640775900000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_20', 3, 1, 0, 2, 22, 20, '70%', 'Calculating', 'Calculating', '75%', '80%', 'script_20'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_20', 'Report 20', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640774900000, UNIX_TIMESTAMP() * 1000, 1640775900000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_20', 3, 1, 0, 2, 22, 20, '70%', 'Calculating', 'Calculating', '75%', '80%', 'script_20',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_3', 'Report 3', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773200000, UNIX_TIMESTAMP() * 1000, 1640774200000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_3', 0, 0, 10, 10, 30, 28, 'Calculating','Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_3'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_3', 'Report 3', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773200000, UNIX_TIMESTAMP() * 1000, 1640774200000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_3', 0, 0, 10, 10, 30, 28, 'Calculating','Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_3',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_4', 'Report 4', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773300000, UNIX_TIMESTAMP() * 1000, 1640774300000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_4', 2, 0, 0, 2, 18, 16, '90%','Calculating', 'Calculating', '85%', '80%', 'script_4'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_4', 'Report 4', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773300000, UNIX_TIMESTAMP() * 1000, 1640774300000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_4', 2, 0, 0, 2, 18, 16, '90%','Calculating', 'Calculating', '85%', '80%', 'script_4',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_5', 'Report 5', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773400000, UNIX_TIMESTAMP() * 1000, 1640774400000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_5', 3, 1, 0, 2, 24, 22, '70%', 'Calculating', 'Calculating', '75%', '80%', 'script_5'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_5', 'Report 5', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773400000, UNIX_TIMESTAMP() * 1000, 1640774400000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_5', 3, 1, 0, 2, 24, 22, '70%', 'Calculating', 'Calculating', '75%', '80%', 'script_5',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_6', 'Report 6', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773500000, UNIX_TIMESTAMP() * 1000, 1640774500000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_6', 0, 0, 12, 12, 20, 18, 'Calculating','Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_6'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_6', 'Report 6', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773500000, UNIX_TIMESTAMP() * 1000, 1640774500000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_6', 0, 0, 12, 12, 20, 18, 'Calculating','Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_6',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_7', 'Report 7', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773600000, UNIX_TIMESTAMP() * 1000, 1640774600000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_7', 2, 0, 0, 2, 16, 14, '85%', 'Calculating', 'Calculating', '90%', '90%', 'script_7'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_7', 'Report 7', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773600000, UNIX_TIMESTAMP() * 1000, 1640774600000, 5000, 'SUCCESS', 'Manual', 'Standalone', '100660357777795313', b'0', '100001100001', 'env_7', 2, 0, 0, 2, 16, 14, '85%', 'Calculating', 'Calculating', '90%', '90%', 'script_7',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_8', 'Report 8', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773700000, UNIX_TIMESTAMP() * 1000, 1640774700000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_8', 3, 1, 0, 2, 20, 18, 'Calculating', 'Calculating', '70%', '75%', '80%', 'script_8'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_8', 'Report 8', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773700000, UNIX_TIMESTAMP() * 1000, 1640774700000, 5000, 'ERROR', 'Automated', 'Distributed', '100660357777795313', b'0', '100001100001', 'env_8', 3, 1, 0, 2, 20, 18, 'Calculating', 'Calculating', '70%', '75%', '80%', 'script_8',0);
INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`) VALUES ('report_9', 'Report 9', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773800000, UNIX_TIMESTAMP() * 1000, 1640774800000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_9', 0, 0, 14, 14, 18, 16, 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_9'); INSERT INTO `api_scenario_report` (`id`, `name`, `test_plan_scenario_id`, `create_user`, `delete_time`, `delete_user`, `deleted`, `update_user`, `update_time`, `start_time`, `end_time`, `request_duration`, `status`, `trigger_mode`, `run_mode`, `pool_id`, `integrated`, `project_id`, `environment_id`, `error_count`, `fake_error_count`, `pending_count`, `success_count`, `assertion_count`, `assertion_success_count`, `request_error_rate`, `request_pending_rate`, `request_fake_error_rate`, `request_pass_rate`, `assertion_pass_rate`, `script_identifier`,`plan`) VALUES ('report_9', 'Report 9', 'NONE', 'admin', NULL, NULL, b'0', 'admin', 1640773800000, UNIX_TIMESTAMP() * 1000, 1640774800000, 5000, 'PENDING', 'Automated', 'Standalone', '100660357777795313', b'1', '100001100001', 'env_9', 0, 0, 14, 14, 18, 16, 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'Calculating', 'script_9',0);

38
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtRealMapper.xml
View File

@ -8,11 +8,14 @@
api_report ar api_report ar
where where
ar.start_time BETWEEN #{startTime} AND #{endTime} ar.start_time BETWEEN #{startTime} AND #{endTime}
and and ar.plan = 0
ar.project_id IN <if test="ids != null and ids.size() > 0">
<foreach collection="projectIds" item="projectId" separator="," open="(" close=")"> and
#{projectId} ar.project_id IN
</foreach> <foreach collection="ids" item="projectId" separator="," open="(" close=")">
#{projectId}
</foreach>
</if>
</select> </select>
<select id="scenarioReportCountByProjectIds" resultType="java.lang.Integer"> <select id="scenarioReportCountByProjectIds" resultType="java.lang.Integer">
select count(distinct asr.id) select count(distinct asr.id)
@ -20,11 +23,14 @@
api_scenario_report asr api_scenario_report asr
where where
asr.start_time BETWEEN #{startTime} AND #{endTime} asr.start_time BETWEEN #{startTime} AND #{endTime}
and and asr.plan = 0
asr.project_id IN <if test="ids != null and ids.size() > 0">
<foreach collection="projectIds" item="projectId" separator="," open="(" close=")"> and
#{projectId} asr.project_id IN
</foreach> <foreach collection="ids" item="projectId" separator="," open="(" close=")">
#{projectId}
</foreach>
</if>
</select> </select>
<select id="testPlanReportCountByProjectIds" resultType="java.lang.Integer"> <select id="testPlanReportCountByProjectIds" resultType="java.lang.Integer">
select count(distinct tpr.id) select count(distinct tpr.id)
@ -32,10 +38,12 @@
test_plan_report tpr test_plan_report tpr
where where
tpr.start_time BETWEEN #{startTime} AND #{endTime} tpr.start_time BETWEEN #{startTime} AND #{endTime}
and <if test="ids != null and ids.size() > 0">
tpr.project_id IN and
<foreach collection="projectIds" item="projectId" separator="," open="(" close=")"> tpr.project_id IN
#{projectId} <foreach collection="ids" item="projectId" separator="," open="(" close=")">
</foreach> #{projectId}
</foreach>
</if>
</select> </select>
</mapper> </mapper>

1
backend/services/system-setting/src/main/java/io/metersphere/system/mapper/ExtScheduleMapper.xml
View File

@ -237,7 +237,6 @@
<foreach collection="ids" item="id" separator="," open="(" close=")"> <foreach collection="ids" item="id" separator="," open="(" close=")">
#{id} #{id}
</foreach> </foreach>
and project_id in
</if> </if>
</select> </select>

12
backend/services/system-setting/src/main/java/io/metersphere/system/service/TaskCenterService.java
View File

@ -355,9 +355,7 @@ public class TaskCenterService {
} }
public int getSystemScheduleTotal() { public int getSystemScheduleTotal() {
List<OptionDTO> projectList = getSystemProjectList(); return extScheduleMapper.countByProjectIds(new ArrayList<>());
List<String> projectIds = projectList.stream().map(OptionDTO::getId).toList();
return extScheduleMapper.countByProjectIds(projectIds);
} }
public int getOrgScheduleTotal(String currentOrganizationId) { public int getOrgScheduleTotal(String currentOrganizationId) {
@ -374,11 +372,9 @@ public class TaskCenterService {
} }
public int getSystemRealTotal() { public int getSystemRealTotal() {
List<OptionDTO> projectList = getSystemProjectList(); int apiTestCaseTotal = extRealMapper.caseReportCountByProjectIds(new ArrayList<>(), DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
List<String> projectIds = projectList.stream().map(OptionDTO::getId).toList(); int apiScenarioTotal = extRealMapper.scenarioReportCountByProjectIds(new ArrayList<>(), DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
int apiTestCaseTotal = extRealMapper.caseReportCountByProjectIds(projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime()); int testPlanTotal = extRealMapper.testPlanReportCountByProjectIds(new ArrayList<>(), DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
int apiScenarioTotal = extRealMapper.scenarioReportCountByProjectIds(projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
int testPlanTotal = extRealMapper.testPlanReportCountByProjectIds(projectIds, DateUtils.getDailyStartTime(), DateUtils.getDailyEndTime());
return apiTestCaseTotal + apiScenarioTotal + testPlanTotal; return apiTestCaseTotal + apiScenarioTotal + testPlanTotal;
} }