diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebug.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebug.java index 75952a2b5b..b4914c920c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebug.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebug.java @@ -53,6 +53,9 @@ public class ApiDebug implements Serializable { @Schema(description = "修改人") private String updateUser; + @Schema(description = "") + private Long pos; + private static final long serialVersionUID = 1L; public enum Column { @@ -66,7 +69,8 @@ public class ApiDebug implements Serializable { createTime("create_time", "createTime", "BIGINT", false), createUser("create_user", "createUser", "VARCHAR", false), updateTime("update_time", "updateTime", "BIGINT", false), - updateUser("update_user", "updateUser", "VARCHAR", false); + updateUser("update_user", "updateUser", "VARCHAR", false), + pos("pos", "pos", "BIGINT", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebugExample.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebugExample.java index 7170a72232..2662994607 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebugExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDebugExample.java @@ -853,6 +853,66 @@ public class ApiDebugExample { addCriterion("update_user not between", value1, value2, "updateUser"); return (Criteria) this; } + + public Criteria andPosIsNull() { + addCriterion("pos is null"); + return (Criteria) this; + } + + public Criteria andPosIsNotNull() { + addCriterion("pos is not null"); + return (Criteria) this; + } + + public Criteria andPosEqualTo(Long value) { + addCriterion("pos =", value, "pos"); + return (Criteria) this; + } + + public Criteria andPosNotEqualTo(Long value) { + addCriterion("pos <>", value, "pos"); + return (Criteria) this; + } + + public Criteria andPosGreaterThan(Long value) { + addCriterion("pos >", value, "pos"); + return (Criteria) this; + } + + public Criteria andPosGreaterThanOrEqualTo(Long value) { + addCriterion("pos >=", value, "pos"); + return (Criteria) this; + } + + public Criteria andPosLessThan(Long value) { + addCriterion("pos <", value, "pos"); + return (Criteria) this; + } + + public Criteria andPosLessThanOrEqualTo(Long value) { + addCriterion("pos <=", value, "pos"); + return (Criteria) this; + } + + public Criteria andPosIn(List values) { + addCriterion("pos in", values, "pos"); + return (Criteria) this; + } + + public Criteria andPosNotIn(List values) { + addCriterion("pos not in", values, "pos"); + return (Criteria) this; + } + + public Criteria andPosBetween(Long value1, Long value2) { + addCriterion("pos between", value1, value2, "pos"); + return (Criteria) this; + } + + public Criteria andPosNotBetween(Long value1, Long value2) { + addCriterion("pos not between", value1, value2, "pos"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinition.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinition.java index 3c38c19a0b..7e72b0dfc1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinition.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinition.java @@ -1,17 +1,13 @@ package io.metersphere.api.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - +import jakarta.validation.constraints.*; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import lombok.Data; @Data public class ApiDefinition implements Serializable { @@ -45,7 +41,7 @@ public class ApiDefinition implements Serializable { private Long num; @Schema(description = "标签") - private List tags; + private java.util.List tags; @Schema(description = "自定义排序", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "{api_definition.pos.not_blank}", groups = {Created.class}) @@ -169,7 +165,7 @@ public class ApiDefinition implements Serializable { return this.getEscapedColumnName() + " ASC"; } - public static Column[] excludes(Column... excludes) { + public static Column[] excludes(Column ... excludes) { ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); if (excludes != null && excludes.length > 0) { columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMock.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMock.java index 6948cb3e8a..79d2439f66 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMock.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiDefinitionMock.java @@ -1,16 +1,13 @@ package io.metersphere.api.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.Data; - +import jakarta.validation.constraints.*; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import lombok.Data; @Data public class ApiDefinitionMock implements Serializable { @@ -34,7 +31,7 @@ public class ApiDefinitionMock implements Serializable { private String name; @Schema(description = "自定义标签") - private List tags; + private java.util.List tags; @Schema(description = "启用/禁用") private Boolean enable; @@ -111,7 +108,7 @@ public class ApiDefinitionMock implements Serializable { return this.getEscapedColumnName() + " ASC"; } - public static Column[] excludes(Column... excludes) { + public static Column[] excludes(Column ... excludes) { ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); if (excludes != null && excludes.length > 0) { columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReport.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReport.java index e37c426eec..0ef0804861 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReport.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReport.java @@ -10,91 +10,159 @@ import lombok.Data; @Data public class ApiReport implements Serializable { - @Schema(description = "接口结果报告pk", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "场景报告pk", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.id.not_blank}", groups = {Updated.class}) @Size(min = 1, max = 50, message = "{api_report.id.length_range}", groups = {Created.class, Updated.class}) private String id; - @Schema(description = "接口报告名称", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "报告名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.name.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 200, message = "{api_report.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{api_report.name.length_range}", groups = {Created.class, Updated.class}) private String name; - @Schema(description = "资源fk/api_definition_id/api_test_case_id", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "场景资源fk/api_definition_id/api_test_case_id", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.resource_id.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{api_report.resource_id.length_range}", groups = {Created.class, Updated.class}) private String resourceId; - @Schema(description = "创建时间") - private Long createTime; - - @Schema(description = "修改时间") - private Long updateTime; - - @Schema(description = "创建人fk") + @Schema(description = "创建人") private String createUser; + @Schema(description = "删除时间") + private Long deleteTime; + + @Schema(description = "删除人") + private String deleteUser; + + @Schema(description = "删除标识", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.deleted.not_blank}", groups = {Created.class}) + private Boolean deleted; + @Schema(description = "修改人") private String updateUser; - @Schema(description = "删除状态", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "{api_report.deleted.not_blank}", groups = {Created.class}) - private Boolean deleted; + @Schema(description = "更新时间") + private Long updateTime; - @Schema(description = "结果状态", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "开始时间/同创建时间一致", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.start_time.not_blank}", groups = {Created.class}) + private Long startTime; + + @Schema(description = "结束时间/报告执行完成", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.end_time.not_blank}", groups = {Created.class}) + private Long endTime; + + @Schema(description = "请求总耗时", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.request_duration.not_blank}", groups = {Created.class}) + private Long requestDuration; + + @Schema(description = "报告状态/SUCCESS/ERROR", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.status.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 50, message = "{api_report.status.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 20, message = "{api_report.status.length_range}", groups = {Created.class, Updated.class}) private String status; - @Schema(description = "执行模块/API/CASE/API_PLAN", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "触发方式", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{api_report.trigger_mode.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 20, message = "{api_report.trigger_mode.length_range}", groups = {Created.class, Updated.class}) + private String triggerMode; + + @Schema(description = "执行模式", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.run_mode.not_blank}", groups = {Created.class}) @Size(min = 1, max = 20, message = "{api_report.run_mode.length_range}", groups = {Created.class, Updated.class}) private String runMode; - @Schema(description = "资源池fk", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "资源池", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.pool_id.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{api_report.pool_id.length_range}", groups = {Created.class, Updated.class}) private String poolId; - @Schema(description = "触发模式/手动/批量/定时任务/JENKINS", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{api_report.trigger_mode.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 50, message = "{api_report.trigger_mode.length_range}", groups = {Created.class, Updated.class}) - private String triggerMode; - @Schema(description = "版本fk") private String versionId; + @Schema(description = "是否是集成报告", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.integrated.not_blank}", groups = {Created.class}) + private Boolean integrated; + @Schema(description = "项目fk", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report.project_id.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{api_report.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(description = "是否为集成报告，默认否", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "{api_report.integrated.not_blank}", groups = {Created.class}) - private Boolean integrated; - - @Schema(description = "环境id") + @Schema(description = "环境") private String environmentId; + @Schema(description = "失败数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.error_count.not_blank}", groups = {Created.class}) + private Long errorCount; + + @Schema(description = "误报数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.fake_error_count.not_blank}", groups = {Created.class}) + private Long fakeErrorCount; + + @Schema(description = "未执行数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.pending_count.not_blank}", groups = {Created.class}) + private Long pendingCount; + + @Schema(description = "成功数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.success_count.not_blank}", groups = {Created.class}) + private Long successCount; + + @Schema(description = "总断言数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.assertion_count.not_blank}", groups = {Created.class}) + private Long assertionCount; + + @Schema(description = "失败断言数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.pass_assertions_count.not_blank}", groups = {Created.class}) + private Long passAssertionsCount; + + @Schema(description = "请求执行率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.request_execution_rate.not_blank}", groups = {Created.class}) + private Long requestExecutionRate; + + @Schema(description = "请求通过率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.request_approval_rate.not_blank}", groups = {Created.class}) + private Long requestApprovalRate; + + @Schema(description = "断言通过率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report.assertion_pass_rate.not_blank}", groups = {Created.class}) + private Long assertionPassRate; + + @Schema(description = "脚本标识") + private String scriptIdentifier; + private static final long serialVersionUID = 1L; public enum Column { id("id", "id", "VARCHAR", false), name("name", "name", "VARCHAR", true), resourceId("resource_id", "resourceId", "VARCHAR", false), - createTime("create_time", "createTime", "BIGINT", false), - updateTime("update_time", "updateTime", "BIGINT", false), createUser("create_user", "createUser", "VARCHAR", false), - updateUser("update_user", "updateUser", "VARCHAR", false), + deleteTime("delete_time", "deleteTime", "BIGINT", false), + deleteUser("delete_user", "deleteUser", "VARCHAR", false), deleted("deleted", "deleted", "BIT", false), + updateUser("update_user", "updateUser", "VARCHAR", false), + updateTime("update_time", "updateTime", "BIGINT", false), + startTime("start_time", "startTime", "BIGINT", false), + endTime("end_time", "endTime", "BIGINT", false), + requestDuration("request_duration", "requestDuration", "BIGINT", false), status("status", "status", "VARCHAR", true), + triggerMode("trigger_mode", "triggerMode", "VARCHAR", false), runMode("run_mode", "runMode", "VARCHAR", false), poolId("pool_id", "poolId", "VARCHAR", false), - triggerMode("trigger_mode", "triggerMode", "VARCHAR", false), versionId("version_id", "versionId", "VARCHAR", false), - projectId("project_id", "projectId", "VARCHAR", false), integrated("integrated", "integrated", "BIT", false), - environmentId("environment_id", "environmentId", "VARCHAR", false); + projectId("project_id", "projectId", "VARCHAR", false), + environmentId("environment_id", "environmentId", "VARCHAR", false), + errorCount("error_count", "errorCount", "BIGINT", false), + fakeErrorCount("fake_error_count", "fakeErrorCount", "BIGINT", false), + pendingCount("pending_count", "pendingCount", "BIGINT", false), + successCount("success_count", "successCount", "BIGINT", false), + assertionCount("assertion_count", "assertionCount", "BIGINT", false), + passAssertionsCount("pass_assertions_count", "passAssertionsCount", "BIGINT", false), + requestExecutionRate("request_execution_rate", "requestExecutionRate", "BIGINT", false), + requestApprovalRate("request_approval_rate", "requestApprovalRate", "BIGINT", false), + assertionPassRate("assertion_pass_rate", "assertionPassRate", "BIGINT", false), + scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetail.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetail.java index e9c31d4b00..1fb6540ef6 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetail.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetail.java @@ -25,39 +25,31 @@ public class ApiReportDetail implements Serializable { @Size(min = 1, max = 50, message = "{api_report_detail.resource_id.length_range}", groups = {Created.class, Updated.class}) private String resourceId; - @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "{api_report_detail.start_time.not_blank}", groups = {Created.class}) - private Long startTime; - @Schema(description = "结果状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_report_detail.status.not_blank}", groups = {Created.class}) @Size(min = 1, max = 20, message = "{api_report_detail.status.length_range}", groups = {Created.class, Updated.class}) private String status; - @Schema(description = "单个请求步骤时间") - private Long requestTime; - - @Schema(description = "总断言数") - private Long assertionsTotal; - - @Schema(description = "失败断言数") - private Long passAssertionsTotal; - - @Schema(description = "误报编号") + @Schema(description = "误报编号/误报状态独有") private String fakeCode; @Schema(description = "请求名称") private String requestName; - @Schema(description = "项目fk") - private String projectId; - - @Schema(description = "失败总数") - private Integer errorTotal; + @Schema(description = "请求耗时", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report_detail.request_time.not_blank}", groups = {Created.class}) + private Long requestTime; @Schema(description = "请求响应码") private String code; + @Schema(description = "响应内容大小", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_report_detail.response_size.not_blank}", groups = {Created.class}) + private Long responseSize; + + @Schema(description = "脚本标识") + private String scriptIdentifier; + @Schema(description = "结果内容详情") private byte[] content; @@ -67,16 +59,13 @@ public class ApiReportDetail implements Serializable { id("id", "id", "VARCHAR", false), reportId("report_id", "reportId", "VARCHAR", false), resourceId("resource_id", "resourceId", "VARCHAR", false), - startTime("start_time", "startTime", "BIGINT", false), status("status", "status", "VARCHAR", true), - requestTime("request_time", "requestTime", "BIGINT", false), - assertionsTotal("assertions_total", "assertionsTotal", "BIGINT", false), - passAssertionsTotal("pass_assertions_total", "passAssertionsTotal", "BIGINT", false), fakeCode("fake_code", "fakeCode", "VARCHAR", false), requestName("request_name", "requestName", "VARCHAR", false), - projectId("project_id", "projectId", "VARCHAR", false), - errorTotal("error_total", "errorTotal", "INTEGER", false), + requestTime("request_time", "requestTime", "BIGINT", false), code("code", "code", "VARCHAR", false), + responseSize("response_size", "responseSize", "BIGINT", false), + scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false), content("content", "content", "LONGVARBINARY", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetailExample.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetailExample.java index 48c94294b3..6c110d7ca4 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetailExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportDetailExample.java @@ -314,66 +314,6 @@ public class ApiReportDetailExample { return (Criteria) this; } - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Long value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Long value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Long value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Long value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Long value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Long value1, Long value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Long value1, Long value2) { - addCriterion("start_time not between", value1, value2, "startTime"); - return (Criteria) this; - } - public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this; @@ -444,186 +384,6 @@ public class ApiReportDetailExample { return (Criteria) this; } - public Criteria andRequestTimeIsNull() { - addCriterion("request_time is null"); - return (Criteria) this; - } - - public Criteria andRequestTimeIsNotNull() { - addCriterion("request_time is not null"); - return (Criteria) this; - } - - public Criteria andRequestTimeEqualTo(Long value) { - addCriterion("request_time =", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeNotEqualTo(Long value) { - addCriterion("request_time <>", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeGreaterThan(Long value) { - addCriterion("request_time >", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeGreaterThanOrEqualTo(Long value) { - addCriterion("request_time >=", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeLessThan(Long value) { - addCriterion("request_time <", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeLessThanOrEqualTo(Long value) { - addCriterion("request_time <=", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeIn(List values) { - addCriterion("request_time in", values, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeNotIn(List values) { - addCriterion("request_time not in", values, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeBetween(Long value1, Long value2) { - addCriterion("request_time between", value1, value2, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeNotBetween(Long value1, Long value2) { - addCriterion("request_time not between", value1, value2, "requestTime"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalIsNull() { - addCriterion("assertions_total is null"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalIsNotNull() { - addCriterion("assertions_total is not null"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalEqualTo(Long value) { - addCriterion("assertions_total =", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalNotEqualTo(Long value) { - addCriterion("assertions_total <>", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalGreaterThan(Long value) { - addCriterion("assertions_total >", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalGreaterThanOrEqualTo(Long value) { - addCriterion("assertions_total >=", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalLessThan(Long value) { - addCriterion("assertions_total <", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalLessThanOrEqualTo(Long value) { - addCriterion("assertions_total <=", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalIn(List values) { - addCriterion("assertions_total in", values, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalNotIn(List values) { - addCriterion("assertions_total not in", values, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalBetween(Long value1, Long value2) { - addCriterion("assertions_total between", value1, value2, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalNotBetween(Long value1, Long value2) { - addCriterion("assertions_total not between", value1, value2, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalIsNull() { - addCriterion("pass_assertions_total is null"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalIsNotNull() { - addCriterion("pass_assertions_total is not null"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalEqualTo(Long value) { - addCriterion("pass_assertions_total =", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalNotEqualTo(Long value) { - addCriterion("pass_assertions_total <>", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalGreaterThan(Long value) { - addCriterion("pass_assertions_total >", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalGreaterThanOrEqualTo(Long value) { - addCriterion("pass_assertions_total >=", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalLessThan(Long value) { - addCriterion("pass_assertions_total <", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalLessThanOrEqualTo(Long value) { - addCriterion("pass_assertions_total <=", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalIn(List values) { - addCriterion("pass_assertions_total in", values, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalNotIn(List values) { - addCriterion("pass_assertions_total not in", values, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalBetween(Long value1, Long value2) { - addCriterion("pass_assertions_total between", value1, value2, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalNotBetween(Long value1, Long value2) { - addCriterion("pass_assertions_total not between", value1, value2, "passAssertionsTotal"); - return (Criteria) this; - } - public Criteria andFakeCodeIsNull() { addCriterion("fake_code is null"); return (Criteria) this; @@ -764,133 +524,63 @@ public class ApiReportDetailExample { return (Criteria) this; } - public Criteria andProjectIdIsNull() { - addCriterion("project_id is null"); + public Criteria andRequestTimeIsNull() { + addCriterion("request_time is null"); return (Criteria) this; } - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); + public Criteria andRequestTimeIsNotNull() { + addCriterion("request_time is not null"); return (Criteria) this; } - public Criteria andProjectIdEqualTo(String value) { - addCriterion("project_id =", value, "projectId"); + public Criteria andRequestTimeEqualTo(Long value) { + addCriterion("request_time =", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdNotEqualTo(String value) { - addCriterion("project_id <>", value, "projectId"); + public Criteria andRequestTimeNotEqualTo(Long value) { + addCriterion("request_time <>", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdGreaterThan(String value) { - addCriterion("project_id >", value, "projectId"); + public Criteria andRequestTimeGreaterThan(Long value) { + addCriterion("request_time >", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdGreaterThanOrEqualTo(String value) { - addCriterion("project_id >=", value, "projectId"); + public Criteria andRequestTimeGreaterThanOrEqualTo(Long value) { + addCriterion("request_time >=", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdLessThan(String value) { - addCriterion("project_id <", value, "projectId"); + public Criteria andRequestTimeLessThan(Long value) { + addCriterion("request_time <", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdLessThanOrEqualTo(String value) { - addCriterion("project_id <=", value, "projectId"); + public Criteria andRequestTimeLessThanOrEqualTo(Long value) { + addCriterion("request_time <=", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdLike(String value) { - addCriterion("project_id like", value, "projectId"); + public Criteria andRequestTimeIn(List values) { + addCriterion("request_time in", values, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdNotLike(String value) { - addCriterion("project_id not like", value, "projectId"); + public Criteria andRequestTimeNotIn(List values) { + addCriterion("request_time not in", values, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); + public Criteria andRequestTimeBetween(Long value1, Long value2) { + addCriterion("request_time between", value1, value2, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdBetween(String value1, String value2) { - addCriterion("project_id between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotBetween(String value1, String value2) { - addCriterion("project_id not between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andErrorTotalIsNull() { - addCriterion("error_total is null"); - return (Criteria) this; - } - - public Criteria andErrorTotalIsNotNull() { - addCriterion("error_total is not null"); - return (Criteria) this; - } - - public Criteria andErrorTotalEqualTo(Integer value) { - addCriterion("error_total =", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalNotEqualTo(Integer value) { - addCriterion("error_total <>", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalGreaterThan(Integer value) { - addCriterion("error_total >", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalGreaterThanOrEqualTo(Integer value) { - addCriterion("error_total >=", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalLessThan(Integer value) { - addCriterion("error_total <", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalLessThanOrEqualTo(Integer value) { - addCriterion("error_total <=", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalIn(List values) { - addCriterion("error_total in", values, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalNotIn(List values) { - addCriterion("error_total not in", values, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalBetween(Integer value1, Integer value2) { - addCriterion("error_total between", value1, value2, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalNotBetween(Integer value1, Integer value2) { - addCriterion("error_total not between", value1, value2, "errorTotal"); + public Criteria andRequestTimeNotBetween(Long value1, Long value2) { + addCriterion("request_time not between", value1, value2, "requestTime"); return (Criteria) this; } @@ -963,6 +653,136 @@ public class ApiReportDetailExample { addCriterion("code not between", value1, value2, "code"); return (Criteria) this; } + + public Criteria andResponseSizeIsNull() { + addCriterion("response_size is null"); + return (Criteria) this; + } + + public Criteria andResponseSizeIsNotNull() { + addCriterion("response_size is not null"); + return (Criteria) this; + } + + public Criteria andResponseSizeEqualTo(Long value) { + addCriterion("response_size =", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeNotEqualTo(Long value) { + addCriterion("response_size <>", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeGreaterThan(Long value) { + addCriterion("response_size >", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeGreaterThanOrEqualTo(Long value) { + addCriterion("response_size >=", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeLessThan(Long value) { + addCriterion("response_size <", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeLessThanOrEqualTo(Long value) { + addCriterion("response_size <=", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeIn(List values) { + addCriterion("response_size in", values, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeNotIn(List values) { + addCriterion("response_size not in", values, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeBetween(Long value1, Long value2) { + addCriterion("response_size between", value1, value2, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeNotBetween(Long value1, Long value2) { + addCriterion("response_size not between", value1, value2, "responseSize"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNull() { + addCriterion("script_identifier is null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNotNull() { + addCriterion("script_identifier is not null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierEqualTo(String value) { + addCriterion("script_identifier =", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotEqualTo(String value) { + addCriterion("script_identifier <>", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThan(String value) { + addCriterion("script_identifier >", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThanOrEqualTo(String value) { + addCriterion("script_identifier >=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThan(String value) { + addCriterion("script_identifier <", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThanOrEqualTo(String value) { + addCriterion("script_identifier <=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLike(String value) { + addCriterion("script_identifier like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotLike(String value) { + addCriterion("script_identifier not like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIn(List values) { + addCriterion("script_identifier in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotIn(List values) { + addCriterion("script_identifier not in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierBetween(String value1, String value2) { + addCriterion("script_identifier between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotBetween(String value1, String value2) { + addCriterion("script_identifier not between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportExample.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportExample.java index 7b3d778511..f9bbc7f706 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiReportExample.java @@ -314,126 +314,6 @@ public class ApiReportExample { return (Criteria) this; } - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Long value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Long value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Long value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Long value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Long value1, Long value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - public Criteria andCreateUserIsNull() { addCriterion("create_user is null"); return (Criteria) this; @@ -504,6 +384,196 @@ public class ApiReportExample { return (Criteria) this; } + public Criteria andDeleteTimeIsNull() { + addCriterion("delete_time is null"); + return (Criteria) this; + } + + public Criteria andDeleteTimeIsNotNull() { + addCriterion("delete_time is not null"); + return (Criteria) this; + } + + public Criteria andDeleteTimeEqualTo(Long value) { + addCriterion("delete_time =", value, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeNotEqualTo(Long value) { + addCriterion("delete_time <>", value, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeGreaterThan(Long value) { + addCriterion("delete_time >", value, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeGreaterThanOrEqualTo(Long value) { + addCriterion("delete_time >=", value, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeLessThan(Long value) { + addCriterion("delete_time <", value, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeLessThanOrEqualTo(Long value) { + addCriterion("delete_time <=", value, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeIn(List values) { + addCriterion("delete_time in", values, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeNotIn(List values) { + addCriterion("delete_time not in", values, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeBetween(Long value1, Long value2) { + addCriterion("delete_time between", value1, value2, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteTimeNotBetween(Long value1, Long value2) { + addCriterion("delete_time not between", value1, value2, "deleteTime"); + return (Criteria) this; + } + + public Criteria andDeleteUserIsNull() { + addCriterion("delete_user is null"); + return (Criteria) this; + } + + public Criteria andDeleteUserIsNotNull() { + addCriterion("delete_user is not null"); + return (Criteria) this; + } + + public Criteria andDeleteUserEqualTo(String value) { + addCriterion("delete_user =", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserNotEqualTo(String value) { + addCriterion("delete_user <>", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserGreaterThan(String value) { + addCriterion("delete_user >", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserGreaterThanOrEqualTo(String value) { + addCriterion("delete_user >=", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserLessThan(String value) { + addCriterion("delete_user <", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserLessThanOrEqualTo(String value) { + addCriterion("delete_user <=", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserLike(String value) { + addCriterion("delete_user like", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserNotLike(String value) { + addCriterion("delete_user not like", value, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserIn(List values) { + addCriterion("delete_user in", values, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserNotIn(List values) { + addCriterion("delete_user not in", values, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserBetween(String value1, String value2) { + addCriterion("delete_user between", value1, value2, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeleteUserNotBetween(String value1, String value2) { + addCriterion("delete_user not between", value1, value2, "deleteUser"); + return (Criteria) this; + } + + public Criteria andDeletedIsNull() { + addCriterion("deleted is null"); + return (Criteria) this; + } + + public Criteria andDeletedIsNotNull() { + addCriterion("deleted is not null"); + return (Criteria) this; + } + + public Criteria andDeletedEqualTo(Boolean value) { + addCriterion("deleted =", value, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedNotEqualTo(Boolean value) { + addCriterion("deleted <>", value, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedGreaterThan(Boolean value) { + addCriterion("deleted >", value, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { + addCriterion("deleted >=", value, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedLessThan(Boolean value) { + addCriterion("deleted <", value, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedLessThanOrEqualTo(Boolean value) { + addCriterion("deleted <=", value, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedIn(List values) { + addCriterion("deleted in", values, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedNotIn(List values) { + addCriterion("deleted not in", values, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedBetween(Boolean value1, Boolean value2) { + addCriterion("deleted between", value1, value2, "deleted"); + return (Criteria) this; + } + + public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { + addCriterion("deleted not between", value1, value2, "deleted"); + return (Criteria) this; + } + public Criteria andUpdateUserIsNull() { addCriterion("update_user is null"); return (Criteria) this; @@ -574,63 +644,243 @@ public class ApiReportExample { return (Criteria) this; } - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); + public Criteria andUpdateTimeIsNull() { + addCriterion("update_time is null"); return (Criteria) this; } - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); + public Criteria andUpdateTimeIsNotNull() { + addCriterion("update_time is not null"); return (Criteria) this; } - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); + public Criteria andUpdateTimeEqualTo(Long value) { + addCriterion("update_time =", value, "updateTime"); return (Criteria) this; } - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); + public Criteria andUpdateTimeNotEqualTo(Long value) { + addCriterion("update_time <>", value, "updateTime"); return (Criteria) this; } - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); + public Criteria andUpdateTimeGreaterThan(Long value) { + addCriterion("update_time >", value, "updateTime"); return (Criteria) this; } - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); + public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { + addCriterion("update_time >=", value, "updateTime"); return (Criteria) this; } - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); + public Criteria andUpdateTimeLessThan(Long value) { + addCriterion("update_time <", value, "updateTime"); return (Criteria) this; } - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); + public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { + addCriterion("update_time <=", value, "updateTime"); return (Criteria) this; } - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); + public Criteria andUpdateTimeIn(List values) { + addCriterion("update_time in", values, "updateTime"); return (Criteria) this; } - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); + public Criteria andUpdateTimeNotIn(List values) { + addCriterion("update_time not in", values, "updateTime"); return (Criteria) this; } - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); + public Criteria andUpdateTimeBetween(Long value1, Long value2) { + addCriterion("update_time between", value1, value2, "updateTime"); return (Criteria) this; } - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); + public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { + addCriterion("update_time not between", value1, value2, "updateTime"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNull() { + addCriterion("start_time is null"); + return (Criteria) this; + } + + public Criteria andStartTimeIsNotNull() { + addCriterion("start_time is not null"); + return (Criteria) this; + } + + public Criteria andStartTimeEqualTo(Long value) { + addCriterion("start_time =", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotEqualTo(Long value) { + addCriterion("start_time <>", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThan(Long value) { + addCriterion("start_time >", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { + addCriterion("start_time >=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThan(Long value) { + addCriterion("start_time <", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeLessThanOrEqualTo(Long value) { + addCriterion("start_time <=", value, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeIn(List values) { + addCriterion("start_time in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotIn(List values) { + addCriterion("start_time not in", values, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeBetween(Long value1, Long value2) { + addCriterion("start_time between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andStartTimeNotBetween(Long value1, Long value2) { + addCriterion("start_time not between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andRequestDurationIsNull() { + addCriterion("request_duration is null"); + return (Criteria) this; + } + + public Criteria andRequestDurationIsNotNull() { + addCriterion("request_duration is not null"); + return (Criteria) this; + } + + public Criteria andRequestDurationEqualTo(Long value) { + addCriterion("request_duration =", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationNotEqualTo(Long value) { + addCriterion("request_duration <>", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationGreaterThan(Long value) { + addCriterion("request_duration >", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationGreaterThanOrEqualTo(Long value) { + addCriterion("request_duration >=", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationLessThan(Long value) { + addCriterion("request_duration <", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationLessThanOrEqualTo(Long value) { + addCriterion("request_duration <=", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationIn(List values) { + addCriterion("request_duration in", values, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationNotIn(List values) { + addCriterion("request_duration not in", values, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationBetween(Long value1, Long value2) { + addCriterion("request_duration between", value1, value2, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationNotBetween(Long value1, Long value2) { + addCriterion("request_duration not between", value1, value2, "requestDuration"); return (Criteria) this; } @@ -704,6 +954,76 @@ public class ApiReportExample { return (Criteria) this; } + public Criteria andTriggerModeIsNull() { + addCriterion("trigger_mode is null"); + return (Criteria) this; + } + + public Criteria andTriggerModeIsNotNull() { + addCriterion("trigger_mode is not null"); + return (Criteria) this; + } + + public Criteria andTriggerModeEqualTo(String value) { + addCriterion("trigger_mode =", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeNotEqualTo(String value) { + addCriterion("trigger_mode <>", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeGreaterThan(String value) { + addCriterion("trigger_mode >", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeGreaterThanOrEqualTo(String value) { + addCriterion("trigger_mode >=", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeLessThan(String value) { + addCriterion("trigger_mode <", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeLessThanOrEqualTo(String value) { + addCriterion("trigger_mode <=", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeLike(String value) { + addCriterion("trigger_mode like", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeNotLike(String value) { + addCriterion("trigger_mode not like", value, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeIn(List values) { + addCriterion("trigger_mode in", values, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeNotIn(List values) { + addCriterion("trigger_mode not in", values, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeBetween(String value1, String value2) { + addCriterion("trigger_mode between", value1, value2, "triggerMode"); + return (Criteria) this; + } + + public Criteria andTriggerModeNotBetween(String value1, String value2) { + addCriterion("trigger_mode not between", value1, value2, "triggerMode"); + return (Criteria) this; + } + public Criteria andRunModeIsNull() { addCriterion("run_mode is null"); return (Criteria) this; @@ -844,76 +1164,6 @@ public class ApiReportExample { return (Criteria) this; } - public Criteria andTriggerModeIsNull() { - addCriterion("trigger_mode is null"); - return (Criteria) this; - } - - public Criteria andTriggerModeIsNotNull() { - addCriterion("trigger_mode is not null"); - return (Criteria) this; - } - - public Criteria andTriggerModeEqualTo(String value) { - addCriterion("trigger_mode =", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeNotEqualTo(String value) { - addCriterion("trigger_mode <>", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeGreaterThan(String value) { - addCriterion("trigger_mode >", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeGreaterThanOrEqualTo(String value) { - addCriterion("trigger_mode >=", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeLessThan(String value) { - addCriterion("trigger_mode <", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeLessThanOrEqualTo(String value) { - addCriterion("trigger_mode <=", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeLike(String value) { - addCriterion("trigger_mode like", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeNotLike(String value) { - addCriterion("trigger_mode not like", value, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeIn(List values) { - addCriterion("trigger_mode in", values, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeNotIn(List values) { - addCriterion("trigger_mode not in", values, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeBetween(String value1, String value2) { - addCriterion("trigger_mode between", value1, value2, "triggerMode"); - return (Criteria) this; - } - - public Criteria andTriggerModeNotBetween(String value1, String value2) { - addCriterion("trigger_mode not between", value1, value2, "triggerMode"); - return (Criteria) this; - } - public Criteria andVersionIdIsNull() { addCriterion("version_id is null"); return (Criteria) this; @@ -984,6 +1234,66 @@ public class ApiReportExample { return (Criteria) this; } + public Criteria andIntegratedIsNull() { + addCriterion("integrated is null"); + return (Criteria) this; + } + + public Criteria andIntegratedIsNotNull() { + addCriterion("integrated is not null"); + return (Criteria) this; + } + + public Criteria andIntegratedEqualTo(Boolean value) { + addCriterion("integrated =", value, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedNotEqualTo(Boolean value) { + addCriterion("integrated <>", value, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedGreaterThan(Boolean value) { + addCriterion("integrated >", value, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedGreaterThanOrEqualTo(Boolean value) { + addCriterion("integrated >=", value, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedLessThan(Boolean value) { + addCriterion("integrated <", value, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedLessThanOrEqualTo(Boolean value) { + addCriterion("integrated <=", value, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedIn(List values) { + addCriterion("integrated in", values, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedNotIn(List values) { + addCriterion("integrated not in", values, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedBetween(Boolean value1, Boolean value2) { + addCriterion("integrated between", value1, value2, "integrated"); + return (Criteria) this; + } + + public Criteria andIntegratedNotBetween(Boolean value1, Boolean value2) { + addCriterion("integrated not between", value1, value2, "integrated"); + return (Criteria) this; + } + public Criteria andProjectIdIsNull() { addCriterion("project_id is null"); return (Criteria) this; @@ -1054,66 +1364,6 @@ public class ApiReportExample { return (Criteria) this; } - public Criteria andIntegratedIsNull() { - addCriterion("integrated is null"); - return (Criteria) this; - } - - public Criteria andIntegratedIsNotNull() { - addCriterion("integrated is not null"); - return (Criteria) this; - } - - public Criteria andIntegratedEqualTo(Boolean value) { - addCriterion("integrated =", value, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedNotEqualTo(Boolean value) { - addCriterion("integrated <>", value, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedGreaterThan(Boolean value) { - addCriterion("integrated >", value, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedGreaterThanOrEqualTo(Boolean value) { - addCriterion("integrated >=", value, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedLessThan(Boolean value) { - addCriterion("integrated <", value, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedLessThanOrEqualTo(Boolean value) { - addCriterion("integrated <=", value, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedIn(List values) { - addCriterion("integrated in", values, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedNotIn(List values) { - addCriterion("integrated not in", values, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedBetween(Boolean value1, Boolean value2) { - addCriterion("integrated between", value1, value2, "integrated"); - return (Criteria) this; - } - - public Criteria andIntegratedNotBetween(Boolean value1, Boolean value2) { - addCriterion("integrated not between", value1, value2, "integrated"); - return (Criteria) this; - } - public Criteria andEnvironmentIdIsNull() { addCriterion("environment_id is null"); return (Criteria) this; @@ -1183,6 +1433,616 @@ public class ApiReportExample { addCriterion("environment_id not between", value1, value2, "environmentId"); return (Criteria) this; } + + public Criteria andErrorCountIsNull() { + addCriterion("error_count is null"); + return (Criteria) this; + } + + public Criteria andErrorCountIsNotNull() { + addCriterion("error_count is not null"); + return (Criteria) this; + } + + public Criteria andErrorCountEqualTo(Long value) { + addCriterion("error_count =", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountNotEqualTo(Long value) { + addCriterion("error_count <>", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountGreaterThan(Long value) { + addCriterion("error_count >", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountGreaterThanOrEqualTo(Long value) { + addCriterion("error_count >=", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountLessThan(Long value) { + addCriterion("error_count <", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountLessThanOrEqualTo(Long value) { + addCriterion("error_count <=", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountIn(List values) { + addCriterion("error_count in", values, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountNotIn(List values) { + addCriterion("error_count not in", values, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountBetween(Long value1, Long value2) { + addCriterion("error_count between", value1, value2, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountNotBetween(Long value1, Long value2) { + addCriterion("error_count not between", value1, value2, "errorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountIsNull() { + addCriterion("fake_error_count is null"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountIsNotNull() { + addCriterion("fake_error_count is not null"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountEqualTo(Long value) { + addCriterion("fake_error_count =", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountNotEqualTo(Long value) { + addCriterion("fake_error_count <>", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountGreaterThan(Long value) { + addCriterion("fake_error_count >", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountGreaterThanOrEqualTo(Long value) { + addCriterion("fake_error_count >=", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountLessThan(Long value) { + addCriterion("fake_error_count <", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountLessThanOrEqualTo(Long value) { + addCriterion("fake_error_count <=", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountIn(List values) { + addCriterion("fake_error_count in", values, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountNotIn(List values) { + addCriterion("fake_error_count not in", values, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountBetween(Long value1, Long value2) { + addCriterion("fake_error_count between", value1, value2, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountNotBetween(Long value1, Long value2) { + addCriterion("fake_error_count not between", value1, value2, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andPendingCountIsNull() { + addCriterion("pending_count is null"); + return (Criteria) this; + } + + public Criteria andPendingCountIsNotNull() { + addCriterion("pending_count is not null"); + return (Criteria) this; + } + + public Criteria andPendingCountEqualTo(Long value) { + addCriterion("pending_count =", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountNotEqualTo(Long value) { + addCriterion("pending_count <>", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountGreaterThan(Long value) { + addCriterion("pending_count >", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountGreaterThanOrEqualTo(Long value) { + addCriterion("pending_count >=", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountLessThan(Long value) { + addCriterion("pending_count <", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountLessThanOrEqualTo(Long value) { + addCriterion("pending_count <=", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountIn(List values) { + addCriterion("pending_count in", values, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountNotIn(List values) { + addCriterion("pending_count not in", values, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountBetween(Long value1, Long value2) { + addCriterion("pending_count between", value1, value2, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountNotBetween(Long value1, Long value2) { + addCriterion("pending_count not between", value1, value2, "pendingCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountIsNull() { + addCriterion("success_count is null"); + return (Criteria) this; + } + + public Criteria andSuccessCountIsNotNull() { + addCriterion("success_count is not null"); + return (Criteria) this; + } + + public Criteria andSuccessCountEqualTo(Long value) { + addCriterion("success_count =", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountNotEqualTo(Long value) { + addCriterion("success_count <>", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountGreaterThan(Long value) { + addCriterion("success_count >", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountGreaterThanOrEqualTo(Long value) { + addCriterion("success_count >=", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountLessThan(Long value) { + addCriterion("success_count <", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountLessThanOrEqualTo(Long value) { + addCriterion("success_count <=", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountIn(List values) { + addCriterion("success_count in", values, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountNotIn(List values) { + addCriterion("success_count not in", values, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountBetween(Long value1, Long value2) { + addCriterion("success_count between", value1, value2, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountNotBetween(Long value1, Long value2) { + addCriterion("success_count not between", value1, value2, "successCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountIsNull() { + addCriterion("assertion_count is null"); + return (Criteria) this; + } + + public Criteria andAssertionCountIsNotNull() { + addCriterion("assertion_count is not null"); + return (Criteria) this; + } + + public Criteria andAssertionCountEqualTo(Long value) { + addCriterion("assertion_count =", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountNotEqualTo(Long value) { + addCriterion("assertion_count <>", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountGreaterThan(Long value) { + addCriterion("assertion_count >", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountGreaterThanOrEqualTo(Long value) { + addCriterion("assertion_count >=", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountLessThan(Long value) { + addCriterion("assertion_count <", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountLessThanOrEqualTo(Long value) { + addCriterion("assertion_count <=", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountIn(List values) { + addCriterion("assertion_count in", values, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountNotIn(List values) { + addCriterion("assertion_count not in", values, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountBetween(Long value1, Long value2) { + addCriterion("assertion_count between", value1, value2, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountNotBetween(Long value1, Long value2) { + addCriterion("assertion_count not between", value1, value2, "assertionCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountIsNull() { + addCriterion("pass_assertions_count is null"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountIsNotNull() { + addCriterion("pass_assertions_count is not null"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountEqualTo(Long value) { + addCriterion("pass_assertions_count =", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountNotEqualTo(Long value) { + addCriterion("pass_assertions_count <>", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountGreaterThan(Long value) { + addCriterion("pass_assertions_count >", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountGreaterThanOrEqualTo(Long value) { + addCriterion("pass_assertions_count >=", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountLessThan(Long value) { + addCriterion("pass_assertions_count <", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountLessThanOrEqualTo(Long value) { + addCriterion("pass_assertions_count <=", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountIn(List values) { + addCriterion("pass_assertions_count in", values, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountNotIn(List values) { + addCriterion("pass_assertions_count not in", values, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountBetween(Long value1, Long value2) { + addCriterion("pass_assertions_count between", value1, value2, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountNotBetween(Long value1, Long value2) { + addCriterion("pass_assertions_count not between", value1, value2, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateIsNull() { + addCriterion("request_execution_rate is null"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateIsNotNull() { + addCriterion("request_execution_rate is not null"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateEqualTo(Long value) { + addCriterion("request_execution_rate =", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateNotEqualTo(Long value) { + addCriterion("request_execution_rate <>", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateGreaterThan(Long value) { + addCriterion("request_execution_rate >", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateGreaterThanOrEqualTo(Long value) { + addCriterion("request_execution_rate >=", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateLessThan(Long value) { + addCriterion("request_execution_rate <", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateLessThanOrEqualTo(Long value) { + addCriterion("request_execution_rate <=", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateIn(List values) { + addCriterion("request_execution_rate in", values, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateNotIn(List values) { + addCriterion("request_execution_rate not in", values, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateBetween(Long value1, Long value2) { + addCriterion("request_execution_rate between", value1, value2, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateNotBetween(Long value1, Long value2) { + addCriterion("request_execution_rate not between", value1, value2, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateIsNull() { + addCriterion("request_approval_rate is null"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateIsNotNull() { + addCriterion("request_approval_rate is not null"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateEqualTo(Long value) { + addCriterion("request_approval_rate =", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateNotEqualTo(Long value) { + addCriterion("request_approval_rate <>", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateGreaterThan(Long value) { + addCriterion("request_approval_rate >", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateGreaterThanOrEqualTo(Long value) { + addCriterion("request_approval_rate >=", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateLessThan(Long value) { + addCriterion("request_approval_rate <", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateLessThanOrEqualTo(Long value) { + addCriterion("request_approval_rate <=", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateIn(List values) { + addCriterion("request_approval_rate in", values, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateNotIn(List values) { + addCriterion("request_approval_rate not in", values, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateBetween(Long value1, Long value2) { + addCriterion("request_approval_rate between", value1, value2, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateNotBetween(Long value1, Long value2) { + addCriterion("request_approval_rate not between", value1, value2, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateIsNull() { + addCriterion("assertion_pass_rate is null"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateIsNotNull() { + addCriterion("assertion_pass_rate is not null"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateEqualTo(Long value) { + addCriterion("assertion_pass_rate =", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateNotEqualTo(Long value) { + addCriterion("assertion_pass_rate <>", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateGreaterThan(Long value) { + addCriterion("assertion_pass_rate >", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateGreaterThanOrEqualTo(Long value) { + addCriterion("assertion_pass_rate >=", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateLessThan(Long value) { + addCriterion("assertion_pass_rate <", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateLessThanOrEqualTo(Long value) { + addCriterion("assertion_pass_rate <=", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateIn(List values) { + addCriterion("assertion_pass_rate in", values, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateNotIn(List values) { + addCriterion("assertion_pass_rate not in", values, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateBetween(Long value1, Long value2) { + addCriterion("assertion_pass_rate between", value1, value2, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateNotBetween(Long value1, Long value2) { + addCriterion("assertion_pass_rate not between", value1, value2, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNull() { + addCriterion("script_identifier is null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNotNull() { + addCriterion("script_identifier is not null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierEqualTo(String value) { + addCriterion("script_identifier =", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotEqualTo(String value) { + addCriterion("script_identifier <>", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThan(String value) { + addCriterion("script_identifier >", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThanOrEqualTo(String value) { + addCriterion("script_identifier >=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThan(String value) { + addCriterion("script_identifier <", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThanOrEqualTo(String value) { + addCriterion("script_identifier <=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLike(String value) { + addCriterion("script_identifier like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotLike(String value) { + addCriterion("script_identifier not like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIn(List values) { + addCriterion("script_identifier in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotIn(List values) { + addCriterion("script_identifier not in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierBetween(String value1, String value2) { + addCriterion("script_identifier between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotBetween(String value1, String value2) { + addCriterion("script_identifier not between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenario.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenario.java index 0fd50835e8..acc71d0b2a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenario.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenario.java @@ -56,13 +56,18 @@ public class ApiScenario implements Serializable { @NotNull(message = "{api_scenario.pos.not_blank}", groups = {Created.class}) private Long pos; - @Schema(description = "版本fk") + @Schema(description = "版本fk", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{api_scenario.version_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{api_scenario.version_id.length_range}", groups = {Created.class, Updated.class}) private String versionId; - @Schema(description = "引用资源fk") + @Schema(description = "引用资源fk", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{api_scenario.ref_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{api_scenario.ref_id.length_range}", groups = {Created.class, Updated.class}) private String refId; - @Schema(description = "是否为最新版本 0:否，1:是") + @Schema(description = "是否为最新版本 0:否，1:是", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario.latest.not_blank}", groups = {Created.class}) private Boolean latest; @Schema(description = "项目fk", requiredMode = Schema.RequiredMode.REQUIRED) @@ -70,7 +75,9 @@ public class ApiScenario implements Serializable { @Size(min = 1, max = 50, message = "{api_scenario.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(description = "场景模块fk") + @Schema(description = "场景模块fk", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{api_scenario.module_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{api_scenario.module_id.length_range}", groups = {Created.class, Updated.class}) private String moduleId; @Schema(description = "描述信息") diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReport.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReport.java index aa5b737d5f..9d7cc96488 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReport.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReport.java @@ -20,8 +20,10 @@ public class ApiScenarioReport implements Serializable { @Size(min = 1, max = 255, message = "{api_scenario_report.name.length_range}", groups = {Created.class, Updated.class}) private String name; - @Schema(description = "创建时间") - private Long createTime; + @Schema(description = "场景fk", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{api_scenario_report.scenario_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{api_scenario_report.scenario_id.length_range}", groups = {Created.class, Updated.class}) + private String scenarioId; @Schema(description = "创建人") private String createUser; @@ -42,8 +44,17 @@ public class ApiScenarioReport implements Serializable { @Schema(description = "更新时间") private Long updateTime; - @Schema(description = "通过率") - private Long passRate; + @Schema(description = "开始时间/同创建时间一致", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.start_time.not_blank}", groups = {Created.class}) + private Long startTime; + + @Schema(description = "结束时间/报告执行完成", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.end_time.not_blank}", groups = {Created.class}) + private Long endTime; + + @Schema(description = "请求总耗时", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.request_duration.not_blank}", groups = {Created.class}) + private Long requestDuration; @Schema(description = "报告状态/SUCCESS/ERROR", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_scenario_report.status.not_blank}", groups = {Created.class}) @@ -77,27 +88,63 @@ public class ApiScenarioReport implements Serializable { @Size(min = 1, max = 50, message = "{api_scenario_report.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; - @Schema(description = "场景fk", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{api_scenario_report.scenario_id.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 50, message = "{api_scenario_report.scenario_id.length_range}", groups = {Created.class, Updated.class}) - private String scenarioId; - @Schema(description = "环境") private String environmentId; + @Schema(description = "失败数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.error_count.not_blank}", groups = {Created.class}) + private Long errorCount; + + @Schema(description = "误报数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.fake_error_count.not_blank}", groups = {Created.class}) + private Long fakeErrorCount; + + @Schema(description = "未执行数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.pending_count.not_blank}", groups = {Created.class}) + private Long pendingCount; + + @Schema(description = "成功数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.success_count.not_blank}", groups = {Created.class}) + private Long successCount; + + @Schema(description = "总断言数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.assertion_count.not_blank}", groups = {Created.class}) + private Long assertionCount; + + @Schema(description = "失败断言数", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.pass_assertions_count.not_blank}", groups = {Created.class}) + private Long passAssertionsCount; + + @Schema(description = "请求执行率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.request_execution_rate.not_blank}", groups = {Created.class}) + private Long requestExecutionRate; + + @Schema(description = "请求通过率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.request_approval_rate.not_blank}", groups = {Created.class}) + private Long requestApprovalRate; + + @Schema(description = "断言通过率", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report.assertion_pass_rate.not_blank}", groups = {Created.class}) + private Long assertionPassRate; + + @Schema(description = "脚本标识") + private String scriptIdentifier; + private static final long serialVersionUID = 1L; public enum Column { id("id", "id", "VARCHAR", false), name("name", "name", "VARCHAR", true), - createTime("create_time", "createTime", "BIGINT", false), + scenarioId("scenario_id", "scenarioId", "VARCHAR", false), createUser("create_user", "createUser", "VARCHAR", false), deleteTime("delete_time", "deleteTime", "BIGINT", false), deleteUser("delete_user", "deleteUser", "VARCHAR", false), deleted("deleted", "deleted", "BIT", false), updateUser("update_user", "updateUser", "VARCHAR", false), updateTime("update_time", "updateTime", "BIGINT", false), - passRate("pass_rate", "passRate", "BIGINT", false), + startTime("start_time", "startTime", "BIGINT", false), + endTime("end_time", "endTime", "BIGINT", false), + requestDuration("request_duration", "requestDuration", "BIGINT", false), status("status", "status", "VARCHAR", true), triggerMode("trigger_mode", "triggerMode", "VARCHAR", false), runMode("run_mode", "runMode", "VARCHAR", false), @@ -105,8 +152,17 @@ public class ApiScenarioReport implements Serializable { versionId("version_id", "versionId", "VARCHAR", false), integrated("integrated", "integrated", "BIT", false), projectId("project_id", "projectId", "VARCHAR", false), - scenarioId("scenario_id", "scenarioId", "VARCHAR", false), - environmentId("environment_id", "environmentId", "VARCHAR", false); + environmentId("environment_id", "environmentId", "VARCHAR", false), + errorCount("error_count", "errorCount", "BIGINT", false), + fakeErrorCount("fake_error_count", "fakeErrorCount", "BIGINT", false), + pendingCount("pending_count", "pendingCount", "BIGINT", false), + successCount("success_count", "successCount", "BIGINT", false), + assertionCount("assertion_count", "assertionCount", "BIGINT", false), + passAssertionsCount("pass_assertions_count", "passAssertionsCount", "BIGINT", false), + requestExecutionRate("request_execution_rate", "requestExecutionRate", "BIGINT", false), + requestApprovalRate("request_approval_rate", "requestApprovalRate", "BIGINT", false), + assertionPassRate("assertion_pass_rate", "assertionPassRate", "BIGINT", false), + scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetail.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetail.java index 611ba9486a..01f9c0f978 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetail.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetail.java @@ -21,40 +21,33 @@ public class ApiScenarioReportDetail implements Serializable { private String reportId; @Schema(description = "场景中各个步骤请求唯一标识", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{api_scenario_report_detail.resource_id.not_blank}", groups = {Created.class}) - @Size(min = 1, max = 50, message = "{api_scenario_report_detail.resource_id.length_range}", groups = {Created.class, Updated.class}) - private String resourceId; - - @Schema(description = "开始时间") - private Long startTime; + @NotBlank(message = "{api_scenario_report_detail.report_step_id.not_blank}", groups = {Created.class}) + @Size(min = 1, max = 50, message = "{api_scenario_report_detail.report_step_id.length_range}", groups = {Created.class, Updated.class}) + private String reportStepId; @Schema(description = "结果状态") private String status; - @Schema(description = "单个请求步骤时间") - private Long requestTime; - - @Schema(description = "总断言数") - private Long assertionsTotal; - - @Schema(description = "失败断言数") - private Long passAssertionsTotal; - - @Schema(description = "误报编号") + @Schema(description = "误报编号/误报状态独有") private String fakeCode; @Schema(description = "请求名称") private String requestName; - @Schema(description = "项目fk") - private String projectId; - - @Schema(description = "失败总数") - private Integer errorTotal; + @Schema(description = "请求耗时", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report_detail.request_time.not_blank}", groups = {Created.class}) + private Long requestTime; @Schema(description = "请求响应码") private String code; + @Schema(description = "响应内容大小", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "{api_scenario_report_detail.response_size.not_blank}", groups = {Created.class}) + private Long responseSize; + + @Schema(description = "脚本标识") + private String scriptIdentifier; + @Schema(description = "执行结果") private byte[] content; @@ -63,17 +56,14 @@ public class ApiScenarioReportDetail implements Serializable { public enum Column { id("id", "id", "VARCHAR", false), reportId("report_id", "reportId", "VARCHAR", false), - resourceId("resource_id", "resourceId", "VARCHAR", false), - startTime("start_time", "startTime", "BIGINT", false), + reportStepId("report_step_id", "reportStepId", "VARCHAR", false), status("status", "status", "VARCHAR", true), - requestTime("request_time", "requestTime", "BIGINT", false), - assertionsTotal("assertions_total", "assertionsTotal", "BIGINT", false), - passAssertionsTotal("pass_assertions_total", "passAssertionsTotal", "BIGINT", false), fakeCode("fake_code", "fakeCode", "VARCHAR", false), requestName("request_name", "requestName", "VARCHAR", false), - projectId("project_id", "projectId", "VARCHAR", false), - errorTotal("error_total", "errorTotal", "INTEGER", false), + requestTime("request_time", "requestTime", "BIGINT", false), code("code", "code", "VARCHAR", false), + responseSize("response_size", "responseSize", "BIGINT", false), + scriptIdentifier("script_identifier", "scriptIdentifier", "VARCHAR", false), content("content", "content", "LONGVARBINARY", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetailExample.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetailExample.java index 17e8c10bc8..e0d35c05b5 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetailExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportDetailExample.java @@ -244,133 +244,73 @@ public class ApiScenarioReportDetailExample { return (Criteria) this; } - public Criteria andResourceIdIsNull() { - addCriterion("resource_id is null"); + public Criteria andReportStepIdIsNull() { + addCriterion("report_step_id is null"); return (Criteria) this; } - public Criteria andResourceIdIsNotNull() { - addCriterion("resource_id is not null"); + public Criteria andReportStepIdIsNotNull() { + addCriterion("report_step_id is not null"); return (Criteria) this; } - public Criteria andResourceIdEqualTo(String value) { - addCriterion("resource_id =", value, "resourceId"); + public Criteria andReportStepIdEqualTo(String value) { + addCriterion("report_step_id =", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdNotEqualTo(String value) { - addCriterion("resource_id <>", value, "resourceId"); + public Criteria andReportStepIdNotEqualTo(String value) { + addCriterion("report_step_id <>", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdGreaterThan(String value) { - addCriterion("resource_id >", value, "resourceId"); + public Criteria andReportStepIdGreaterThan(String value) { + addCriterion("report_step_id >", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdGreaterThanOrEqualTo(String value) { - addCriterion("resource_id >=", value, "resourceId"); + public Criteria andReportStepIdGreaterThanOrEqualTo(String value) { + addCriterion("report_step_id >=", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdLessThan(String value) { - addCriterion("resource_id <", value, "resourceId"); + public Criteria andReportStepIdLessThan(String value) { + addCriterion("report_step_id <", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdLessThanOrEqualTo(String value) { - addCriterion("resource_id <=", value, "resourceId"); + public Criteria andReportStepIdLessThanOrEqualTo(String value) { + addCriterion("report_step_id <=", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdLike(String value) { - addCriterion("resource_id like", value, "resourceId"); + public Criteria andReportStepIdLike(String value) { + addCriterion("report_step_id like", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdNotLike(String value) { - addCriterion("resource_id not like", value, "resourceId"); + public Criteria andReportStepIdNotLike(String value) { + addCriterion("report_step_id not like", value, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdIn(List values) { - addCriterion("resource_id in", values, "resourceId"); + public Criteria andReportStepIdIn(List values) { + addCriterion("report_step_id in", values, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdNotIn(List values) { - addCriterion("resource_id not in", values, "resourceId"); + public Criteria andReportStepIdNotIn(List values) { + addCriterion("report_step_id not in", values, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdBetween(String value1, String value2) { - addCriterion("resource_id between", value1, value2, "resourceId"); + public Criteria andReportStepIdBetween(String value1, String value2) { + addCriterion("report_step_id between", value1, value2, "reportStepId"); return (Criteria) this; } - public Criteria andResourceIdNotBetween(String value1, String value2) { - addCriterion("resource_id not between", value1, value2, "resourceId"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNull() { - addCriterion("start_time is null"); - return (Criteria) this; - } - - public Criteria andStartTimeIsNotNull() { - addCriterion("start_time is not null"); - return (Criteria) this; - } - - public Criteria andStartTimeEqualTo(Long value) { - addCriterion("start_time =", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotEqualTo(Long value) { - addCriterion("start_time <>", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThan(Long value) { - addCriterion("start_time >", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { - addCriterion("start_time >=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThan(Long value) { - addCriterion("start_time <", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeLessThanOrEqualTo(Long value) { - addCriterion("start_time <=", value, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeIn(List values) { - addCriterion("start_time in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotIn(List values) { - addCriterion("start_time not in", values, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeBetween(Long value1, Long value2) { - addCriterion("start_time between", value1, value2, "startTime"); - return (Criteria) this; - } - - public Criteria andStartTimeNotBetween(Long value1, Long value2) { - addCriterion("start_time not between", value1, value2, "startTime"); + public Criteria andReportStepIdNotBetween(String value1, String value2) { + addCriterion("report_step_id not between", value1, value2, "reportStepId"); return (Criteria) this; } @@ -444,186 +384,6 @@ public class ApiScenarioReportDetailExample { return (Criteria) this; } - public Criteria andRequestTimeIsNull() { - addCriterion("request_time is null"); - return (Criteria) this; - } - - public Criteria andRequestTimeIsNotNull() { - addCriterion("request_time is not null"); - return (Criteria) this; - } - - public Criteria andRequestTimeEqualTo(Long value) { - addCriterion("request_time =", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeNotEqualTo(Long value) { - addCriterion("request_time <>", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeGreaterThan(Long value) { - addCriterion("request_time >", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeGreaterThanOrEqualTo(Long value) { - addCriterion("request_time >=", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeLessThan(Long value) { - addCriterion("request_time <", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeLessThanOrEqualTo(Long value) { - addCriterion("request_time <=", value, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeIn(List values) { - addCriterion("request_time in", values, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeNotIn(List values) { - addCriterion("request_time not in", values, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeBetween(Long value1, Long value2) { - addCriterion("request_time between", value1, value2, "requestTime"); - return (Criteria) this; - } - - public Criteria andRequestTimeNotBetween(Long value1, Long value2) { - addCriterion("request_time not between", value1, value2, "requestTime"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalIsNull() { - addCriterion("assertions_total is null"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalIsNotNull() { - addCriterion("assertions_total is not null"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalEqualTo(Long value) { - addCriterion("assertions_total =", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalNotEqualTo(Long value) { - addCriterion("assertions_total <>", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalGreaterThan(Long value) { - addCriterion("assertions_total >", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalGreaterThanOrEqualTo(Long value) { - addCriterion("assertions_total >=", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalLessThan(Long value) { - addCriterion("assertions_total <", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalLessThanOrEqualTo(Long value) { - addCriterion("assertions_total <=", value, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalIn(List values) { - addCriterion("assertions_total in", values, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalNotIn(List values) { - addCriterion("assertions_total not in", values, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalBetween(Long value1, Long value2) { - addCriterion("assertions_total between", value1, value2, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andAssertionsTotalNotBetween(Long value1, Long value2) { - addCriterion("assertions_total not between", value1, value2, "assertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalIsNull() { - addCriterion("pass_assertions_total is null"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalIsNotNull() { - addCriterion("pass_assertions_total is not null"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalEqualTo(Long value) { - addCriterion("pass_assertions_total =", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalNotEqualTo(Long value) { - addCriterion("pass_assertions_total <>", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalGreaterThan(Long value) { - addCriterion("pass_assertions_total >", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalGreaterThanOrEqualTo(Long value) { - addCriterion("pass_assertions_total >=", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalLessThan(Long value) { - addCriterion("pass_assertions_total <", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalLessThanOrEqualTo(Long value) { - addCriterion("pass_assertions_total <=", value, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalIn(List values) { - addCriterion("pass_assertions_total in", values, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalNotIn(List values) { - addCriterion("pass_assertions_total not in", values, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalBetween(Long value1, Long value2) { - addCriterion("pass_assertions_total between", value1, value2, "passAssertionsTotal"); - return (Criteria) this; - } - - public Criteria andPassAssertionsTotalNotBetween(Long value1, Long value2) { - addCriterion("pass_assertions_total not between", value1, value2, "passAssertionsTotal"); - return (Criteria) this; - } - public Criteria andFakeCodeIsNull() { addCriterion("fake_code is null"); return (Criteria) this; @@ -764,133 +524,63 @@ public class ApiScenarioReportDetailExample { return (Criteria) this; } - public Criteria andProjectIdIsNull() { - addCriterion("project_id is null"); + public Criteria andRequestTimeIsNull() { + addCriterion("request_time is null"); return (Criteria) this; } - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); + public Criteria andRequestTimeIsNotNull() { + addCriterion("request_time is not null"); return (Criteria) this; } - public Criteria andProjectIdEqualTo(String value) { - addCriterion("project_id =", value, "projectId"); + public Criteria andRequestTimeEqualTo(Long value) { + addCriterion("request_time =", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdNotEqualTo(String value) { - addCriterion("project_id <>", value, "projectId"); + public Criteria andRequestTimeNotEqualTo(Long value) { + addCriterion("request_time <>", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdGreaterThan(String value) { - addCriterion("project_id >", value, "projectId"); + public Criteria andRequestTimeGreaterThan(Long value) { + addCriterion("request_time >", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdGreaterThanOrEqualTo(String value) { - addCriterion("project_id >=", value, "projectId"); + public Criteria andRequestTimeGreaterThanOrEqualTo(Long value) { + addCriterion("request_time >=", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdLessThan(String value) { - addCriterion("project_id <", value, "projectId"); + public Criteria andRequestTimeLessThan(Long value) { + addCriterion("request_time <", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdLessThanOrEqualTo(String value) { - addCriterion("project_id <=", value, "projectId"); + public Criteria andRequestTimeLessThanOrEqualTo(Long value) { + addCriterion("request_time <=", value, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdLike(String value) { - addCriterion("project_id like", value, "projectId"); + public Criteria andRequestTimeIn(List values) { + addCriterion("request_time in", values, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdNotLike(String value) { - addCriterion("project_id not like", value, "projectId"); + public Criteria andRequestTimeNotIn(List values) { + addCriterion("request_time not in", values, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); + public Criteria andRequestTimeBetween(Long value1, Long value2) { + addCriterion("request_time between", value1, value2, "requestTime"); return (Criteria) this; } - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdBetween(String value1, String value2) { - addCriterion("project_id between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotBetween(String value1, String value2) { - addCriterion("project_id not between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andErrorTotalIsNull() { - addCriterion("error_total is null"); - return (Criteria) this; - } - - public Criteria andErrorTotalIsNotNull() { - addCriterion("error_total is not null"); - return (Criteria) this; - } - - public Criteria andErrorTotalEqualTo(Integer value) { - addCriterion("error_total =", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalNotEqualTo(Integer value) { - addCriterion("error_total <>", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalGreaterThan(Integer value) { - addCriterion("error_total >", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalGreaterThanOrEqualTo(Integer value) { - addCriterion("error_total >=", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalLessThan(Integer value) { - addCriterion("error_total <", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalLessThanOrEqualTo(Integer value) { - addCriterion("error_total <=", value, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalIn(List values) { - addCriterion("error_total in", values, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalNotIn(List values) { - addCriterion("error_total not in", values, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalBetween(Integer value1, Integer value2) { - addCriterion("error_total between", value1, value2, "errorTotal"); - return (Criteria) this; - } - - public Criteria andErrorTotalNotBetween(Integer value1, Integer value2) { - addCriterion("error_total not between", value1, value2, "errorTotal"); + public Criteria andRequestTimeNotBetween(Long value1, Long value2) { + addCriterion("request_time not between", value1, value2, "requestTime"); return (Criteria) this; } @@ -963,6 +653,136 @@ public class ApiScenarioReportDetailExample { addCriterion("code not between", value1, value2, "code"); return (Criteria) this; } + + public Criteria andResponseSizeIsNull() { + addCriterion("response_size is null"); + return (Criteria) this; + } + + public Criteria andResponseSizeIsNotNull() { + addCriterion("response_size is not null"); + return (Criteria) this; + } + + public Criteria andResponseSizeEqualTo(Long value) { + addCriterion("response_size =", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeNotEqualTo(Long value) { + addCriterion("response_size <>", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeGreaterThan(Long value) { + addCriterion("response_size >", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeGreaterThanOrEqualTo(Long value) { + addCriterion("response_size >=", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeLessThan(Long value) { + addCriterion("response_size <", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeLessThanOrEqualTo(Long value) { + addCriterion("response_size <=", value, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeIn(List values) { + addCriterion("response_size in", values, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeNotIn(List values) { + addCriterion("response_size not in", values, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeBetween(Long value1, Long value2) { + addCriterion("response_size between", value1, value2, "responseSize"); + return (Criteria) this; + } + + public Criteria andResponseSizeNotBetween(Long value1, Long value2) { + addCriterion("response_size not between", value1, value2, "responseSize"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNull() { + addCriterion("script_identifier is null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNotNull() { + addCriterion("script_identifier is not null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierEqualTo(String value) { + addCriterion("script_identifier =", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotEqualTo(String value) { + addCriterion("script_identifier <>", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThan(String value) { + addCriterion("script_identifier >", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThanOrEqualTo(String value) { + addCriterion("script_identifier >=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThan(String value) { + addCriterion("script_identifier <", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThanOrEqualTo(String value) { + addCriterion("script_identifier <=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLike(String value) { + addCriterion("script_identifier like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotLike(String value) { + addCriterion("script_identifier not like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIn(List values) { + addCriterion("script_identifier in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotIn(List values) { + addCriterion("script_identifier not in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierBetween(String value1, String value2) { + addCriterion("script_identifier between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotBetween(String value1, String value2) { + addCriterion("script_identifier not between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportExample.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportExample.java index 36481c0b89..990f2f66a0 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiScenarioReportExample.java @@ -244,63 +244,73 @@ public class ApiScenarioReportExample { return (Criteria) this; } - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); + public Criteria andScenarioIdIsNull() { + addCriterion("scenario_id is null"); return (Criteria) this; } - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); + public Criteria andScenarioIdIsNotNull() { + addCriterion("scenario_id is not null"); return (Criteria) this; } - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); + public Criteria andScenarioIdEqualTo(String value) { + addCriterion("scenario_id =", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); + public Criteria andScenarioIdNotEqualTo(String value) { + addCriterion("scenario_id <>", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); + public Criteria andScenarioIdGreaterThan(String value) { + addCriterion("scenario_id >", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); + public Criteria andScenarioIdGreaterThanOrEqualTo(String value) { + addCriterion("scenario_id >=", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); + public Criteria andScenarioIdLessThan(String value) { + addCriterion("scenario_id <", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); + public Criteria andScenarioIdLessThanOrEqualTo(String value) { + addCriterion("scenario_id <=", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); + public Criteria andScenarioIdLike(String value) { + addCriterion("scenario_id like", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); + public Criteria andScenarioIdNotLike(String value) { + addCriterion("scenario_id not like", value, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); + public Criteria andScenarioIdIn(List values) { + addCriterion("scenario_id in", values, "scenarioId"); return (Criteria) this; } - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); + public Criteria andScenarioIdNotIn(List values) { + addCriterion("scenario_id not in", values, "scenarioId"); + return (Criteria) this; + } + + public Criteria andScenarioIdBetween(String value1, String value2) { + addCriterion("scenario_id between", value1, value2, "scenarioId"); + return (Criteria) this; + } + + public Criteria andScenarioIdNotBetween(String value1, String value2) { + addCriterion("scenario_id not between", value1, value2, "scenarioId"); return (Criteria) this; } @@ -694,63 +704,183 @@ public class ApiScenarioReportExample { return (Criteria) this; } - public Criteria andPassRateIsNull() { - addCriterion("pass_rate is null"); + public Criteria andStartTimeIsNull() { + addCriterion("start_time is null"); return (Criteria) this; } - public Criteria andPassRateIsNotNull() { - addCriterion("pass_rate is not null"); + public Criteria andStartTimeIsNotNull() { + addCriterion("start_time is not null"); return (Criteria) this; } - public Criteria andPassRateEqualTo(Long value) { - addCriterion("pass_rate =", value, "passRate"); + public Criteria andStartTimeEqualTo(Long value) { + addCriterion("start_time =", value, "startTime"); return (Criteria) this; } - public Criteria andPassRateNotEqualTo(Long value) { - addCriterion("pass_rate <>", value, "passRate"); + public Criteria andStartTimeNotEqualTo(Long value) { + addCriterion("start_time <>", value, "startTime"); return (Criteria) this; } - public Criteria andPassRateGreaterThan(Long value) { - addCriterion("pass_rate >", value, "passRate"); + public Criteria andStartTimeGreaterThan(Long value) { + addCriterion("start_time >", value, "startTime"); return (Criteria) this; } - public Criteria andPassRateGreaterThanOrEqualTo(Long value) { - addCriterion("pass_rate >=", value, "passRate"); + public Criteria andStartTimeGreaterThanOrEqualTo(Long value) { + addCriterion("start_time >=", value, "startTime"); return (Criteria) this; } - public Criteria andPassRateLessThan(Long value) { - addCriterion("pass_rate <", value, "passRate"); + public Criteria andStartTimeLessThan(Long value) { + addCriterion("start_time <", value, "startTime"); return (Criteria) this; } - public Criteria andPassRateLessThanOrEqualTo(Long value) { - addCriterion("pass_rate <=", value, "passRate"); + public Criteria andStartTimeLessThanOrEqualTo(Long value) { + addCriterion("start_time <=", value, "startTime"); return (Criteria) this; } - public Criteria andPassRateIn(List values) { - addCriterion("pass_rate in", values, "passRate"); + public Criteria andStartTimeIn(List values) { + addCriterion("start_time in", values, "startTime"); return (Criteria) this; } - public Criteria andPassRateNotIn(List values) { - addCriterion("pass_rate not in", values, "passRate"); + public Criteria andStartTimeNotIn(List values) { + addCriterion("start_time not in", values, "startTime"); return (Criteria) this; } - public Criteria andPassRateBetween(Long value1, Long value2) { - addCriterion("pass_rate between", value1, value2, "passRate"); + public Criteria andStartTimeBetween(Long value1, Long value2) { + addCriterion("start_time between", value1, value2, "startTime"); return (Criteria) this; } - public Criteria andPassRateNotBetween(Long value1, Long value2) { - addCriterion("pass_rate not between", value1, value2, "passRate"); + public Criteria andStartTimeNotBetween(Long value1, Long value2) { + addCriterion("start_time not between", value1, value2, "startTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNull() { + addCriterion("end_time is null"); + return (Criteria) this; + } + + public Criteria andEndTimeIsNotNull() { + addCriterion("end_time is not null"); + return (Criteria) this; + } + + public Criteria andEndTimeEqualTo(Long value) { + addCriterion("end_time =", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotEqualTo(Long value) { + addCriterion("end_time <>", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThan(Long value) { + addCriterion("end_time >", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeGreaterThanOrEqualTo(Long value) { + addCriterion("end_time >=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThan(Long value) { + addCriterion("end_time <", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeLessThanOrEqualTo(Long value) { + addCriterion("end_time <=", value, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeIn(List values) { + addCriterion("end_time in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotIn(List values) { + addCriterion("end_time not in", values, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeBetween(Long value1, Long value2) { + addCriterion("end_time between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andEndTimeNotBetween(Long value1, Long value2) { + addCriterion("end_time not between", value1, value2, "endTime"); + return (Criteria) this; + } + + public Criteria andRequestDurationIsNull() { + addCriterion("request_duration is null"); + return (Criteria) this; + } + + public Criteria andRequestDurationIsNotNull() { + addCriterion("request_duration is not null"); + return (Criteria) this; + } + + public Criteria andRequestDurationEqualTo(Long value) { + addCriterion("request_duration =", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationNotEqualTo(Long value) { + addCriterion("request_duration <>", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationGreaterThan(Long value) { + addCriterion("request_duration >", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationGreaterThanOrEqualTo(Long value) { + addCriterion("request_duration >=", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationLessThan(Long value) { + addCriterion("request_duration <", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationLessThanOrEqualTo(Long value) { + addCriterion("request_duration <=", value, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationIn(List values) { + addCriterion("request_duration in", values, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationNotIn(List values) { + addCriterion("request_duration not in", values, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationBetween(Long value1, Long value2) { + addCriterion("request_duration between", value1, value2, "requestDuration"); + return (Criteria) this; + } + + public Criteria andRequestDurationNotBetween(Long value1, Long value2) { + addCriterion("request_duration not between", value1, value2, "requestDuration"); return (Criteria) this; } @@ -1234,76 +1364,6 @@ public class ApiScenarioReportExample { return (Criteria) this; } - public Criteria andScenarioIdIsNull() { - addCriterion("scenario_id is null"); - return (Criteria) this; - } - - public Criteria andScenarioIdIsNotNull() { - addCriterion("scenario_id is not null"); - return (Criteria) this; - } - - public Criteria andScenarioIdEqualTo(String value) { - addCriterion("scenario_id =", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdNotEqualTo(String value) { - addCriterion("scenario_id <>", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdGreaterThan(String value) { - addCriterion("scenario_id >", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdGreaterThanOrEqualTo(String value) { - addCriterion("scenario_id >=", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdLessThan(String value) { - addCriterion("scenario_id <", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdLessThanOrEqualTo(String value) { - addCriterion("scenario_id <=", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdLike(String value) { - addCriterion("scenario_id like", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdNotLike(String value) { - addCriterion("scenario_id not like", value, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdIn(List values) { - addCriterion("scenario_id in", values, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdNotIn(List values) { - addCriterion("scenario_id not in", values, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdBetween(String value1, String value2) { - addCriterion("scenario_id between", value1, value2, "scenarioId"); - return (Criteria) this; - } - - public Criteria andScenarioIdNotBetween(String value1, String value2) { - addCriterion("scenario_id not between", value1, value2, "scenarioId"); - return (Criteria) this; - } - public Criteria andEnvironmentIdIsNull() { addCriterion("environment_id is null"); return (Criteria) this; @@ -1373,6 +1433,616 @@ public class ApiScenarioReportExample { addCriterion("environment_id not between", value1, value2, "environmentId"); return (Criteria) this; } + + public Criteria andErrorCountIsNull() { + addCriterion("error_count is null"); + return (Criteria) this; + } + + public Criteria andErrorCountIsNotNull() { + addCriterion("error_count is not null"); + return (Criteria) this; + } + + public Criteria andErrorCountEqualTo(Long value) { + addCriterion("error_count =", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountNotEqualTo(Long value) { + addCriterion("error_count <>", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountGreaterThan(Long value) { + addCriterion("error_count >", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountGreaterThanOrEqualTo(Long value) { + addCriterion("error_count >=", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountLessThan(Long value) { + addCriterion("error_count <", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountLessThanOrEqualTo(Long value) { + addCriterion("error_count <=", value, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountIn(List values) { + addCriterion("error_count in", values, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountNotIn(List values) { + addCriterion("error_count not in", values, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountBetween(Long value1, Long value2) { + addCriterion("error_count between", value1, value2, "errorCount"); + return (Criteria) this; + } + + public Criteria andErrorCountNotBetween(Long value1, Long value2) { + addCriterion("error_count not between", value1, value2, "errorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountIsNull() { + addCriterion("fake_error_count is null"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountIsNotNull() { + addCriterion("fake_error_count is not null"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountEqualTo(Long value) { + addCriterion("fake_error_count =", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountNotEqualTo(Long value) { + addCriterion("fake_error_count <>", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountGreaterThan(Long value) { + addCriterion("fake_error_count >", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountGreaterThanOrEqualTo(Long value) { + addCriterion("fake_error_count >=", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountLessThan(Long value) { + addCriterion("fake_error_count <", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountLessThanOrEqualTo(Long value) { + addCriterion("fake_error_count <=", value, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountIn(List values) { + addCriterion("fake_error_count in", values, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountNotIn(List values) { + addCriterion("fake_error_count not in", values, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountBetween(Long value1, Long value2) { + addCriterion("fake_error_count between", value1, value2, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andFakeErrorCountNotBetween(Long value1, Long value2) { + addCriterion("fake_error_count not between", value1, value2, "fakeErrorCount"); + return (Criteria) this; + } + + public Criteria andPendingCountIsNull() { + addCriterion("pending_count is null"); + return (Criteria) this; + } + + public Criteria andPendingCountIsNotNull() { + addCriterion("pending_count is not null"); + return (Criteria) this; + } + + public Criteria andPendingCountEqualTo(Long value) { + addCriterion("pending_count =", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountNotEqualTo(Long value) { + addCriterion("pending_count <>", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountGreaterThan(Long value) { + addCriterion("pending_count >", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountGreaterThanOrEqualTo(Long value) { + addCriterion("pending_count >=", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountLessThan(Long value) { + addCriterion("pending_count <", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountLessThanOrEqualTo(Long value) { + addCriterion("pending_count <=", value, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountIn(List values) { + addCriterion("pending_count in", values, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountNotIn(List values) { + addCriterion("pending_count not in", values, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountBetween(Long value1, Long value2) { + addCriterion("pending_count between", value1, value2, "pendingCount"); + return (Criteria) this; + } + + public Criteria andPendingCountNotBetween(Long value1, Long value2) { + addCriterion("pending_count not between", value1, value2, "pendingCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountIsNull() { + addCriterion("success_count is null"); + return (Criteria) this; + } + + public Criteria andSuccessCountIsNotNull() { + addCriterion("success_count is not null"); + return (Criteria) this; + } + + public Criteria andSuccessCountEqualTo(Long value) { + addCriterion("success_count =", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountNotEqualTo(Long value) { + addCriterion("success_count <>", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountGreaterThan(Long value) { + addCriterion("success_count >", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountGreaterThanOrEqualTo(Long value) { + addCriterion("success_count >=", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountLessThan(Long value) { + addCriterion("success_count <", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountLessThanOrEqualTo(Long value) { + addCriterion("success_count <=", value, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountIn(List values) { + addCriterion("success_count in", values, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountNotIn(List values) { + addCriterion("success_count not in", values, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountBetween(Long value1, Long value2) { + addCriterion("success_count between", value1, value2, "successCount"); + return (Criteria) this; + } + + public Criteria andSuccessCountNotBetween(Long value1, Long value2) { + addCriterion("success_count not between", value1, value2, "successCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountIsNull() { + addCriterion("assertion_count is null"); + return (Criteria) this; + } + + public Criteria andAssertionCountIsNotNull() { + addCriterion("assertion_count is not null"); + return (Criteria) this; + } + + public Criteria andAssertionCountEqualTo(Long value) { + addCriterion("assertion_count =", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountNotEqualTo(Long value) { + addCriterion("assertion_count <>", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountGreaterThan(Long value) { + addCriterion("assertion_count >", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountGreaterThanOrEqualTo(Long value) { + addCriterion("assertion_count >=", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountLessThan(Long value) { + addCriterion("assertion_count <", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountLessThanOrEqualTo(Long value) { + addCriterion("assertion_count <=", value, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountIn(List values) { + addCriterion("assertion_count in", values, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountNotIn(List values) { + addCriterion("assertion_count not in", values, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountBetween(Long value1, Long value2) { + addCriterion("assertion_count between", value1, value2, "assertionCount"); + return (Criteria) this; + } + + public Criteria andAssertionCountNotBetween(Long value1, Long value2) { + addCriterion("assertion_count not between", value1, value2, "assertionCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountIsNull() { + addCriterion("pass_assertions_count is null"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountIsNotNull() { + addCriterion("pass_assertions_count is not null"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountEqualTo(Long value) { + addCriterion("pass_assertions_count =", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountNotEqualTo(Long value) { + addCriterion("pass_assertions_count <>", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountGreaterThan(Long value) { + addCriterion("pass_assertions_count >", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountGreaterThanOrEqualTo(Long value) { + addCriterion("pass_assertions_count >=", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountLessThan(Long value) { + addCriterion("pass_assertions_count <", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountLessThanOrEqualTo(Long value) { + addCriterion("pass_assertions_count <=", value, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountIn(List values) { + addCriterion("pass_assertions_count in", values, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountNotIn(List values) { + addCriterion("pass_assertions_count not in", values, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountBetween(Long value1, Long value2) { + addCriterion("pass_assertions_count between", value1, value2, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andPassAssertionsCountNotBetween(Long value1, Long value2) { + addCriterion("pass_assertions_count not between", value1, value2, "passAssertionsCount"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateIsNull() { + addCriterion("request_execution_rate is null"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateIsNotNull() { + addCriterion("request_execution_rate is not null"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateEqualTo(Long value) { + addCriterion("request_execution_rate =", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateNotEqualTo(Long value) { + addCriterion("request_execution_rate <>", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateGreaterThan(Long value) { + addCriterion("request_execution_rate >", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateGreaterThanOrEqualTo(Long value) { + addCriterion("request_execution_rate >=", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateLessThan(Long value) { + addCriterion("request_execution_rate <", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateLessThanOrEqualTo(Long value) { + addCriterion("request_execution_rate <=", value, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateIn(List values) { + addCriterion("request_execution_rate in", values, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateNotIn(List values) { + addCriterion("request_execution_rate not in", values, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateBetween(Long value1, Long value2) { + addCriterion("request_execution_rate between", value1, value2, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestExecutionRateNotBetween(Long value1, Long value2) { + addCriterion("request_execution_rate not between", value1, value2, "requestExecutionRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateIsNull() { + addCriterion("request_approval_rate is null"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateIsNotNull() { + addCriterion("request_approval_rate is not null"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateEqualTo(Long value) { + addCriterion("request_approval_rate =", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateNotEqualTo(Long value) { + addCriterion("request_approval_rate <>", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateGreaterThan(Long value) { + addCriterion("request_approval_rate >", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateGreaterThanOrEqualTo(Long value) { + addCriterion("request_approval_rate >=", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateLessThan(Long value) { + addCriterion("request_approval_rate <", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateLessThanOrEqualTo(Long value) { + addCriterion("request_approval_rate <=", value, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateIn(List values) { + addCriterion("request_approval_rate in", values, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateNotIn(List values) { + addCriterion("request_approval_rate not in", values, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateBetween(Long value1, Long value2) { + addCriterion("request_approval_rate between", value1, value2, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andRequestApprovalRateNotBetween(Long value1, Long value2) { + addCriterion("request_approval_rate not between", value1, value2, "requestApprovalRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateIsNull() { + addCriterion("assertion_pass_rate is null"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateIsNotNull() { + addCriterion("assertion_pass_rate is not null"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateEqualTo(Long value) { + addCriterion("assertion_pass_rate =", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateNotEqualTo(Long value) { + addCriterion("assertion_pass_rate <>", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateGreaterThan(Long value) { + addCriterion("assertion_pass_rate >", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateGreaterThanOrEqualTo(Long value) { + addCriterion("assertion_pass_rate >=", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateLessThan(Long value) { + addCriterion("assertion_pass_rate <", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateLessThanOrEqualTo(Long value) { + addCriterion("assertion_pass_rate <=", value, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateIn(List values) { + addCriterion("assertion_pass_rate in", values, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateNotIn(List values) { + addCriterion("assertion_pass_rate not in", values, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateBetween(Long value1, Long value2) { + addCriterion("assertion_pass_rate between", value1, value2, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andAssertionPassRateNotBetween(Long value1, Long value2) { + addCriterion("assertion_pass_rate not between", value1, value2, "assertionPassRate"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNull() { + addCriterion("script_identifier is null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIsNotNull() { + addCriterion("script_identifier is not null"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierEqualTo(String value) { + addCriterion("script_identifier =", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotEqualTo(String value) { + addCriterion("script_identifier <>", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThan(String value) { + addCriterion("script_identifier >", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierGreaterThanOrEqualTo(String value) { + addCriterion("script_identifier >=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThan(String value) { + addCriterion("script_identifier <", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLessThanOrEqualTo(String value) { + addCriterion("script_identifier <=", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierLike(String value) { + addCriterion("script_identifier like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotLike(String value) { + addCriterion("script_identifier not like", value, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierIn(List values) { + addCriterion("script_identifier in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotIn(List values) { + addCriterion("script_identifier not in", values, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierBetween(String value1, String value2) { + addCriterion("script_identifier between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } + + public Criteria andScriptIdentifierNotBetween(String value1, String value2) { + addCriterion("script_identifier not between", value1, value2, "scriptIdentifier"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCase.java b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCase.java index b7bbe62813..3259ee9bb1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCase.java +++ b/backend/framework/domain/src/main/java/io/metersphere/api/domain/ApiTestCase.java @@ -1,17 +1,13 @@ package io.metersphere.api.domain; -import io.metersphere.validation.groups.Created; -import io.metersphere.validation.groups.Updated; +import io.metersphere.validation.groups.*; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - +import jakarta.validation.constraints.*; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import lombok.Data; @Data public class ApiTestCase implements Serializable { @@ -34,7 +30,7 @@ public class ApiTestCase implements Serializable { private Long num; @Schema(description = "标签") - private List tags; + private java.util.List tags; @Schema(description = "用例状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_test_case.status.not_blank}", groups = {Created.class}) @@ -158,7 +154,7 @@ public class ApiTestCase implements Serializable { return this.getEscapedColumnName() + " ASC"; } - public static Column[] excludes(Column... excludes) { + public static Column[] excludes(Column ... excludes) { ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); if (excludes != null && excludes.length > 0) { columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDebugMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDebugMapper.xml index 6afdc9ca05..bc001a2a2c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDebugMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiDebugMapper.xml @@ -13,6 +13,7 @@ + @@ -74,7 +75,7 @@ id, `name`, protocol, `method`, `path`, project_id, module_id, create_time, create_user, - update_time, update_user + update_time, update_user, pos @@ -231,6 +240,9 @@ update_user = #{record.updateUser,jdbcType=VARCHAR}, + + pos = #{record.pos,jdbcType=BIGINT}, + @@ -248,7 +260,8 @@ create_time = #{record.createTime,jdbcType=BIGINT}, create_user = #{record.createUser,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=BIGINT}, - update_user = #{record.updateUser,jdbcType=VARCHAR} + update_user = #{record.updateUser,jdbcType=VARCHAR}, + pos = #{record.pos,jdbcType=BIGINT} @@ -286,6 +299,9 @@ update_user = #{updateUser,jdbcType=VARCHAR}, + + pos = #{pos,jdbcType=BIGINT}, + where id = #{id,jdbcType=VARCHAR} @@ -300,19 +316,21 @@ create_time = #{createTime,jdbcType=BIGINT}, create_user = #{createUser,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=BIGINT}, - update_user = #{updateUser,jdbcType=VARCHAR} + update_user = #{updateUser,jdbcType=VARCHAR}, + pos = #{pos,jdbcType=BIGINT} where id = #{id,jdbcType=VARCHAR} insert into api_debug (id, `name`, protocol, `method`, `path`, project_id, module_id, create_time, create_user, - update_time, update_user) + update_time, update_user, pos) values (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.protocol,jdbcType=VARCHAR}, #{item.method,jdbcType=VARCHAR}, #{item.path,jdbcType=VARCHAR}, #{item.projectId,jdbcType=VARCHAR}, #{item.moduleId,jdbcType=VARCHAR}, #{item.createTime,jdbcType=BIGINT}, #{item.createUser,jdbcType=VARCHAR}, - #{item.updateTime,jdbcType=BIGINT}, #{item.updateUser,jdbcType=VARCHAR}) + #{item.updateTime,jdbcType=BIGINT}, #{item.updateUser,jdbcType=VARCHAR}, #{item.pos,jdbcType=BIGINT} + ) @@ -358,6 +376,9 @@ #{item.updateUser,jdbcType=VARCHAR} + + #{item.pos,jdbcType=BIGINT} + ) diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportDetailMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportDetailMapper.xml index 00f8c7e850..53a4a953a1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportDetailMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportDetailMapper.xml @@ -5,16 +5,13 @@ - - - - - - + + + @@ -78,8 +75,8 @@ - id, report_id, resource_id, start_time, `status`, request_time, assertions_total, - pass_assertions_total, fake_code, request_name, project_id, error_total, code + id, report_id, resource_id, `status`, fake_code, request_name, request_time, code, + response_size, script_identifier content @@ -134,15 +131,13 @@ insert into api_report_detail (id, report_id, resource_id, - start_time, `status`, request_time, - assertions_total, pass_assertions_total, fake_code, - request_name, project_id, error_total, - code, content) + `status`, fake_code, request_name, + request_time, code, response_size, + script_identifier, content) values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, - #{startTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, #{requestTime,jdbcType=BIGINT}, - #{assertionsTotal,jdbcType=BIGINT}, #{passAssertionsTotal,jdbcType=BIGINT}, #{fakeCode,jdbcType=VARCHAR}, - #{requestName,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{errorTotal,jdbcType=INTEGER}, - #{code,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}) + #{status,jdbcType=VARCHAR}, #{fakeCode,jdbcType=VARCHAR}, #{requestName,jdbcType=VARCHAR}, + #{requestTime,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{responseSize,jdbcType=BIGINT}, + #{scriptIdentifier,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}) insert into api_report_detail @@ -156,36 +151,27 @@ resource_id, - - start_time, - `status`, - - request_time, - - - assertions_total, - - - pass_assertions_total, - fake_code, request_name, - - project_id, - - - error_total, + + request_time, code, + + response_size, + + + script_identifier, + content, @@ -200,36 +186,27 @@ #{resourceId,jdbcType=VARCHAR}, - - #{startTime,jdbcType=BIGINT}, - #{status,jdbcType=VARCHAR}, - - #{requestTime,jdbcType=BIGINT}, - - - #{assertionsTotal,jdbcType=BIGINT}, - - - #{passAssertionsTotal,jdbcType=BIGINT}, - #{fakeCode,jdbcType=VARCHAR}, #{requestName,jdbcType=VARCHAR}, - - #{projectId,jdbcType=VARCHAR}, - - - #{errorTotal,jdbcType=INTEGER}, + + #{requestTime,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, + + #{responseSize,jdbcType=BIGINT}, + + + #{scriptIdentifier,jdbcType=VARCHAR}, + #{content,jdbcType=LONGVARBINARY}, @@ -253,36 +230,27 @@ resource_id = #{record.resourceId,jdbcType=VARCHAR}, - - start_time = #{record.startTime,jdbcType=BIGINT}, - `status` = #{record.status,jdbcType=VARCHAR}, - - request_time = #{record.requestTime,jdbcType=BIGINT}, - - - assertions_total = #{record.assertionsTotal,jdbcType=BIGINT}, - - - pass_assertions_total = #{record.passAssertionsTotal,jdbcType=BIGINT}, - fake_code = #{record.fakeCode,jdbcType=VARCHAR}, request_name = #{record.requestName,jdbcType=VARCHAR}, - - project_id = #{record.projectId,jdbcType=VARCHAR}, - - - error_total = #{record.errorTotal,jdbcType=INTEGER}, + + request_time = #{record.requestTime,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, + + response_size = #{record.responseSize,jdbcType=BIGINT}, + + + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, + content = #{record.content,jdbcType=LONGVARBINARY}, @@ -296,16 +264,13 @@ set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, resource_id = #{record.resourceId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, - request_time = #{record.requestTime,jdbcType=BIGINT}, - assertions_total = #{record.assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{record.passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{record.fakeCode,jdbcType=VARCHAR}, request_name = #{record.requestName,jdbcType=VARCHAR}, - project_id = #{record.projectId,jdbcType=VARCHAR}, - error_total = #{record.errorTotal,jdbcType=INTEGER}, + request_time = #{record.requestTime,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, + response_size = #{record.responseSize,jdbcType=BIGINT}, + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, content = #{record.content,jdbcType=LONGVARBINARY} @@ -316,16 +281,13 @@ set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, resource_id = #{record.resourceId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, - request_time = #{record.requestTime,jdbcType=BIGINT}, - assertions_total = #{record.assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{record.passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{record.fakeCode,jdbcType=VARCHAR}, request_name = #{record.requestName,jdbcType=VARCHAR}, - project_id = #{record.projectId,jdbcType=VARCHAR}, - error_total = #{record.errorTotal,jdbcType=INTEGER}, - code = #{record.code,jdbcType=VARCHAR} + request_time = #{record.requestTime,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + response_size = #{record.responseSize,jdbcType=BIGINT}, + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR} @@ -339,36 +301,27 @@ resource_id = #{resourceId,jdbcType=VARCHAR}, - - start_time = #{startTime,jdbcType=BIGINT}, - `status` = #{status,jdbcType=VARCHAR}, - - request_time = #{requestTime,jdbcType=BIGINT}, - - - assertions_total = #{assertionsTotal,jdbcType=BIGINT}, - - - pass_assertions_total = #{passAssertionsTotal,jdbcType=BIGINT}, - fake_code = #{fakeCode,jdbcType=VARCHAR}, request_name = #{requestName,jdbcType=VARCHAR}, - - project_id = #{projectId,jdbcType=VARCHAR}, - - - error_total = #{errorTotal,jdbcType=INTEGER}, + + request_time = #{requestTime,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, + + response_size = #{responseSize,jdbcType=BIGINT}, + + + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, + content = #{content,jdbcType=LONGVARBINARY}, @@ -379,16 +332,13 @@ update api_report_detail set report_id = #{reportId,jdbcType=VARCHAR}, resource_id = #{resourceId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, - request_time = #{requestTime,jdbcType=BIGINT}, - assertions_total = #{assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{fakeCode,jdbcType=VARCHAR}, request_name = #{requestName,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=VARCHAR}, - error_total = #{errorTotal,jdbcType=INTEGER}, + request_time = #{requestTime,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, + response_size = #{responseSize,jdbcType=BIGINT}, + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, content = #{content,jdbcType=LONGVARBINARY} where id = #{id,jdbcType=VARCHAR} @@ -396,30 +346,25 @@ update api_report_detail set report_id = #{reportId,jdbcType=VARCHAR}, resource_id = #{resourceId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, - request_time = #{requestTime,jdbcType=BIGINT}, - assertions_total = #{assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{fakeCode,jdbcType=VARCHAR}, request_name = #{requestName,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=VARCHAR}, - error_total = #{errorTotal,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR} + request_time = #{requestTime,jdbcType=BIGINT}, + code = #{code,jdbcType=VARCHAR}, + response_size = #{responseSize,jdbcType=BIGINT}, + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} insert into api_report_detail - (id, report_id, resource_id, start_time, `status`, request_time, assertions_total, - pass_assertions_total, fake_code, request_name, project_id, error_total, code, - content) + (id, report_id, resource_id, `status`, fake_code, request_name, request_time, code, + response_size, script_identifier, content) values (#{item.id,jdbcType=VARCHAR}, #{item.reportId,jdbcType=VARCHAR}, #{item.resourceId,jdbcType=VARCHAR}, - #{item.startTime,jdbcType=BIGINT}, #{item.status,jdbcType=VARCHAR}, #{item.requestTime,jdbcType=BIGINT}, - #{item.assertionsTotal,jdbcType=BIGINT}, #{item.passAssertionsTotal,jdbcType=BIGINT}, - #{item.fakeCode,jdbcType=VARCHAR}, #{item.requestName,jdbcType=VARCHAR}, #{item.projectId,jdbcType=VARCHAR}, - #{item.errorTotal,jdbcType=INTEGER}, #{item.code,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY} + #{item.status,jdbcType=VARCHAR}, #{item.fakeCode,jdbcType=VARCHAR}, #{item.requestName,jdbcType=VARCHAR}, + #{item.requestTime,jdbcType=BIGINT}, #{item.code,jdbcType=VARCHAR}, #{item.responseSize,jdbcType=BIGINT}, + #{item.scriptIdentifier,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY} ) @@ -442,36 +387,27 @@ #{item.resourceId,jdbcType=VARCHAR} - - #{item.startTime,jdbcType=BIGINT} - #{item.status,jdbcType=VARCHAR} - - #{item.requestTime,jdbcType=BIGINT} - - - #{item.assertionsTotal,jdbcType=BIGINT} - - - #{item.passAssertionsTotal,jdbcType=BIGINT} - #{item.fakeCode,jdbcType=VARCHAR} #{item.requestName,jdbcType=VARCHAR} - - #{item.projectId,jdbcType=VARCHAR} - - - #{item.errorTotal,jdbcType=INTEGER} + + #{item.requestTime,jdbcType=BIGINT} #{item.code,jdbcType=VARCHAR} + + #{item.responseSize,jdbcType=BIGINT} + + + #{item.scriptIdentifier,jdbcType=VARCHAR} + #{item.content,jdbcType=LONGVARBINARY} diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportMapper.xml index 7edd68e430..e631de2da1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiReportMapper.xml @@ -5,19 +5,33 @@ - - - + + + + + + + + - - + + + + + + + + + + + @@ -78,8 +92,11 @@ - id, `name`, resource_id, create_time, update_time, create_user, update_user, deleted, - `status`, run_mode, pool_id, trigger_mode, version_id, project_id, integrated, environment_id + id, `name`, resource_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, version_id, integrated, project_id, environment_id, error_count, fake_error_count, + pending_count, success_count, assertion_count, pass_assertions_count, request_execution_rate, + request_approval_rate, assertion_pass_rate, script_identifier @@ -246,45 +357,87 @@ resource_id = #{record.resourceId,jdbcType=VARCHAR}, - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - update_time = #{record.updateTime,jdbcType=BIGINT}, - create_user = #{record.createUser,jdbcType=VARCHAR}, - - update_user = #{record.updateUser,jdbcType=VARCHAR}, + + delete_time = #{record.deleteTime,jdbcType=BIGINT}, + + + delete_user = #{record.deleteUser,jdbcType=VARCHAR}, deleted = #{record.deleted,jdbcType=BIT}, + + update_user = #{record.updateUser,jdbcType=VARCHAR}, + + + update_time = #{record.updateTime,jdbcType=BIGINT}, + + + start_time = #{record.startTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + request_duration = #{record.requestDuration,jdbcType=BIGINT}, + `status` = #{record.status,jdbcType=VARCHAR}, + + trigger_mode = #{record.triggerMode,jdbcType=VARCHAR}, + run_mode = #{record.runMode,jdbcType=VARCHAR}, pool_id = #{record.poolId,jdbcType=VARCHAR}, - - trigger_mode = #{record.triggerMode,jdbcType=VARCHAR}, - version_id = #{record.versionId,jdbcType=VARCHAR}, - - project_id = #{record.projectId,jdbcType=VARCHAR}, - integrated = #{record.integrated,jdbcType=BIT}, + + project_id = #{record.projectId,jdbcType=VARCHAR}, + environment_id = #{record.environmentId,jdbcType=VARCHAR}, + + error_count = #{record.errorCount,jdbcType=BIGINT}, + + + fake_error_count = #{record.fakeErrorCount,jdbcType=BIGINT}, + + + pending_count = #{record.pendingCount,jdbcType=BIGINT}, + + + success_count = #{record.successCount,jdbcType=BIGINT}, + + + assertion_count = #{record.assertionCount,jdbcType=BIGINT}, + + + pass_assertions_count = #{record.passAssertionsCount,jdbcType=BIGINT}, + + + request_execution_rate = #{record.requestExecutionRate,jdbcType=BIGINT}, + + + request_approval_rate = #{record.requestApprovalRate,jdbcType=BIGINT}, + + + assertion_pass_rate = #{record.assertionPassRate,jdbcType=BIGINT}, + + + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, + @@ -295,19 +448,33 @@ set id = #{record.id,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR}, resource_id = #{record.resourceId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, create_user = #{record.createUser,jdbcType=VARCHAR}, - update_user = #{record.updateUser,jdbcType=VARCHAR}, + delete_time = #{record.deleteTime,jdbcType=BIGINT}, + delete_user = #{record.deleteUser,jdbcType=VARCHAR}, deleted = #{record.deleted,jdbcType=BIT}, + update_user = #{record.updateUser,jdbcType=VARCHAR}, + update_time = #{record.updateTime,jdbcType=BIGINT}, + start_time = #{record.startTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + request_duration = #{record.requestDuration,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, + trigger_mode = #{record.triggerMode,jdbcType=VARCHAR}, run_mode = #{record.runMode,jdbcType=VARCHAR}, pool_id = #{record.poolId,jdbcType=VARCHAR}, - trigger_mode = #{record.triggerMode,jdbcType=VARCHAR}, version_id = #{record.versionId,jdbcType=VARCHAR}, - project_id = #{record.projectId,jdbcType=VARCHAR}, integrated = #{record.integrated,jdbcType=BIT}, - environment_id = #{record.environmentId,jdbcType=VARCHAR} + project_id = #{record.projectId,jdbcType=VARCHAR}, + environment_id = #{record.environmentId,jdbcType=VARCHAR}, + error_count = #{record.errorCount,jdbcType=BIGINT}, + fake_error_count = #{record.fakeErrorCount,jdbcType=BIGINT}, + pending_count = #{record.pendingCount,jdbcType=BIGINT}, + success_count = #{record.successCount,jdbcType=BIGINT}, + assertion_count = #{record.assertionCount,jdbcType=BIGINT}, + pass_assertions_count = #{record.passAssertionsCount,jdbcType=BIGINT}, + request_execution_rate = #{record.requestExecutionRate,jdbcType=BIGINT}, + request_approval_rate = #{record.requestApprovalRate,jdbcType=BIGINT}, + assertion_pass_rate = #{record.assertionPassRate,jdbcType=BIGINT}, + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR} @@ -321,45 +488,87 @@ resource_id = #{resourceId,jdbcType=VARCHAR}, - - create_time = #{createTime,jdbcType=BIGINT}, - - - update_time = #{updateTime,jdbcType=BIGINT}, - create_user = #{createUser,jdbcType=VARCHAR}, - - update_user = #{updateUser,jdbcType=VARCHAR}, + + delete_time = #{deleteTime,jdbcType=BIGINT}, + + + delete_user = #{deleteUser,jdbcType=VARCHAR}, deleted = #{deleted,jdbcType=BIT}, + + update_user = #{updateUser,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=BIGINT}, + + + start_time = #{startTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + request_duration = #{requestDuration,jdbcType=BIGINT}, + `status` = #{status,jdbcType=VARCHAR}, + + trigger_mode = #{triggerMode,jdbcType=VARCHAR}, + run_mode = #{runMode,jdbcType=VARCHAR}, pool_id = #{poolId,jdbcType=VARCHAR}, - - trigger_mode = #{triggerMode,jdbcType=VARCHAR}, - version_id = #{versionId,jdbcType=VARCHAR}, - - project_id = #{projectId,jdbcType=VARCHAR}, - integrated = #{integrated,jdbcType=BIT}, + + project_id = #{projectId,jdbcType=VARCHAR}, + environment_id = #{environmentId,jdbcType=VARCHAR}, + + error_count = #{errorCount,jdbcType=BIGINT}, + + + fake_error_count = #{fakeErrorCount,jdbcType=BIGINT}, + + + pending_count = #{pendingCount,jdbcType=BIGINT}, + + + success_count = #{successCount,jdbcType=BIGINT}, + + + assertion_count = #{assertionCount,jdbcType=BIGINT}, + + + pass_assertions_count = #{passAssertionsCount,jdbcType=BIGINT}, + + + request_execution_rate = #{requestExecutionRate,jdbcType=BIGINT}, + + + request_approval_rate = #{requestApprovalRate,jdbcType=BIGINT}, + + + assertion_pass_rate = #{assertionPassRate,jdbcType=BIGINT}, + + + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -367,34 +576,56 @@ update api_report set `name` = #{name,jdbcType=VARCHAR}, resource_id = #{resourceId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, create_user = #{createUser,jdbcType=VARCHAR}, - update_user = #{updateUser,jdbcType=VARCHAR}, + delete_time = #{deleteTime,jdbcType=BIGINT}, + delete_user = #{deleteUser,jdbcType=VARCHAR}, deleted = #{deleted,jdbcType=BIT}, + update_user = #{updateUser,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=BIGINT}, + start_time = #{startTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + request_duration = #{requestDuration,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, + trigger_mode = #{triggerMode,jdbcType=VARCHAR}, run_mode = #{runMode,jdbcType=VARCHAR}, pool_id = #{poolId,jdbcType=VARCHAR}, - trigger_mode = #{triggerMode,jdbcType=VARCHAR}, version_id = #{versionId,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=VARCHAR}, integrated = #{integrated,jdbcType=BIT}, - environment_id = #{environmentId,jdbcType=VARCHAR} + project_id = #{projectId,jdbcType=VARCHAR}, + environment_id = #{environmentId,jdbcType=VARCHAR}, + error_count = #{errorCount,jdbcType=BIGINT}, + fake_error_count = #{fakeErrorCount,jdbcType=BIGINT}, + pending_count = #{pendingCount,jdbcType=BIGINT}, + success_count = #{successCount,jdbcType=BIGINT}, + assertion_count = #{assertionCount,jdbcType=BIGINT}, + pass_assertions_count = #{passAssertionsCount,jdbcType=BIGINT}, + request_execution_rate = #{requestExecutionRate,jdbcType=BIGINT}, + request_approval_rate = #{requestApprovalRate,jdbcType=BIGINT}, + assertion_pass_rate = #{assertionPassRate,jdbcType=BIGINT}, + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} insert into api_report - (id, `name`, resource_id, create_time, update_time, create_user, update_user, deleted, - `status`, run_mode, pool_id, trigger_mode, version_id, project_id, integrated, - environment_id) + (id, `name`, resource_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, version_id, integrated, project_id, environment_id, error_count, fake_error_count, + pending_count, success_count, assertion_count, pass_assertions_count, request_execution_rate, + request_approval_rate, assertion_pass_rate, script_identifier) values (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.resourceId,jdbcType=VARCHAR}, - #{item.createTime,jdbcType=BIGINT}, #{item.updateTime,jdbcType=BIGINT}, #{item.createUser,jdbcType=VARCHAR}, - #{item.updateUser,jdbcType=VARCHAR}, #{item.deleted,jdbcType=BIT}, #{item.status,jdbcType=VARCHAR}, - #{item.runMode,jdbcType=VARCHAR}, #{item.poolId,jdbcType=VARCHAR}, #{item.triggerMode,jdbcType=VARCHAR}, - #{item.versionId,jdbcType=VARCHAR}, #{item.projectId,jdbcType=VARCHAR}, #{item.integrated,jdbcType=BIT}, - #{item.environmentId,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.startTime,jdbcType=BIGINT}, #{item.endTime,jdbcType=BIGINT}, #{item.requestDuration,jdbcType=BIGINT}, + #{item.status,jdbcType=VARCHAR}, #{item.triggerMode,jdbcType=VARCHAR}, #{item.runMode,jdbcType=VARCHAR}, + #{item.poolId,jdbcType=VARCHAR}, #{item.versionId,jdbcType=VARCHAR}, #{item.integrated,jdbcType=BIT}, + #{item.projectId,jdbcType=VARCHAR}, #{item.environmentId,jdbcType=VARCHAR}, #{item.errorCount,jdbcType=BIGINT}, + #{item.fakeErrorCount,jdbcType=BIGINT}, #{item.pendingCount,jdbcType=BIGINT}, #{item.successCount,jdbcType=BIGINT}, + #{item.assertionCount,jdbcType=BIGINT}, #{item.passAssertionsCount,jdbcType=BIGINT}, + #{item.requestExecutionRate,jdbcType=BIGINT}, #{item.requestApprovalRate,jdbcType=BIGINT}, + #{item.assertionPassRate,jdbcType=BIGINT}, #{item.scriptIdentifier,jdbcType=VARCHAR} + ) @@ -416,45 +647,87 @@ #{item.resourceId,jdbcType=VARCHAR} - - #{item.createTime,jdbcType=BIGINT} - - - #{item.updateTime,jdbcType=BIGINT} - #{item.createUser,jdbcType=VARCHAR} - - #{item.updateUser,jdbcType=VARCHAR} + + #{item.deleteTime,jdbcType=BIGINT} + + + #{item.deleteUser,jdbcType=VARCHAR} #{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.status,jdbcType=VARCHAR} + + #{item.triggerMode,jdbcType=VARCHAR} + #{item.runMode,jdbcType=VARCHAR} #{item.poolId,jdbcType=VARCHAR} - - #{item.triggerMode,jdbcType=VARCHAR} - #{item.versionId,jdbcType=VARCHAR} - - #{item.projectId,jdbcType=VARCHAR} - #{item.integrated,jdbcType=BIT} + + #{item.projectId,jdbcType=VARCHAR} + #{item.environmentId,jdbcType=VARCHAR} + + #{item.errorCount,jdbcType=BIGINT} + + + #{item.fakeErrorCount,jdbcType=BIGINT} + + + #{item.pendingCount,jdbcType=BIGINT} + + + #{item.successCount,jdbcType=BIGINT} + + + #{item.assertionCount,jdbcType=BIGINT} + + + #{item.passAssertionsCount,jdbcType=BIGINT} + + + #{item.requestExecutionRate,jdbcType=BIGINT} + + + #{item.requestApprovalRate,jdbcType=BIGINT} + + + #{item.assertionPassRate,jdbcType=BIGINT} + + + #{item.scriptIdentifier,jdbcType=VARCHAR} + ) diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportDetailMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportDetailMapper.xml index 3de4e4c10b..efe78b90c2 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportDetailMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportDetailMapper.xml @@ -4,17 +4,14 @@ - - + - - - - - + + + @@ -78,8 +75,8 @@ - id, report_id, resource_id, start_time, `status`, request_time, assertions_total, - pass_assertions_total, fake_code, request_name, project_id, error_total, code + id, report_id, report_step_id, `status`, fake_code, request_name, request_time, code, + response_size, script_identifier content @@ -133,16 +130,14 @@ - insert into api_scenario_report_detail (id, report_id, resource_id, - start_time, `status`, request_time, - assertions_total, pass_assertions_total, fake_code, - request_name, project_id, error_total, - code, content) - values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, - #{startTime,jdbcType=BIGINT}, #{status,jdbcType=VARCHAR}, #{requestTime,jdbcType=BIGINT}, - #{assertionsTotal,jdbcType=BIGINT}, #{passAssertionsTotal,jdbcType=BIGINT}, #{fakeCode,jdbcType=VARCHAR}, - #{requestName,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{errorTotal,jdbcType=INTEGER}, - #{code,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}) + insert into api_scenario_report_detail (id, report_id, report_step_id, + `status`, fake_code, request_name, + request_time, code, response_size, + script_identifier, content) + values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{reportStepId,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, #{fakeCode,jdbcType=VARCHAR}, #{requestName,jdbcType=VARCHAR}, + #{requestTime,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, #{responseSize,jdbcType=BIGINT}, + #{scriptIdentifier,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}) insert into api_scenario_report_detail @@ -153,39 +148,30 @@ report_id, - - resource_id, - - - start_time, + + report_step_id, `status`, - - request_time, - - - assertions_total, - - - pass_assertions_total, - fake_code, request_name, - - project_id, - - - error_total, + + request_time, code, + + response_size, + + + script_identifier, + content, @@ -197,39 +183,30 @@ #{reportId,jdbcType=VARCHAR}, - - #{resourceId,jdbcType=VARCHAR}, - - - #{startTime,jdbcType=BIGINT}, + + #{reportStepId,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - - #{requestTime,jdbcType=BIGINT}, - - - #{assertionsTotal,jdbcType=BIGINT}, - - - #{passAssertionsTotal,jdbcType=BIGINT}, - #{fakeCode,jdbcType=VARCHAR}, #{requestName,jdbcType=VARCHAR}, - - #{projectId,jdbcType=VARCHAR}, - - - #{errorTotal,jdbcType=INTEGER}, + + #{requestTime,jdbcType=BIGINT}, #{code,jdbcType=VARCHAR}, + + #{responseSize,jdbcType=BIGINT}, + + + #{scriptIdentifier,jdbcType=VARCHAR}, + #{content,jdbcType=LONGVARBINARY}, @@ -250,39 +227,30 @@ report_id = #{record.reportId,jdbcType=VARCHAR}, - - resource_id = #{record.resourceId,jdbcType=VARCHAR}, - - - start_time = #{record.startTime,jdbcType=BIGINT}, + + report_step_id = #{record.reportStepId,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, - - request_time = #{record.requestTime,jdbcType=BIGINT}, - - - assertions_total = #{record.assertionsTotal,jdbcType=BIGINT}, - - - pass_assertions_total = #{record.passAssertionsTotal,jdbcType=BIGINT}, - fake_code = #{record.fakeCode,jdbcType=VARCHAR}, request_name = #{record.requestName,jdbcType=VARCHAR}, - - project_id = #{record.projectId,jdbcType=VARCHAR}, - - - error_total = #{record.errorTotal,jdbcType=INTEGER}, + + request_time = #{record.requestTime,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, + + response_size = #{record.responseSize,jdbcType=BIGINT}, + + + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, + content = #{record.content,jdbcType=LONGVARBINARY}, @@ -295,17 +263,14 @@ update api_scenario_report_detail set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, - resource_id = #{record.resourceId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, + report_step_id = #{record.reportStepId,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, - request_time = #{record.requestTime,jdbcType=BIGINT}, - assertions_total = #{record.assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{record.passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{record.fakeCode,jdbcType=VARCHAR}, request_name = #{record.requestName,jdbcType=VARCHAR}, - project_id = #{record.projectId,jdbcType=VARCHAR}, - error_total = #{record.errorTotal,jdbcType=INTEGER}, + request_time = #{record.requestTime,jdbcType=BIGINT}, code = #{record.code,jdbcType=VARCHAR}, + response_size = #{record.responseSize,jdbcType=BIGINT}, + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, content = #{record.content,jdbcType=LONGVARBINARY} @@ -315,17 +280,14 @@ update api_scenario_report_detail set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, - resource_id = #{record.resourceId,jdbcType=VARCHAR}, - start_time = #{record.startTime,jdbcType=BIGINT}, + report_step_id = #{record.reportStepId,jdbcType=VARCHAR}, `status` = #{record.status,jdbcType=VARCHAR}, - request_time = #{record.requestTime,jdbcType=BIGINT}, - assertions_total = #{record.assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{record.passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{record.fakeCode,jdbcType=VARCHAR}, request_name = #{record.requestName,jdbcType=VARCHAR}, - project_id = #{record.projectId,jdbcType=VARCHAR}, - error_total = #{record.errorTotal,jdbcType=INTEGER}, - code = #{record.code,jdbcType=VARCHAR} + request_time = #{record.requestTime,jdbcType=BIGINT}, + code = #{record.code,jdbcType=VARCHAR}, + response_size = #{record.responseSize,jdbcType=BIGINT}, + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR} @@ -336,39 +298,30 @@ report_id = #{reportId,jdbcType=VARCHAR}, - - resource_id = #{resourceId,jdbcType=VARCHAR}, - - - start_time = #{startTime,jdbcType=BIGINT}, + + report_step_id = #{reportStepId,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, - - request_time = #{requestTime,jdbcType=BIGINT}, - - - assertions_total = #{assertionsTotal,jdbcType=BIGINT}, - - - pass_assertions_total = #{passAssertionsTotal,jdbcType=BIGINT}, - fake_code = #{fakeCode,jdbcType=VARCHAR}, request_name = #{requestName,jdbcType=VARCHAR}, - - project_id = #{projectId,jdbcType=VARCHAR}, - - - error_total = #{errorTotal,jdbcType=INTEGER}, + + request_time = #{requestTime,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, + + response_size = #{responseSize,jdbcType=BIGINT}, + + + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, + content = #{content,jdbcType=LONGVARBINARY}, @@ -378,48 +331,40 @@ update api_scenario_report_detail set report_id = #{reportId,jdbcType=VARCHAR}, - resource_id = #{resourceId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, + report_step_id = #{reportStepId,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, - request_time = #{requestTime,jdbcType=BIGINT}, - assertions_total = #{assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{fakeCode,jdbcType=VARCHAR}, request_name = #{requestName,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=VARCHAR}, - error_total = #{errorTotal,jdbcType=INTEGER}, + request_time = #{requestTime,jdbcType=BIGINT}, code = #{code,jdbcType=VARCHAR}, + response_size = #{responseSize,jdbcType=BIGINT}, + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, content = #{content,jdbcType=LONGVARBINARY} where id = #{id,jdbcType=VARCHAR} update api_scenario_report_detail set report_id = #{reportId,jdbcType=VARCHAR}, - resource_id = #{resourceId,jdbcType=VARCHAR}, - start_time = #{startTime,jdbcType=BIGINT}, + report_step_id = #{reportStepId,jdbcType=VARCHAR}, `status` = #{status,jdbcType=VARCHAR}, - request_time = #{requestTime,jdbcType=BIGINT}, - assertions_total = #{assertionsTotal,jdbcType=BIGINT}, - pass_assertions_total = #{passAssertionsTotal,jdbcType=BIGINT}, fake_code = #{fakeCode,jdbcType=VARCHAR}, request_name = #{requestName,jdbcType=VARCHAR}, - project_id = #{projectId,jdbcType=VARCHAR}, - error_total = #{errorTotal,jdbcType=INTEGER}, - code = #{code,jdbcType=VARCHAR} + request_time = #{requestTime,jdbcType=BIGINT}, + code = #{code,jdbcType=VARCHAR}, + response_size = #{responseSize,jdbcType=BIGINT}, + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} insert into api_scenario_report_detail - (id, report_id, resource_id, start_time, `status`, request_time, assertions_total, - pass_assertions_total, fake_code, request_name, project_id, error_total, code, - content) + (id, report_id, report_step_id, `status`, fake_code, request_name, request_time, + code, response_size, script_identifier, content) values - (#{item.id,jdbcType=VARCHAR}, #{item.reportId,jdbcType=VARCHAR}, #{item.resourceId,jdbcType=VARCHAR}, - #{item.startTime,jdbcType=BIGINT}, #{item.status,jdbcType=VARCHAR}, #{item.requestTime,jdbcType=BIGINT}, - #{item.assertionsTotal,jdbcType=BIGINT}, #{item.passAssertionsTotal,jdbcType=BIGINT}, - #{item.fakeCode,jdbcType=VARCHAR}, #{item.requestName,jdbcType=VARCHAR}, #{item.projectId,jdbcType=VARCHAR}, - #{item.errorTotal,jdbcType=INTEGER}, #{item.code,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY} + (#{item.id,jdbcType=VARCHAR}, #{item.reportId,jdbcType=VARCHAR}, #{item.reportStepId,jdbcType=VARCHAR}, + #{item.status,jdbcType=VARCHAR}, #{item.fakeCode,jdbcType=VARCHAR}, #{item.requestName,jdbcType=VARCHAR}, + #{item.requestTime,jdbcType=BIGINT}, #{item.code,jdbcType=VARCHAR}, #{item.responseSize,jdbcType=BIGINT}, + #{item.scriptIdentifier,jdbcType=VARCHAR}, #{item.content,jdbcType=LONGVARBINARY} ) @@ -439,39 +384,30 @@ #{item.reportId,jdbcType=VARCHAR} - - #{item.resourceId,jdbcType=VARCHAR} - - - #{item.startTime,jdbcType=BIGINT} + + #{item.reportStepId,jdbcType=VARCHAR} #{item.status,jdbcType=VARCHAR} - - #{item.requestTime,jdbcType=BIGINT} - - - #{item.assertionsTotal,jdbcType=BIGINT} - - - #{item.passAssertionsTotal,jdbcType=BIGINT} - #{item.fakeCode,jdbcType=VARCHAR} #{item.requestName,jdbcType=VARCHAR} - - #{item.projectId,jdbcType=VARCHAR} - - - #{item.errorTotal,jdbcType=INTEGER} + + #{item.requestTime,jdbcType=BIGINT} #{item.code,jdbcType=VARCHAR} + + #{item.responseSize,jdbcType=BIGINT} + + + #{item.scriptIdentifier,jdbcType=VARCHAR} + #{item.content,jdbcType=LONGVARBINARY} diff --git a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportMapper.xml index 19359f8493..abb4757034 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/api/mapper/ApiScenarioReportMapper.xml @@ -4,14 +4,16 @@ - + - + + + @@ -19,8 +21,17 @@ - + + + + + + + + + + @@ -81,9 +92,11 @@ - id, `name`, create_time, create_user, delete_time, delete_user, deleted, update_user, - update_time, pass_rate, `status`, trigger_mode, run_mode, pool_id, version_id, integrated, - project_id, scenario_id, environment_id + id, `name`, 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, version_id, integrated, project_id, environment_id, error_count, fake_error_count, + pending_count, success_count, assertion_count, pass_assertions_count, request_execution_rate, + request_approval_rate, assertion_pass_rate, script_identifier @@ -267,8 +354,8 @@ `name` = #{record.name,jdbcType=VARCHAR}, - - create_time = #{record.createTime,jdbcType=BIGINT}, + + scenario_id = #{record.scenarioId,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR}, @@ -288,8 +375,14 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, - - pass_rate = #{record.passRate,jdbcType=BIGINT}, + + start_time = #{record.startTime,jdbcType=BIGINT}, + + + end_time = #{record.endTime,jdbcType=BIGINT}, + + + request_duration = #{record.requestDuration,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, @@ -312,12 +405,39 @@ project_id = #{record.projectId,jdbcType=VARCHAR}, - - scenario_id = #{record.scenarioId,jdbcType=VARCHAR}, - environment_id = #{record.environmentId,jdbcType=VARCHAR}, + + error_count = #{record.errorCount,jdbcType=BIGINT}, + + + fake_error_count = #{record.fakeErrorCount,jdbcType=BIGINT}, + + + pending_count = #{record.pendingCount,jdbcType=BIGINT}, + + + success_count = #{record.successCount,jdbcType=BIGINT}, + + + assertion_count = #{record.assertionCount,jdbcType=BIGINT}, + + + pass_assertions_count = #{record.passAssertionsCount,jdbcType=BIGINT}, + + + request_execution_rate = #{record.requestExecutionRate,jdbcType=BIGINT}, + + + request_approval_rate = #{record.requestApprovalRate,jdbcType=BIGINT}, + + + assertion_pass_rate = #{record.assertionPassRate,jdbcType=BIGINT}, + + + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR}, + @@ -327,14 +447,16 @@ update api_scenario_report set id = #{record.id,jdbcType=VARCHAR}, `name` = #{record.name,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, + scenario_id = #{record.scenarioId,jdbcType=VARCHAR}, create_user = #{record.createUser,jdbcType=VARCHAR}, delete_time = #{record.deleteTime,jdbcType=BIGINT}, delete_user = #{record.deleteUser,jdbcType=VARCHAR}, deleted = #{record.deleted,jdbcType=BIT}, update_user = #{record.updateUser,jdbcType=VARCHAR}, update_time = #{record.updateTime,jdbcType=BIGINT}, - pass_rate = #{record.passRate,jdbcType=BIGINT}, + start_time = #{record.startTime,jdbcType=BIGINT}, + end_time = #{record.endTime,jdbcType=BIGINT}, + request_duration = #{record.requestDuration,jdbcType=BIGINT}, `status` = #{record.status,jdbcType=VARCHAR}, trigger_mode = #{record.triggerMode,jdbcType=VARCHAR}, run_mode = #{record.runMode,jdbcType=VARCHAR}, @@ -342,8 +464,17 @@ version_id = #{record.versionId,jdbcType=VARCHAR}, integrated = #{record.integrated,jdbcType=BIT}, project_id = #{record.projectId,jdbcType=VARCHAR}, - scenario_id = #{record.scenarioId,jdbcType=VARCHAR}, - environment_id = #{record.environmentId,jdbcType=VARCHAR} + environment_id = #{record.environmentId,jdbcType=VARCHAR}, + error_count = #{record.errorCount,jdbcType=BIGINT}, + fake_error_count = #{record.fakeErrorCount,jdbcType=BIGINT}, + pending_count = #{record.pendingCount,jdbcType=BIGINT}, + success_count = #{record.successCount,jdbcType=BIGINT}, + assertion_count = #{record.assertionCount,jdbcType=BIGINT}, + pass_assertions_count = #{record.passAssertionsCount,jdbcType=BIGINT}, + request_execution_rate = #{record.requestExecutionRate,jdbcType=BIGINT}, + request_approval_rate = #{record.requestApprovalRate,jdbcType=BIGINT}, + assertion_pass_rate = #{record.assertionPassRate,jdbcType=BIGINT}, + script_identifier = #{record.scriptIdentifier,jdbcType=VARCHAR} @@ -354,8 +485,8 @@ `name` = #{name,jdbcType=VARCHAR}, - - create_time = #{createTime,jdbcType=BIGINT}, + + scenario_id = #{scenarioId,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR}, @@ -375,8 +506,14 @@ update_time = #{updateTime,jdbcType=BIGINT}, - - pass_rate = #{passRate,jdbcType=BIGINT}, + + start_time = #{startTime,jdbcType=BIGINT}, + + + end_time = #{endTime,jdbcType=BIGINT}, + + + request_duration = #{requestDuration,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, @@ -399,26 +536,55 @@ project_id = #{projectId,jdbcType=VARCHAR}, - - scenario_id = #{scenarioId,jdbcType=VARCHAR}, - environment_id = #{environmentId,jdbcType=VARCHAR}, + + error_count = #{errorCount,jdbcType=BIGINT}, + + + fake_error_count = #{fakeErrorCount,jdbcType=BIGINT}, + + + pending_count = #{pendingCount,jdbcType=BIGINT}, + + + success_count = #{successCount,jdbcType=BIGINT}, + + + assertion_count = #{assertionCount,jdbcType=BIGINT}, + + + pass_assertions_count = #{passAssertionsCount,jdbcType=BIGINT}, + + + request_execution_rate = #{requestExecutionRate,jdbcType=BIGINT}, + + + request_approval_rate = #{requestApprovalRate,jdbcType=BIGINT}, + + + assertion_pass_rate = #{assertionPassRate,jdbcType=BIGINT}, + + + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} update api_scenario_report set `name` = #{name,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, + scenario_id = #{scenarioId,jdbcType=VARCHAR}, create_user = #{createUser,jdbcType=VARCHAR}, delete_time = #{deleteTime,jdbcType=BIGINT}, delete_user = #{deleteUser,jdbcType=VARCHAR}, deleted = #{deleted,jdbcType=BIT}, update_user = #{updateUser,jdbcType=VARCHAR}, update_time = #{updateTime,jdbcType=BIGINT}, - pass_rate = #{passRate,jdbcType=BIGINT}, + start_time = #{startTime,jdbcType=BIGINT}, + end_time = #{endTime,jdbcType=BIGINT}, + request_duration = #{requestDuration,jdbcType=BIGINT}, `status` = #{status,jdbcType=VARCHAR}, trigger_mode = #{triggerMode,jdbcType=VARCHAR}, run_mode = #{runMode,jdbcType=VARCHAR}, @@ -426,24 +592,40 @@ version_id = #{versionId,jdbcType=VARCHAR}, integrated = #{integrated,jdbcType=BIT}, project_id = #{projectId,jdbcType=VARCHAR}, - scenario_id = #{scenarioId,jdbcType=VARCHAR}, - environment_id = #{environmentId,jdbcType=VARCHAR} + environment_id = #{environmentId,jdbcType=VARCHAR}, + error_count = #{errorCount,jdbcType=BIGINT}, + fake_error_count = #{fakeErrorCount,jdbcType=BIGINT}, + pending_count = #{pendingCount,jdbcType=BIGINT}, + success_count = #{successCount,jdbcType=BIGINT}, + assertion_count = #{assertionCount,jdbcType=BIGINT}, + pass_assertions_count = #{passAssertionsCount,jdbcType=BIGINT}, + request_execution_rate = #{requestExecutionRate,jdbcType=BIGINT}, + request_approval_rate = #{requestApprovalRate,jdbcType=BIGINT}, + assertion_pass_rate = #{assertionPassRate,jdbcType=BIGINT}, + script_identifier = #{scriptIdentifier,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} insert into api_scenario_report - (id, `name`, create_time, create_user, delete_time, delete_user, deleted, update_user, - update_time, pass_rate, `status`, trigger_mode, run_mode, pool_id, version_id, - integrated, project_id, scenario_id, environment_id) + (id, `name`, 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, version_id, integrated, project_id, environment_id, error_count, fake_error_count, + pending_count, success_count, assertion_count, pass_assertions_count, request_execution_rate, + request_approval_rate, assertion_pass_rate, script_identifier) values - (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.createTime,jdbcType=BIGINT}, + (#{item.id,jdbcType=VARCHAR}, #{item.name,jdbcType=VARCHAR}, #{item.scenarioId,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.passRate,jdbcType=BIGINT}, #{item.status,jdbcType=VARCHAR}, #{item.triggerMode,jdbcType=VARCHAR}, - #{item.runMode,jdbcType=VARCHAR}, #{item.poolId,jdbcType=VARCHAR}, #{item.versionId,jdbcType=VARCHAR}, - #{item.integrated,jdbcType=BIT}, #{item.projectId,jdbcType=VARCHAR}, #{item.scenarioId,jdbcType=VARCHAR}, - #{item.environmentId,jdbcType=VARCHAR}) + #{item.startTime,jdbcType=BIGINT}, #{item.endTime,jdbcType=BIGINT}, #{item.requestDuration,jdbcType=BIGINT}, + #{item.status,jdbcType=VARCHAR}, #{item.triggerMode,jdbcType=VARCHAR}, #{item.runMode,jdbcType=VARCHAR}, + #{item.poolId,jdbcType=VARCHAR}, #{item.versionId,jdbcType=VARCHAR}, #{item.integrated,jdbcType=BIT}, + #{item.projectId,jdbcType=VARCHAR}, #{item.environmentId,jdbcType=VARCHAR}, #{item.errorCount,jdbcType=BIGINT}, + #{item.fakeErrorCount,jdbcType=BIGINT}, #{item.pendingCount,jdbcType=BIGINT}, #{item.successCount,jdbcType=BIGINT}, + #{item.assertionCount,jdbcType=BIGINT}, #{item.passAssertionsCount,jdbcType=BIGINT}, + #{item.requestExecutionRate,jdbcType=BIGINT}, #{item.requestApprovalRate,jdbcType=BIGINT}, + #{item.assertionPassRate,jdbcType=BIGINT}, #{item.scriptIdentifier,jdbcType=VARCHAR} + ) @@ -462,8 +644,8 @@ #{item.name,jdbcType=VARCHAR} - - #{item.createTime,jdbcType=BIGINT} + + #{item.scenarioId,jdbcType=VARCHAR} #{item.createUser,jdbcType=VARCHAR} @@ -483,8 +665,14 @@ #{item.updateTime,jdbcType=BIGINT} - - #{item.passRate,jdbcType=BIGINT} + + #{item.startTime,jdbcType=BIGINT} + + + #{item.endTime,jdbcType=BIGINT} + + + #{item.requestDuration,jdbcType=BIGINT} #{item.status,jdbcType=VARCHAR} @@ -507,12 +695,39 @@ #{item.projectId,jdbcType=VARCHAR} - - #{item.scenarioId,jdbcType=VARCHAR} - #{item.environmentId,jdbcType=VARCHAR} + + #{item.errorCount,jdbcType=BIGINT} + + + #{item.fakeErrorCount,jdbcType=BIGINT} + + + #{item.pendingCount,jdbcType=BIGINT} + + + #{item.successCount,jdbcType=BIGINT} + + + #{item.assertionCount,jdbcType=BIGINT} + + + #{item.passAssertionsCount,jdbcType=BIGINT} + + + #{item.requestExecutionRate,jdbcType=BIGINT} + + + #{item.requestApprovalRate,jdbcType=BIGINT} + + + #{item.assertionPassRate,jdbcType=BIGINT} + + + #{item.scriptIdentifier,jdbcType=VARCHAR} + ) diff --git a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_5__api_test.sql b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_5__api_test.sql index deb191973a..b7720069e7 100644 --- a/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_5__api_test.sql +++ b/backend/framework/domain/src/main/resources/migration/3.0.0/ddl/V3.0.0_5__api_test.sql @@ -99,53 +99,66 @@ CREATE INDEX idx_create_user ON api_definition(create_user); CREATE INDEX idx_name ON api_definition(name); CREATE TABLE IF NOT EXISTS api_report( - `id` VARCHAR(50) NOT NULL COMMENT '接口结果报告pk' , - `name` VARCHAR(200) NOT NULL COMMENT '接口报告名称' , - `resource_id` VARCHAR(50) NOT NULL COMMENT '资源fk/api_definition_id/api_test_case_id' , - `create_time` BIGINT NOT NULL COMMENT '创建时间' , - `update_time` BIGINT NOT NULL COMMENT '修改时间' , - `create_user` VARCHAR(50) NOT NULL COMMENT '创建人fk' , + `id` VARCHAR(50) NOT NULL COMMENT '场景报告pk' , + `name` VARCHAR(255) NOT NULL COMMENT '报告名称' , + `resource_id` VARCHAR(50) NOT NULL COMMENT '场景资源fk/api_definition_id/api_test_case_id' , + `create_user` VARCHAR(50) NOT NULL COMMENT '创建人' , + `delete_time` BIGINT COMMENT '删除时间' , + `delete_user` VARCHAR(50) COMMENT '删除人' , + `deleted` BIT(1) NOT NULL DEFAULT 0 COMMENT '删除标识' , `update_user` VARCHAR(50) NOT NULL COMMENT '修改人' , - `deleted` BIT(1) NOT NULL DEFAULT 0 COMMENT '删除状态' , - `status` VARCHAR(50) NOT NULL DEFAULT 'Pending' COMMENT '结果状态' , - `run_mode` VARCHAR(20) NOT NULL COMMENT '执行模块/API/CASE/API_PLAN' , - `pool_id` VARCHAR(50) NOT NULL COMMENT '资源池fk' , - `trigger_mode` VARCHAR(50) NOT NULL COMMENT '触发模式/手动/批量/定时任务/JENKINS' , + `update_time` BIGINT NOT NULL COMMENT '更新时间' , + `start_time` BIGINT NOT NULL COMMENT '开始时间/同创建时间一致' , + `end_time` BIGINT NOT NULL COMMENT '结束时间/报告执行完成' , + `request_duration` BIGINT NOT NULL COMMENT '请求总耗时' , + `status` VARCHAR(20) NOT NULL DEFAULT 'Pending' COMMENT '报告状态/SUCCESS/ERROR' , + `trigger_mode` VARCHAR(20) NOT NULL COMMENT '触发方式' , + `run_mode` VARCHAR(20) NOT NULL COMMENT '执行模式' , + `pool_id` VARCHAR(50) NOT NULL COMMENT '资源池' , `version_id` VARCHAR(50) COMMENT '版本fk' , + `integrated` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否是集成报告' , `project_id` VARCHAR(50) NOT NULL COMMENT '项目fk' , - `integrated` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否为集成报告，默认否' , - `environment_id` VARCHAR(50) COMMENT '环境id' , + `environment_id` VARCHAR(50) COMMENT '环境' , + `error_count` BIGINT NOT NULL DEFAULT 0 COMMENT '失败数' , + `fake_error_count` BIGINT NOT NULL DEFAULT 0 COMMENT '误报数' , + `pending_count` BIGINT NOT NULL DEFAULT 0 COMMENT '未执行数' , + `success_count` BIGINT NOT NULL DEFAULT 0 COMMENT '成功数' , + `assertion_count` BIGINT NOT NULL DEFAULT 0 COMMENT '总断言数' , + `pass_assertions_count` BIGINT NOT NULL DEFAULT 0 COMMENT '失败断言数' , + `request_execution_rate` BIGINT NOT NULL DEFAULT 0 COMMENT '请求执行率' , + `request_approval_rate` BIGINT NOT NULL DEFAULT 0 COMMENT '请求通过率' , + `assertion_pass_rate` BIGINT NOT NULL DEFAULT 0 COMMENT '断言通过率' , + `script_identifier` VARCHAR(255) COMMENT '脚本标识' , PRIMARY KEY (id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'API/CASE执行结果'; -CREATE INDEX idx_integrated ON api_report(integrated); -CREATE INDEX idx_update_time ON api_report(update_time); CREATE INDEX idx_project_id ON api_report(project_id); CREATE INDEX idx_resource_id ON api_report(resource_id); +CREATE INDEX idx_trigger_mode ON api_report(trigger_mode); +CREATE INDEX idx_run_mode ON api_report(run_mode); CREATE INDEX idx_status ON api_report(status); +CREATE INDEX idx_update_time ON api_report(update_time); CREATE INDEX idx_create_user ON api_report(create_user); +CREATE INDEX idx_name ON api_report(name); +CREATE INDEX idx_pool_id ON api_report(pool_id); CREATE TABLE IF NOT EXISTS api_report_detail( `id` VARCHAR(50) NOT NULL COMMENT '报告详情id' , `report_id` VARCHAR(50) NOT NULL COMMENT '接口报告id' , `resource_id` VARCHAR(50) NOT NULL COMMENT '场景中各个步骤请求唯一标识' , - `start_time` BIGINT NOT NULL COMMENT '开始时间' , `status` VARCHAR(20) NOT NULL COMMENT '结果状态' , - `request_time` BIGINT COMMENT '单个请求步骤时间' , - `assertions_total` BIGINT COMMENT '总断言数' , - `pass_assertions_total` BIGINT COMMENT '失败断言数' , - `fake_code` VARCHAR(200) COMMENT '误报编号' , + `fake_code` VARCHAR(200) COMMENT '误报编号/误报状态独有' , `request_name` VARCHAR(500) COMMENT '请求名称' , - `project_id` VARCHAR(50) COMMENT '项目fk' , - `error_total` INT COMMENT '失败总数' , + `request_time` BIGINT NOT NULL COMMENT '请求耗时' , `code` VARCHAR(500) COMMENT '请求响应码' , + `response_size` BIGINT NOT NULL COMMENT '响应内容大小' , `content` LONGBLOB COMMENT '结果内容详情' , + `script_identifier` VARCHAR(255) COMMENT '脚本标识' , PRIMARY KEY (id) -) - ENGINE = InnoDB +) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'API/CASE执行结果详情'; @@ -202,11 +215,11 @@ CREATE TABLE IF NOT EXISTS api_scenario( `num` BIGINT NOT NULL COMMENT '编号' , `deleted` BIT(1) NOT NULL DEFAULT 0 COMMENT '删除状态' , `pos` BIGINT NOT NULL COMMENT '自定义排序' , - `version_id` VARCHAR(50) COMMENT '版本fk' , - `ref_id` VARCHAR(50) COMMENT '引用资源fk' , - `latest` BIT(1) DEFAULT 0 COMMENT '是否为最新版本 0:否，1:是' , + `version_id` VARCHAR(50) NOT NULL COMMENT '版本fk' , + `ref_id` VARCHAR(50) NOT NULL COMMENT '引用资源fk' , + `latest` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否为最新版本 0:否，1:是' , `project_id` VARCHAR(50) NOT NULL COMMENT '项目fk' , - `module_id` VARCHAR(50) COMMENT '场景模块fk' , + `module_id` VARCHAR(50) NOT NULL COMMENT '场景模块fk' , `description` VARCHAR(500) COMMENT '描述信息' , `tags` VARCHAR(1000) COMMENT '标签' , `grouped` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否为环境组' , @@ -217,11 +230,10 @@ CREATE TABLE IF NOT EXISTS api_scenario( `update_user` VARCHAR(50) NOT NULL COMMENT '更新人' , `update_time` BIGINT NOT NULL COMMENT '更新时间' , PRIMARY KEY (id) -) ENGINE = InnoDB +) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '场景'; - CREATE INDEX idx_module_id ON api_scenario(module_id); CREATE INDEX idx_ref_id ON api_scenario(ref_id); CREATE INDEX idx_version_id ON api_scenario(version_id); @@ -303,14 +315,16 @@ CREATE UNIQUE INDEX uq_name_project_parent_type ON api_scenario_module (project_ CREATE TABLE IF NOT EXISTS api_scenario_report( `id` VARCHAR(50) NOT NULL COMMENT '场景报告pk' , `name` VARCHAR(255) NOT NULL COMMENT '报告名称' , - `create_time` BIGINT NOT NULL COMMENT '创建时间' , + `scenario_id` VARCHAR(50) NOT NULL COMMENT '场景fk' , `create_user` VARCHAR(50) NOT NULL COMMENT '创建人' , `delete_time` BIGINT COMMENT '删除时间' , `delete_user` VARCHAR(50) COMMENT '删除人' , `deleted` BIT(1) NOT NULL DEFAULT 0 COMMENT '删除标识' , `update_user` VARCHAR(50) NOT NULL COMMENT '修改人' , `update_time` BIGINT NOT NULL COMMENT '更新时间' , - `pass_rate` BIGINT COMMENT '通过率' , + `start_time` BIGINT NOT NULL COMMENT '开始时间/同创建时间一致' , + `end_time` BIGINT NOT NULL COMMENT '结束时间/报告执行完成' , + `request_duration` BIGINT NOT NULL COMMENT '请求总耗时' , `status` VARCHAR(20) NOT NULL DEFAULT 'Pending' COMMENT '报告状态/SUCCESS/ERROR' , `trigger_mode` VARCHAR(20) NOT NULL COMMENT '触发方式' , `run_mode` VARCHAR(20) NOT NULL COMMENT '执行模式' , @@ -318,8 +332,17 @@ CREATE TABLE IF NOT EXISTS api_scenario_report( `version_id` VARCHAR(50) COMMENT '版本fk' , `integrated` BIT(1) NOT NULL DEFAULT 0 COMMENT '是否是集成报告' , `project_id` VARCHAR(50) NOT NULL COMMENT '项目fk' , - `scenario_id` VARCHAR(50) NOT NULL COMMENT '场景fk' , `environment_id` VARCHAR(50) COMMENT '环境' , + `error_count` BIGINT NOT NULL DEFAULT 0 COMMENT '失败数' , + `fake_error_count` BIGINT NOT NULL DEFAULT 0 COMMENT '误报数' , + `pending_count` BIGINT NOT NULL DEFAULT 0 COMMENT '未执行数' , + `success_count` BIGINT NOT NULL DEFAULT 0 COMMENT '成功数' , + `assertion_count` BIGINT NOT NULL DEFAULT 0 COMMENT '总断言数' , + `pass_assertions_count` BIGINT NOT NULL DEFAULT 0 COMMENT '失败断言数' , + `request_execution_rate` BIGINT NOT NULL DEFAULT 0 COMMENT '请求执行率' , + `request_approval_rate` BIGINT NOT NULL DEFAULT 0 COMMENT '请求通过率' , + `assertion_pass_rate` BIGINT NOT NULL DEFAULT 0 COMMENT '断言通过率' , + `script_identifier` VARCHAR(255) COMMENT '脚本标识' , PRIMARY KEY (id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 @@ -338,27 +361,22 @@ CREATE INDEX idx_pool_id ON api_scenario_report(pool_id); CREATE TABLE IF NOT EXISTS api_scenario_report_detail( `id` VARCHAR(50) NOT NULL COMMENT 'ID' , `report_id` VARCHAR(50) NOT NULL COMMENT '报告fk' , - `resource_id` VARCHAR(50) NOT NULL COMMENT '场景中各个步骤请求唯一标识' , - `start_time` BIGINT COMMENT '开始时间' , + `report_step_id` VARCHAR(50) NOT NULL COMMENT '场景中各个步骤请求唯一标识' , `status` VARCHAR(20) COMMENT '结果状态' , - `request_time` BIGINT COMMENT '单个请求步骤时间' , - `assertions_total` BIGINT COMMENT '总断言数' , - `pass_assertions_total` BIGINT COMMENT '失败断言数' , - `fake_code` VARCHAR(200) COMMENT '误报编号' , + `fake_code` VARCHAR(200) COMMENT '误报编号/误报状态独有' , `request_name` VARCHAR(500) COMMENT '请求名称' , - `project_id` VARCHAR(50) COMMENT '项目fk' , - `error_total` INT COMMENT '失败总数' , + `request_time` BIGINT NOT NULL COMMENT '请求耗时' , `code` VARCHAR(500) COMMENT '请求响应码' , + `response_size` BIGINT NOT NULL COMMENT '响应内容大小' , + `script_identifier` VARCHAR(255) COMMENT '脚本标识' , `content` LONGBLOB COMMENT '执行结果' , PRIMARY KEY (id) ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '场景报告步骤结果'; - CREATE INDEX idx_report_id ON api_scenario_report_detail(report_id); -CREATE INDEX idx_resource_id ON api_scenario_report_detail(resource_id); -CREATE INDEX idx_project_id ON api_scenario_report_detail(project_id); +CREATE INDEX idx_resource_id ON api_scenario_report_detail(report_step_id); CREATE TABLE IF NOT EXISTS api_scenario_report_step( `report_id` VARCHAR(50) NOT NULL COMMENT '请求资源 id' , @@ -513,15 +531,6 @@ CREATE TABLE IF NOT EXISTS api_definition_blob( DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '接口定义详情内容'; -CREATE TABLE IF NOT EXISTS api_report_blob( - `id` VARCHAR(50) NOT NULL COMMENT '接口报告fk' , - `content` LONGBLOB COMMENT '结果内容详情' , - `environment_id` VARCHAR(50) COMMENT '执行环境配置' , - `console` BLOB COMMENT '执行过程日志' , - PRIMARY KEY (id) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - COLLATE = utf8mb4_general_ci COMMENT = 'API/CASE执行结果详情'; CREATE TABLE IF NOT EXISTS api_scenario_blob( `id` VARCHAR(50) NOT NULL COMMENT '场景pk' , diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.java b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.java index a0be062547..830672d84a 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.java @@ -14,4 +14,7 @@ import java.util.List; @Mapper public interface ExtApiDebugMapper { List list(@Param("protocol") String protocol, @Param("userId") String userId); + + Long getPos(@Param("userId") String userId); + } \ No newline at end of file diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.xml b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.xml index 519abe1d49..cdf387d902 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.xml +++ b/backend/services/api-test/src/main/java/io/metersphere/api/mapper/ExtApiDebugMapper.xml @@ -9,4 +9,12 @@ where protocol = #{protocol} and create_user = #{userId} ORDER BY pos + + \ No newline at end of file diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java index 1a61672775..39c0a0cf27 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java @@ -50,6 +50,8 @@ public class ApiDebugService { @Resource private ApiExecuteService apiExecuteService; + public static final Long ORDER_STEP = 5000L; + public List list(String protocol, String userId) { return extApiDebugMapper.list(protocol, userId); } @@ -75,6 +77,8 @@ public class ApiDebugService { apiDebug.setCreateTime(System.currentTimeMillis()); apiDebug.setUpdateTime(System.currentTimeMillis()); apiDebug.setUpdateUser(apiDebug.getCreateUser()); + apiDebug.setPos(getNextOrder(request.getProjectId())); + apiDebugMapper.insert(apiDebug); // todo 校验 moduleId ApiDebugBlob apiDebugBlob = new ApiDebugBlob(); @@ -90,6 +94,11 @@ public class ApiDebugService { return apiDebug; } + private Long getNextOrder(String projectId) { + Long pos = extApiDebugMapper.getPos(projectId); + return (pos == null ? 0 : pos) + ORDER_STEP; + } + private static ApiFileResourceUpdateRequest getApiFileResourceUpdateRequest(String sourceId, String projectId, String operator) { String apiDebugDir = DefaultRepositoryDir.getApiDebugDir(projectId, sourceId); ApiFileResourceUpdateRequest resourceUpdateRequest = new ApiFileResourceUpdateRequest(); diff --git a/backend/services/api-test/src/main/resources/apiGeneratorConfig.xml b/backend/services/api-test/src/main/resources/apiGeneratorConfig.xml index 52ce0ae23e..799b319c68 100644 --- a/backend/services/api-test/src/main/resources/apiGeneratorConfig.xml +++ b/backend/services/api-test/src/main/resources/apiGeneratorConfig.xml @@ -79,7 +79,6 @@
-
diff --git a/backend/services/api-test/src/test/resources/dml/init_api_definition.sql b/backend/services/api-test/src/test/resources/dml/init_api_definition.sql index 96f0c0d9bb..8c6f39114b 100644 --- a/backend/services/api-test/src/test/resources/dml/init_api_definition.sql +++ b/backend/services/api-test/src/test/resources/dml/init_api_definition.sql @@ -22,16 +22,6 @@ INSERT INTO `api_test_case` (`id`, `name`, `priority`, `num`, `tags`, `status`, INSERT INTO `api_test_case` (`id`, `name`, `priority`, `num`, `tags`, `status`, `last_report_status`, `last_report_id`, `pos`, `project_id`, `api_definition_id`, `version_id`, `environment_id`, `create_time`, `create_user`, `update_time`, `update_user`, `delete_time`, `delete_user`, `deleted`) VALUES ('3ee2ae9c-a680-4ed6-b115-1f6ab8980104', '查询Linux主机5', 'P0', 100002008, NULL, 'PENDING', NULL, '10008', 10000, '100001100001', '1005', '100570499574136985', 'admin', 1699500298164, 'admin', 1699500298164, 'admin', NULL, NULL, b'0'); INSERT INTO `api_test_case` (`id`, `name`, `priority`, `num`, `tags`, `status`, `last_report_status`, `last_report_id`, `pos`, `project_id`, `api_definition_id`, `version_id`, `environment_id`, `create_time`, `create_user`, `update_time`, `update_user`, `delete_time`, `delete_user`, `deleted`) VALUES ('3ee2ae9c-a680-4ed6-b115-1f6ab8980545', '查询Linux主机6', 'P0', 100002009, NULL, 'PENDING', NULL, NULL, 10000, '100001100001', '1005', '100570499574136985', 'admin', 1699500298164, 'admin', 1699500298164, 'admin', NULL, NULL, b'0'); -DELETE FROM `api_report` WHERE `id` in ('10001','10002','10003','10004','10005','10006','10007','10008'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10001', '报告001', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'SUCCESS', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10002', '报告002', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'ERROR', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10003', '报告003', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'FAKE_ERROR', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10004', '报告004', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'SUCCESS', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10005', '报告005', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'ERROR', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10006', '报告006', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'SUCCESS', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10007', '报告004', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'SUCCESS', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); -INSERT INTO `api_report` (`id`, `name`, `resource_id`, `create_time`, `update_time`, `create_user`, `update_user`, `deleted`, `status`, `run_mode`, `pool_id`, `trigger_mode`, `version_id`, `project_id`, `integrated`) VALUES ('10008', '报告005', 'resource_id_10001', 1680624405386, 1680624405386, 'admin', 'admin', b'0', 'ERROR', 'API', 'pol_id_100001', 'hand', NULL, '100001100001', b'0'); - DELETE FROM `api_definition_module` WHERE `id` in ('10001', 'case-moduleId'); INSERT INTO `api_definition_module` (`id`, `name`, `parent_id`, `project_id`, `pos`, `create_time`, `update_time`, `update_user`, `create_user`) VALUES ('10001', 'module1', 'NONE', '100001100001', 10, 0, 0, 'admin', 'admin'); INSERT INTO `api_definition_module` (`id`, `name`, `parent_id`, `project_id`, `pos`, `create_time`, `update_time`, `update_user`, `create_user`) VALUES ('case-moduleId', 'case-moduleId', 'NONE', '100001100001', 10, 0, 0, 'admin', 'admin');