diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java index fe1ef24165..12e7422e7e 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTest.java @@ -51,7 +51,7 @@ public class LoadTest implements Serializable { @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test.create_user.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{load_test.create_user.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{load_test.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; @Schema(title = "自定义排序,间隔5000", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java index 169452046a..6e38b15bb9 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class LoadTestBlob implements Serializable { @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{load_test_blob.test_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{load_test_blob.test_id.length_range}", groups = {Created.class, Updated.class}) - private String testId; + @NotBlank(message = "{load_test_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{load_test_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "压力配置") private byte[] loadConfiguration; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlobExample.java index 6ea39a8383..b8442094ca 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestBlobExample.java @@ -104,73 +104,73 @@ public class LoadTestBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andTestIdIsNull() { - addCriterion("test_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andTestIdIsNotNull() { - addCriterion("test_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andTestIdEqualTo(String value) { - addCriterion("test_id =", value, "testId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andTestIdNotEqualTo(String value) { - addCriterion("test_id <>", value, "testId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andTestIdGreaterThan(String value) { - addCriterion("test_id >", value, "testId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andTestIdGreaterThanOrEqualTo(String value) { - addCriterion("test_id >=", value, "testId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andTestIdLessThan(String value) { - addCriterion("test_id <", value, "testId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andTestIdLessThanOrEqualTo(String value) { - addCriterion("test_id <=", value, "testId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andTestIdLike(String value) { - addCriterion("test_id like", value, "testId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andTestIdNotLike(String value) { - addCriterion("test_id not like", value, "testId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andTestIdIn(List values) { - addCriterion("test_id in", values, "testId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andTestIdNotIn(List values) { - addCriterion("test_id not in", values, "testId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andTestIdBetween(String value1, String value2) { - addCriterion("test_id between", value1, value2, "testId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andTestIdNotBetween(String value1, String value2) { - addCriterion("test_id not between", value1, value2, "testId"); + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } } diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java index 81697f9c56..c11b83bec9 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestFile.java @@ -12,12 +12,12 @@ import lombok.Data; public class LoadTestFile implements Serializable { @Schema(title = "测试ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_file.test_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{load_test_file.test_id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{load_test_file.test_id.length_range}", groups = {Created.class, Updated.class}) private String testId; @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_file.file_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{load_test_file.file_id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{load_test_file.file_id.length_range}", groups = {Created.class, Updated.class}) private String fileId; @Schema(title = "文件排序", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java index f52e875d1f..f92d25e89f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReport.java @@ -22,7 +22,7 @@ public class LoadTestReport implements Serializable { @Schema(title = "报告名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{load_test_report.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{load_test_report.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "报告描述") @@ -41,7 +41,7 @@ public class LoadTestReport implements Serializable { @Schema(title = "创建人(执行人)ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.create_user.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{load_test_report.create_user.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{load_test_report.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; @Schema(title = "触发方式", requiredMode = Schema.RequiredMode.REQUIRED) @@ -65,7 +65,7 @@ public class LoadTestReport implements Serializable { @Schema(title = "测试名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{load_test_report.test_name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{load_test_report.test_name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{load_test_report.test_name.length_range}", groups = {Created.class, Updated.class}) private String testName; @Schema(title = "资源池ID", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java index 7e50b92731..9841c14afc 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class LoadTestReportBlob implements Serializable { @Schema(title = "报告ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{load_test_report_blob.report_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{load_test_report_blob.report_id.length_range}", groups = {Created.class, Updated.class}) - private String reportId; + @NotBlank(message = "{load_test_report_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{load_test_report_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "压力配置") private byte[] loadConfiguration; diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlobExample.java index f1c76047f7..42c8999a12 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/domain/LoadTestReportBlobExample.java @@ -104,73 +104,73 @@ public class LoadTestReportBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andReportIdIsNull() { - addCriterion("report_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andReportIdIsNotNull() { - addCriterion("report_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andReportIdEqualTo(String value) { - addCriterion("report_id =", value, "reportId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andReportIdNotEqualTo(String value) { - addCriterion("report_id <>", value, "reportId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andReportIdGreaterThan(String value) { - addCriterion("report_id >", value, "reportId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andReportIdGreaterThanOrEqualTo(String value) { - addCriterion("report_id >=", value, "reportId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andReportIdLessThan(String value) { - addCriterion("report_id <", value, "reportId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andReportIdLessThanOrEqualTo(String value) { - addCriterion("report_id <=", value, "reportId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andReportIdLike(String value) { - addCriterion("report_id like", value, "reportId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andReportIdNotLike(String value) { - addCriterion("report_id not like", value, "reportId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andReportIdIn(List values) { - addCriterion("report_id in", values, "reportId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andReportIdNotIn(List values) { - addCriterion("report_id not in", values, "reportId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andReportIdBetween(String value1, String value2) { - addCriterion("report_id between", value1, value2, "reportId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andReportIdNotBetween(String value1, String value2) { - addCriterion("report_id not between", value1, value2, "reportId"); + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } } diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.java index 3f4057bcf3..d54eb73d8b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.java @@ -10,7 +10,7 @@ public interface LoadTestBlobMapper { int deleteByExample(LoadTestBlobExample example); - int deleteByPrimaryKey(String testId); + int deleteByPrimaryKey(String id); int insert(LoadTestBlob record); @@ -20,7 +20,7 @@ public interface LoadTestBlobMapper { List selectByExample(LoadTestBlobExample example); - LoadTestBlob selectByPrimaryKey(String testId); + LoadTestBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") LoadTestBlob record, @Param("example") LoadTestBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.xml index 52484bb66f..b3daccfcfe 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -68,7 +68,7 @@ - test_id + id load_configuration, advanced_configuration, env_info @@ -109,11 +109,11 @@ , from load_test_blob - where test_id = #{testId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from load_test_blob - where test_id = #{testId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from load_test_blob @@ -122,18 +122,16 @@ - insert into load_test_blob (test_id, load_configuration, - advanced_configuration, env_info - ) - values (#{testId,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARBINARY}, - #{advancedConfiguration,jdbcType=LONGVARBINARY}, #{envInfo,jdbcType=LONGVARBINARY} - ) + insert into load_test_blob (id, load_configuration, advanced_configuration, + env_info) + values (#{id,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARBINARY}, #{advancedConfiguration,jdbcType=LONGVARBINARY}, + #{envInfo,jdbcType=LONGVARBINARY}) insert into load_test_blob - - test_id, + + id, load_configuration, @@ -146,8 +144,8 @@ - - #{testId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARBINARY}, @@ -169,8 +167,8 @@ update load_test_blob - - test_id = #{record.testId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, load_configuration = #{record.loadConfiguration,jdbcType=LONGVARBINARY}, @@ -188,7 +186,7 @@ update load_test_blob - set test_id = #{record.testId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, load_configuration = #{record.loadConfiguration,jdbcType=LONGVARBINARY}, advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARBINARY}, env_info = #{record.envInfo,jdbcType=LONGVARBINARY} @@ -198,7 +196,7 @@ update load_test_blob - set test_id = #{record.testId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -216,13 +214,13 @@ env_info = #{envInfo,jdbcType=LONGVARBINARY}, - where test_id = #{testId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update load_test_blob set load_configuration = #{loadConfiguration,jdbcType=LONGVARBINARY}, advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARBINARY}, env_info = #{envInfo,jdbcType=LONGVARBINARY} - where test_id = #{testId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.java index 3f3d13d580..f0ac0fac9a 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.java @@ -10,7 +10,7 @@ public interface LoadTestReportBlobMapper { int deleteByExample(LoadTestReportBlobExample example); - int deleteByPrimaryKey(String reportId); + int deleteByPrimaryKey(String id); int insert(LoadTestReportBlob record); @@ -20,7 +20,7 @@ public interface LoadTestReportBlobMapper { List selectByExample(LoadTestReportBlobExample example); - LoadTestReportBlob selectByPrimaryKey(String reportId); + LoadTestReportBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") LoadTestReportBlob record, @Param("example") LoadTestReportBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.xml index bed91759f7..e1ffa5722c 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/load/mapper/LoadTestReportBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -69,7 +69,7 @@ - report_id + id load_configuration, jmx_content, advanced_configuration, env_info @@ -110,11 +110,11 @@ , from load_test_report_blob - where report_id = #{reportId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from load_test_report_blob - where report_id = #{reportId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from load_test_report_blob @@ -123,18 +123,18 @@ - insert into load_test_report_blob (report_id, load_configuration, - jmx_content, advanced_configuration, - env_info) - values (#{reportId,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARBINARY}, - #{jmxContent,jdbcType=LONGVARBINARY}, #{advancedConfiguration,jdbcType=LONGVARBINARY}, - #{envInfo,jdbcType=LONGVARBINARY}) + insert into load_test_report_blob (id, load_configuration, jmx_content, + advanced_configuration, env_info + ) + values (#{id,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARBINARY}, #{jmxContent,jdbcType=LONGVARBINARY}, + #{advancedConfiguration,jdbcType=LONGVARBINARY}, #{envInfo,jdbcType=LONGVARBINARY} + ) insert into load_test_report_blob - - report_id, + + id, load_configuration, @@ -150,8 +150,8 @@ - - #{reportId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{loadConfiguration,jdbcType=LONGVARBINARY}, @@ -176,8 +176,8 @@ update load_test_report_blob - - report_id = #{record.reportId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, load_configuration = #{record.loadConfiguration,jdbcType=LONGVARBINARY}, @@ -198,7 +198,7 @@ update load_test_report_blob - set report_id = #{record.reportId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, load_configuration = #{record.loadConfiguration,jdbcType=LONGVARBINARY}, jmx_content = #{record.jmxContent,jdbcType=LONGVARBINARY}, advanced_configuration = #{record.advancedConfiguration,jdbcType=LONGVARBINARY}, @@ -209,7 +209,7 @@ update load_test_report_blob - set report_id = #{record.reportId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -230,7 +230,7 @@ env_info = #{envInfo,jdbcType=LONGVARBINARY}, - where report_id = #{reportId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update load_test_report_blob @@ -238,6 +238,6 @@ jmx_content = #{jmxContent,jdbcType=LONGVARBINARY}, advanced_configuration = #{advancedConfiguration,jdbcType=LONGVARBINARY}, env_info = #{envInfo,jdbcType=LONGVARBINARY} - where report_id = #{reportId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/resources/generatorConfig.xml b/backend/framework/domain/src/main/resources/generatorConfig.xml index 3098d0a52d..ddf6cecb49 100644 --- a/backend/framework/domain/src/main/resources/generatorConfig.xml +++ b/backend/framework/domain/src/main/resources/generatorConfig.xml @@ -53,40 +53,33 @@ - + - + - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+