From 7109e6ddc8420e374eb37b06798adb6d05b52122 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Fri, 26 May 2023 16:16:09 +0800 Subject: [PATCH] build: project domain --- .../project/domain/ApiTemplate.java | 2 +- .../project/domain/CustomField.java | 4 +- .../project/domain/CustomFunctionBlob.java | 6 +- .../domain/CustomFunctionBlobExample.java | 56 +++++++++---------- .../project/domain/FakeErrorBlob.java | 6 +- .../project/domain/FakeErrorBlobExample.java | 56 +++++++++---------- .../project/domain/FileMetadata.java | 22 ++++++-- .../project/domain/FileMetadataBlob.java | 6 +- .../domain/FileMetadataBlobExample.java | 56 +++++++++---------- .../project/domain/FileModuleBlob.java | 6 +- .../project/domain/FileModuleBlobExample.java | 56 +++++++++---------- .../domain/FunctionalCaseTemplate.java | 2 +- .../domain/FunctionalCaseTemplateExtend.java | 6 +- .../FunctionalCaseTemplateExtendExample.java | 56 +++++++++---------- .../project/domain/IssueTemplate.java | 2 +- .../project/domain/IssueTemplateExtend.java | 6 +- .../domain/IssueTemplateExtendExample.java | 56 +++++++++---------- .../metersphere/project/domain/Project.java | 2 +- .../project/domain/ProjectExtend.java | 6 +- .../project/domain/ProjectExtendExample.java | 56 +++++++++---------- .../project/domain/ProjectVersion.java | 4 +- .../mapper/CustomFunctionBlobMapper.java | 4 +- .../mapper/CustomFunctionBlobMapper.xml | 32 +++++------ .../project/mapper/FakeErrorBlobMapper.java | 4 +- .../project/mapper/FakeErrorBlobMapper.xml | 32 +++++------ .../mapper/FileMetadataBlobMapper.java | 4 +- .../project/mapper/FileMetadataBlobMapper.xml | 32 +++++------ .../project/mapper/FileModuleBlobMapper.java | 4 +- .../project/mapper/FileModuleBlobMapper.xml | 34 +++++------ .../FunctionalCaseTemplateExtendMapper.java | 4 +- .../FunctionalCaseTemplateExtendMapper.xml | 34 +++++------ .../mapper/IssueTemplateExtendMapper.java | 4 +- .../mapper/IssueTemplateExtendMapper.xml | 34 +++++------ .../project/mapper/ProjectExtendMapper.java | 4 +- .../project/mapper/ProjectExtendMapper.xml | 34 +++++------ .../src/main/resources/generatorConfig.xml | 48 ++++++++-------- 36 files changed, 393 insertions(+), 387 deletions(-) diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java index c83bd630eb..7484240834 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ApiTemplate.java @@ -17,7 +17,7 @@ public class ApiTemplate implements Serializable { @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{api_template.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{api_template.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{api_template.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "描述") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java index 202ca59ef4..9445d38607 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomField.java @@ -12,12 +12,12 @@ import lombok.Data; public class CustomField implements Serializable { @Schema(title = "自定义字段ID", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.id.not_blank}", groups = {Created.class, Updated.class}) - @Size(min = 1, max = 100, message = "{custom_field.id.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{custom_field.id.length_range}", groups = {Created.class, Updated.class}) private String id; @Schema(title = "自定义字段名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{custom_field.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{custom_field.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{custom_field.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "使用场景", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java index 1591f0fcb1..a9589e6064 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class CustomFunctionBlob implements Serializable { @Schema(title = "", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{custom_function_blob.function_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{custom_function_blob.function_id.length_range}", groups = {Created.class, Updated.class}) - private String functionId; + @NotBlank(message = "{custom_function_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{custom_function_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "参数列表") private byte[] params; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlobExample.java index c2466b8216..641c42436f 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/CustomFunctionBlobExample.java @@ -104,73 +104,73 @@ public class CustomFunctionBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andFunctionIdIsNull() { - addCriterion("function_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andFunctionIdIsNotNull() { - addCriterion("function_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andFunctionIdEqualTo(String value) { - addCriterion("function_id =", value, "functionId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdNotEqualTo(String value) { - addCriterion("function_id <>", value, "functionId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdGreaterThan(String value) { - addCriterion("function_id >", value, "functionId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdGreaterThanOrEqualTo(String value) { - addCriterion("function_id >=", value, "functionId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdLessThan(String value) { - addCriterion("function_id <", value, "functionId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdLessThanOrEqualTo(String value) { - addCriterion("function_id <=", value, "functionId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdLike(String value) { - addCriterion("function_id like", value, "functionId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdNotLike(String value) { - addCriterion("function_id not like", value, "functionId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andFunctionIdIn(List values) { - addCriterion("function_id in", values, "functionId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andFunctionIdNotIn(List values) { - addCriterion("function_id not in", values, "functionId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andFunctionIdBetween(String value1, String value2) { - addCriterion("function_id between", value1, value2, "functionId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andFunctionIdNotBetween(String value1, String value2) { - addCriterion("function_id not between", value1, value2, "functionId"); + 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/project/domain/FakeErrorBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java index 0448a96a9e..d31711db26 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class FakeErrorBlob implements Serializable { @Schema(title = "Test ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{fake_error_blob.fake_error_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{fake_error_blob.fake_error_id.length_range}", groups = {Created.class, Updated.class}) - private String fakeErrorId; + @NotBlank(message = "{fake_error_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{fake_error_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "内容") private byte[] content; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java index c10689ac49..52786985a8 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FakeErrorBlobExample.java @@ -104,73 +104,73 @@ public class FakeErrorBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andFakeErrorIdIsNull() { - addCriterion("fake_error_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andFakeErrorIdIsNotNull() { - addCriterion("fake_error_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andFakeErrorIdEqualTo(String value) { - addCriterion("fake_error_id =", value, "fakeErrorId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdNotEqualTo(String value) { - addCriterion("fake_error_id <>", value, "fakeErrorId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdGreaterThan(String value) { - addCriterion("fake_error_id >", value, "fakeErrorId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdGreaterThanOrEqualTo(String value) { - addCriterion("fake_error_id >=", value, "fakeErrorId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdLessThan(String value) { - addCriterion("fake_error_id <", value, "fakeErrorId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdLessThanOrEqualTo(String value) { - addCriterion("fake_error_id <=", value, "fakeErrorId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdLike(String value) { - addCriterion("fake_error_id like", value, "fakeErrorId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdNotLike(String value) { - addCriterion("fake_error_id not like", value, "fakeErrorId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdIn(List values) { - addCriterion("fake_error_id in", values, "fakeErrorId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdNotIn(List values) { - addCriterion("fake_error_id not in", values, "fakeErrorId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdBetween(String value1, String value2) { - addCriterion("fake_error_id between", value1, value2, "fakeErrorId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andFakeErrorIdNotBetween(String value1, String value2) { - addCriterion("fake_error_id not between", value1, value2, "fakeErrorId"); + 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/project/domain/FileMetadata.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java index 68986ebf7e..2f330c09b3 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadata.java @@ -17,7 +17,7 @@ public class FileMetadata implements Serializable { @Schema(title = "文件名", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{file_metadata.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 250, message = "{file_metadata.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{file_metadata.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "文件类型") @@ -34,7 +34,9 @@ public class FileMetadata implements Serializable { @Schema(title = "更新时间") private Long updateTime; - @Schema(title = "项目ID") + @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{file_metadata.project_id.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{file_metadata.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; @Schema(title = "文件存储方式", requiredMode = Schema.RequiredMode.REQUIRED) @@ -42,10 +44,14 @@ public class FileMetadata implements Serializable { @Size(min = 1, max = 50, message = "{file_metadata.storage.length_range}", groups = {Created.class, Updated.class}) private String storage; - @Schema(title = "创建人") + @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{file_metadata.create_user.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{file_metadata.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; - @Schema(title = "修改人") + @Schema(title = "修改人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{file_metadata.update_user.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{file_metadata.update_user.length_range}", groups = {Created.class, Updated.class}) private String updateUser; @Schema(title = "标签") @@ -66,10 +72,14 @@ public class FileMetadata implements Serializable { @Schema(title = "资源作用范围，主要兼容2.1版本前的历史数据，后续版本不再产生数据") private String resourceType; - @Schema(title = "是否是最新版") + @Schema(title = "是否是最新版", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{file_metadata.latest.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 1, message = "{file_metadata.latest.length_range}", groups = {Created.class, Updated.class}) private Boolean latest; - @Schema(title = "同版本数据关联的ID") + @Schema(title = "同版本数据关联的ID", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "{file_metadata.ref_id.not_blank}", groups = {Updated.class}) + @Size(min = 1, max = 50, message = "{file_metadata.ref_id.length_range}", groups = {Created.class, Updated.class}) private String refId; private static final long serialVersionUID = 1L; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java index 25eab7be91..20a6b7ad02 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class FileMetadataBlob implements Serializable { @Schema(title = "文件ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{file_metadata_blob.file_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 255, message = "{file_metadata_blob.file_id.length_range}", groups = {Created.class, Updated.class}) - private String fileId; + @NotBlank(message = "{file_metadata_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{file_metadata_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "储存库") private byte[] gitInfo; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlobExample.java index 4864ab3371..772d316fef 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileMetadataBlobExample.java @@ -104,73 +104,73 @@ public class FileMetadataBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andFileIdIsNull() { - addCriterion("file_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andFileIdIsNotNull() { - addCriterion("file_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andFileIdEqualTo(String value) { - addCriterion("file_id =", value, "fileId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andFileIdNotEqualTo(String value) { - addCriterion("file_id <>", value, "fileId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andFileIdGreaterThan(String value) { - addCriterion("file_id >", value, "fileId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andFileIdGreaterThanOrEqualTo(String value) { - addCriterion("file_id >=", value, "fileId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andFileIdLessThan(String value) { - addCriterion("file_id <", value, "fileId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andFileIdLessThanOrEqualTo(String value) { - addCriterion("file_id <=", value, "fileId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andFileIdLike(String value) { - addCriterion("file_id like", value, "fileId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andFileIdNotLike(String value) { - addCriterion("file_id not like", value, "fileId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andFileIdIn(List values) { - addCriterion("file_id in", values, "fileId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andFileIdNotIn(List values) { - addCriterion("file_id not in", values, "fileId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andFileIdBetween(String value1, String value2) { - addCriterion("file_id between", value1, value2, "fileId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andFileIdNotBetween(String value1, String value2) { - addCriterion("file_id not between", value1, value2, "fileId"); + 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/project/domain/FileModuleBlob.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java index a7edebc25f..3c4607b1df 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlob.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class FileModuleBlob implements Serializable { @Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{file_module_blob.file_module_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{file_module_blob.file_module_id.length_range}", groups = {Created.class, Updated.class}) - private String fileModuleId; + @NotBlank(message = "{file_module_blob.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{file_module_blob.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "存储库路径") private String repositoryPath; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlobExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlobExample.java index 17062f61ee..f557448f33 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlobExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FileModuleBlobExample.java @@ -104,73 +104,73 @@ public class FileModuleBlobExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andFileModuleIdIsNull() { - addCriterion("file_module_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andFileModuleIdIsNotNull() { - addCriterion("file_module_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andFileModuleIdEqualTo(String value) { - addCriterion("file_module_id =", value, "fileModuleId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdNotEqualTo(String value) { - addCriterion("file_module_id <>", value, "fileModuleId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdGreaterThan(String value) { - addCriterion("file_module_id >", value, "fileModuleId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdGreaterThanOrEqualTo(String value) { - addCriterion("file_module_id >=", value, "fileModuleId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdLessThan(String value) { - addCriterion("file_module_id <", value, "fileModuleId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdLessThanOrEqualTo(String value) { - addCriterion("file_module_id <=", value, "fileModuleId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdLike(String value) { - addCriterion("file_module_id like", value, "fileModuleId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdNotLike(String value) { - addCriterion("file_module_id not like", value, "fileModuleId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andFileModuleIdIn(List values) { - addCriterion("file_module_id in", values, "fileModuleId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andFileModuleIdNotIn(List values) { - addCriterion("file_module_id not in", values, "fileModuleId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andFileModuleIdBetween(String value1, String value2) { - addCriterion("file_module_id between", value1, value2, "fileModuleId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andFileModuleIdNotBetween(String value1, String value2) { - addCriterion("file_module_id not between", value1, value2, "fileModuleId"); + 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/project/domain/FunctionalCaseTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java index 12f21db9f0..bc27602959 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplate.java @@ -17,7 +17,7 @@ public class FunctionalCaseTemplate implements Serializable { @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{functional_case_template.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{functional_case_template.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{functional_case_template.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "描述") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java index ee02c727a9..aa6f3598b0 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtend.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class FunctionalCaseTemplateExtend implements Serializable { @Schema(title = "模板ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{functional_case_template_extend.template_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{functional_case_template_extend.template_id.length_range}", groups = {Created.class, Updated.class}) - private String templateId; + @NotBlank(message = "{functional_case_template_extend.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{functional_case_template_extend.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "用例名称模板") private String caseName; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtendExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtendExample.java index afcc746dad..27fcfdcc61 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtendExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/FunctionalCaseTemplateExtendExample.java @@ -104,73 +104,73 @@ public class FunctionalCaseTemplateExtendExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andTemplateIdIsNull() { - addCriterion("template_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andTemplateIdIsNotNull() { - addCriterion("template_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andTemplateIdEqualTo(String value) { - addCriterion("template_id =", value, "templateId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotEqualTo(String value) { - addCriterion("template_id <>", value, "templateId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdGreaterThan(String value) { - addCriterion("template_id >", value, "templateId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdGreaterThanOrEqualTo(String value) { - addCriterion("template_id >=", value, "templateId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdLessThan(String value) { - addCriterion("template_id <", value, "templateId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdLessThanOrEqualTo(String value) { - addCriterion("template_id <=", value, "templateId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdLike(String value) { - addCriterion("template_id like", value, "templateId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotLike(String value) { - addCriterion("template_id not like", value, "templateId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdIn(List values) { - addCriterion("template_id in", values, "templateId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotIn(List values) { - addCriterion("template_id not in", values, "templateId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andTemplateIdBetween(String value1, String value2) { - addCriterion("template_id between", value1, value2, "templateId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotBetween(String value1, String value2) { - addCriterion("template_id not between", value1, value2, "templateId"); + 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/project/domain/IssueTemplate.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java index 84ab703146..13a0a4324b 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplate.java @@ -17,7 +17,7 @@ public class IssueTemplate implements Serializable { @Schema(title = "名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{issue_template.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{issue_template.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{issue_template.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "描述") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java index 9f8f538ad0..d6bdec47ef 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtend.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class IssueTemplateExtend implements Serializable { @Schema(title = "缺陷模板ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{issue_template_extend.template_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{issue_template_extend.template_id.length_range}", groups = {Created.class, Updated.class}) - private String templateId; + @NotBlank(message = "{issue_template_extend.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{issue_template_extend.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "缺陷标题模板") private String title; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtendExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtendExample.java index 202934635e..1681fecaea 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtendExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/IssueTemplateExtendExample.java @@ -104,73 +104,73 @@ public class IssueTemplateExtendExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andTemplateIdIsNull() { - addCriterion("template_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andTemplateIdIsNotNull() { - addCriterion("template_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andTemplateIdEqualTo(String value) { - addCriterion("template_id =", value, "templateId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotEqualTo(String value) { - addCriterion("template_id <>", value, "templateId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdGreaterThan(String value) { - addCriterion("template_id >", value, "templateId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdGreaterThanOrEqualTo(String value) { - addCriterion("template_id >=", value, "templateId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdLessThan(String value) { - addCriterion("template_id <", value, "templateId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdLessThanOrEqualTo(String value) { - addCriterion("template_id <=", value, "templateId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdLike(String value) { - addCriterion("template_id like", value, "templateId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotLike(String value) { - addCriterion("template_id not like", value, "templateId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andTemplateIdIn(List values) { - addCriterion("template_id in", values, "templateId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotIn(List values) { - addCriterion("template_id not in", values, "templateId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andTemplateIdBetween(String value1, String value2) { - addCriterion("template_id between", value1, value2, "templateId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andTemplateIdNotBetween(String value1, String value2) { - addCriterion("template_id not between", value1, value2, "templateId"); + 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/project/domain/Project.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java index bde9e370fb..23f740a900 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/Project.java @@ -22,7 +22,7 @@ public class Project implements Serializable { @Schema(title = "项目名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 64, message = "{project.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{project.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "项目描述") diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java index 4041a9157d..68b9c553f9 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtend.java @@ -11,9 +11,9 @@ import lombok.Data; @Data public class ProjectExtend implements Serializable { @Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{project_extend.project_id.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 50, message = "{project_extend.project_id.length_range}", groups = {Created.class, Updated.class}) - private String projectId; + @NotBlank(message = "{project_extend.id.not_blank}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{project_extend.id.length_range}", groups = {Created.class, Updated.class}) + private String id; @Schema(title = "") private String tapdId; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtendExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtendExample.java index 34d5bce1a4..a49a8e0c81 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtendExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectExtendExample.java @@ -104,73 +104,73 @@ public class ProjectExtendExample { criteria.add(new Criterion(condition, value1, value2)); } - public Criteria andProjectIdIsNull() { - addCriterion("project_id is null"); + public Criteria andIdIsNull() { + addCriterion("id is null"); return (Criteria) this; } - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); return (Criteria) this; } - public Criteria andProjectIdEqualTo(String value) { - addCriterion("project_id =", value, "projectId"); + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andProjectIdNotEqualTo(String value) { - addCriterion("project_id <>", value, "projectId"); + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andProjectIdGreaterThan(String value) { - addCriterion("project_id >", value, "projectId"); + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andProjectIdGreaterThanOrEqualTo(String value) { - addCriterion("project_id >=", value, "projectId"); + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andProjectIdLessThan(String value) { - addCriterion("project_id <", value, "projectId"); + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andProjectIdLessThanOrEqualTo(String value) { - addCriterion("project_id <=", value, "projectId"); + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andProjectIdLike(String value) { - addCriterion("project_id like", value, "projectId"); + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); return (Criteria) this; } - public Criteria andProjectIdNotLike(String value) { - addCriterion("project_id not like", value, "projectId"); + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); return (Criteria) this; } - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andProjectIdBetween(String value1, String value2) { - addCriterion("project_id between", value1, value2, "projectId"); + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andProjectIdNotBetween(String value1, String value2) { - addCriterion("project_id not between", value1, value2, "projectId"); + 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/project/domain/ProjectVersion.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java index 50300e041e..20fad678ed 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectVersion.java @@ -22,7 +22,7 @@ public class ProjectVersion implements Serializable { @Schema(title = "版本名称", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.name.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{project_version.name.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 255, message = "{project_version.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(title = "描述") @@ -50,7 +50,7 @@ public class ProjectVersion implements Serializable { @Schema(title = "创建人", requiredMode = Schema.RequiredMode.REQUIRED) @NotBlank(message = "{project_version.create_user.not_blank}", groups = {Updated.class}) - @Size(min = 1, max = 100, message = "{project_version.create_user.length_range}", groups = {Created.class, Updated.class}) + @Size(min = 1, max = 50, message = "{project_version.create_user.length_range}", groups = {Created.class, Updated.class}) private String createUser; private static final long serialVersionUID = 1L; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.java index 9424a1a1ef..f276b30937 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.java @@ -10,7 +10,7 @@ public interface CustomFunctionBlobMapper { int deleteByExample(CustomFunctionBlobExample example); - int deleteByPrimaryKey(String functionId); + int deleteByPrimaryKey(String id); int insert(CustomFunctionBlob record); @@ -20,7 +20,7 @@ public interface CustomFunctionBlobMapper { List selectByExample(CustomFunctionBlobExample example); - CustomFunctionBlob selectByPrimaryKey(String functionId); + CustomFunctionBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") CustomFunctionBlob record, @Param("example") CustomFunctionBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.xml index 32b281f1d7..9b95a65a01 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/CustomFunctionBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -68,7 +68,7 @@ - function_id + id params, script, `result` @@ -109,11 +109,11 @@ , from custom_function_blob - where function_id = #{functionId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from custom_function_blob - where function_id = #{functionId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from custom_function_blob @@ -122,16 +122,16 @@ - insert into custom_function_blob (function_id, params, script, + insert into custom_function_blob (id, params, script, `result`) - values (#{functionId,jdbcType=VARCHAR}, #{params,jdbcType=LONGVARBINARY}, #{script,jdbcType=LONGVARBINARY}, + values (#{id,jdbcType=VARCHAR}, #{params,jdbcType=LONGVARBINARY}, #{script,jdbcType=LONGVARBINARY}, #{result,jdbcType=LONGVARBINARY}) insert into custom_function_blob - - function_id, + + id, params, @@ -144,8 +144,8 @@ - - #{functionId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{params,jdbcType=LONGVARBINARY}, @@ -167,8 +167,8 @@ update custom_function_blob - - function_id = #{record.functionId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, params = #{record.params,jdbcType=LONGVARBINARY}, @@ -186,7 +186,7 @@ update custom_function_blob - set function_id = #{record.functionId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, params = #{record.params,jdbcType=LONGVARBINARY}, script = #{record.script,jdbcType=LONGVARBINARY}, `result` = #{record.result,jdbcType=LONGVARBINARY} @@ -196,7 +196,7 @@ update custom_function_blob - set function_id = #{record.functionId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -214,13 +214,13 @@ `result` = #{result,jdbcType=LONGVARBINARY}, - where function_id = #{functionId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update custom_function_blob set params = #{params,jdbcType=LONGVARBINARY}, script = #{script,jdbcType=LONGVARBINARY}, `result` = #{result,jdbcType=LONGVARBINARY} - where function_id = #{functionId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java index 97181784eb..e8ad5aa8d2 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.java @@ -10,7 +10,7 @@ public interface FakeErrorBlobMapper { int deleteByExample(FakeErrorBlobExample example); - int deleteByPrimaryKey(String fakeErrorId); + int deleteByPrimaryKey(String id); int insert(FakeErrorBlob record); @@ -20,7 +20,7 @@ public interface FakeErrorBlobMapper { List selectByExample(FakeErrorBlobExample example); - FakeErrorBlob selectByPrimaryKey(String fakeErrorId); + FakeErrorBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") FakeErrorBlob record, @Param("example") FakeErrorBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml index 5c2fa4f75d..b1974915f5 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FakeErrorBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -67,7 +67,7 @@ - fake_error_id + id content, description @@ -108,11 +108,11 @@ , from fake_error_blob - where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from fake_error_blob - where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from fake_error_blob @@ -121,16 +121,16 @@ - insert into fake_error_blob (fake_error_id, content, description + insert into fake_error_blob (id, content, description ) - values (#{fakeErrorId,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, #{description,jdbcType=LONGVARBINARY} + values (#{id,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, #{description,jdbcType=LONGVARBINARY} ) insert into fake_error_blob - - fake_error_id, + + id, content, @@ -140,8 +140,8 @@ - - #{fakeErrorId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARBINARY}, @@ -160,8 +160,8 @@ update fake_error_blob - - fake_error_id = #{record.fakeErrorId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, content = #{record.content,jdbcType=LONGVARBINARY}, @@ -176,7 +176,7 @@ update fake_error_blob - set fake_error_id = #{record.fakeErrorId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, content = #{record.content,jdbcType=LONGVARBINARY}, description = #{record.description,jdbcType=LONGVARBINARY} @@ -185,7 +185,7 @@ update fake_error_blob - set fake_error_id = #{record.fakeErrorId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -200,12 +200,12 @@ description = #{description,jdbcType=LONGVARBINARY}, - where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update fake_error_blob set content = #{content,jdbcType=LONGVARBINARY}, description = #{description,jdbcType=LONGVARBINARY} - where fake_error_id = #{fakeErrorId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.java index ce83c930a8..d8506e20d9 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.java @@ -10,7 +10,7 @@ public interface FileMetadataBlobMapper { int deleteByExample(FileMetadataBlobExample example); - int deleteByPrimaryKey(String fileId); + int deleteByPrimaryKey(String id); int insert(FileMetadataBlob record); @@ -20,7 +20,7 @@ public interface FileMetadataBlobMapper { List selectByExample(FileMetadataBlobExample example); - FileMetadataBlob selectByPrimaryKey(String fileId); + FileMetadataBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") FileMetadataBlob record, @Param("example") FileMetadataBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.xml index 6768253255..db3f2277b7 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileMetadataBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -66,7 +66,7 @@ - file_id + id git_info @@ -107,11 +107,11 @@ , from file_metadata_blob - where file_id = #{fileId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from file_metadata_blob - where file_id = #{fileId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from file_metadata_blob @@ -120,22 +120,22 @@ - insert into file_metadata_blob (file_id, git_info) - values (#{fileId,jdbcType=VARCHAR}, #{gitInfo,jdbcType=LONGVARBINARY}) + insert into file_metadata_blob (id, git_info) + values (#{id,jdbcType=VARCHAR}, #{gitInfo,jdbcType=LONGVARBINARY}) insert into file_metadata_blob - - file_id, + + id, git_info, - - #{fileId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{gitInfo,jdbcType=LONGVARBINARY}, @@ -151,8 +151,8 @@ update file_metadata_blob - - file_id = #{record.fileId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, git_info = #{record.gitInfo,jdbcType=LONGVARBINARY}, @@ -164,7 +164,7 @@ update file_metadata_blob - set file_id = #{record.fileId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, git_info = #{record.gitInfo,jdbcType=LONGVARBINARY} @@ -172,7 +172,7 @@ update file_metadata_blob - set file_id = #{record.fileId,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=VARCHAR} @@ -184,11 +184,11 @@ git_info = #{gitInfo,jdbcType=LONGVARBINARY}, - where file_id = #{fileId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update file_metadata_blob set git_info = #{gitInfo,jdbcType=LONGVARBINARY} - where file_id = #{fileId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.java index 9e9a45a7c1..95cb3fceb1 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.java @@ -10,7 +10,7 @@ public interface FileModuleBlobMapper { int deleteByExample(FileModuleBlobExample example); - int deleteByPrimaryKey(String fileModuleId); + int deleteByPrimaryKey(String id); int insert(FileModuleBlob record); @@ -20,7 +20,7 @@ public interface FileModuleBlobMapper { List selectByExample(FileModuleBlobExample example); - FileModuleBlob selectByPrimaryKey(String fileModuleId); + FileModuleBlob selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") FileModuleBlob record, @Param("example") FileModuleBlobExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.xml index 3a2388980d..3f1df20250 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FileModuleBlobMapper.xml @@ -2,7 +2,7 @@ - + @@ -69,7 +69,7 @@ - file_module_id, repository_path, repository_user_name, repository_token + id, repository_path, repository_user_name, repository_token repository_desc @@ -110,11 +110,11 @@ , from file_module_blob - where file_module_id = #{fileModuleId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from file_module_blob - where file_module_id = #{fileModuleId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from file_module_blob @@ -123,16 +123,16 @@ - insert into file_module_blob (file_module_id, repository_path, repository_user_name, + insert into file_module_blob (id, repository_path, repository_user_name, repository_token, repository_desc) - values (#{fileModuleId,jdbcType=VARCHAR}, #{repositoryPath,jdbcType=VARCHAR}, #{repositoryUserName,jdbcType=VARCHAR}, + values (#{id,jdbcType=VARCHAR}, #{repositoryPath,jdbcType=VARCHAR}, #{repositoryUserName,jdbcType=VARCHAR}, #{repositoryToken,jdbcType=VARCHAR}, #{repositoryDesc,jdbcType=LONGVARBINARY}) insert into file_module_blob - - file_module_id, + + id, repository_path, @@ -148,8 +148,8 @@ - - #{fileModuleId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{repositoryPath,jdbcType=VARCHAR}, @@ -174,8 +174,8 @@ update file_module_blob - - file_module_id = #{record.fileModuleId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, repository_path = #{record.repositoryPath,jdbcType=VARCHAR}, @@ -196,7 +196,7 @@ update file_module_blob - set file_module_id = #{record.fileModuleId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, repository_path = #{record.repositoryPath,jdbcType=VARCHAR}, repository_user_name = #{record.repositoryUserName,jdbcType=VARCHAR}, repository_token = #{record.repositoryToken,jdbcType=VARCHAR}, @@ -207,7 +207,7 @@ update file_module_blob - set file_module_id = #{record.fileModuleId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, repository_path = #{record.repositoryPath,jdbcType=VARCHAR}, repository_user_name = #{record.repositoryUserName,jdbcType=VARCHAR}, repository_token = #{record.repositoryToken,jdbcType=VARCHAR} @@ -231,7 +231,7 @@ repository_desc = #{repositoryDesc,jdbcType=LONGVARBINARY}, - where file_module_id = #{fileModuleId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update file_module_blob @@ -239,13 +239,13 @@ repository_user_name = #{repositoryUserName,jdbcType=VARCHAR}, repository_token = #{repositoryToken,jdbcType=VARCHAR}, repository_desc = #{repositoryDesc,jdbcType=LONGVARBINARY} - where file_module_id = #{fileModuleId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update file_module_blob set repository_path = #{repositoryPath,jdbcType=VARCHAR}, repository_user_name = #{repositoryUserName,jdbcType=VARCHAR}, repository_token = #{repositoryToken,jdbcType=VARCHAR} - where file_module_id = #{fileModuleId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.java index 3a1e57ad3b..17aa18f41d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.java @@ -10,7 +10,7 @@ public interface FunctionalCaseTemplateExtendMapper { int deleteByExample(FunctionalCaseTemplateExtendExample example); - int deleteByPrimaryKey(String templateId); + int deleteByPrimaryKey(String id); int insert(FunctionalCaseTemplateExtend record); @@ -20,7 +20,7 @@ public interface FunctionalCaseTemplateExtendMapper { List selectByExample(FunctionalCaseTemplateExtendExample example); - FunctionalCaseTemplateExtend selectByPrimaryKey(String templateId); + FunctionalCaseTemplateExtend selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") FunctionalCaseTemplateExtend record, @Param("example") FunctionalCaseTemplateExtendExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.xml index 69760c9704..f0dd3a2c49 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/FunctionalCaseTemplateExtendMapper.xml @@ -2,7 +2,7 @@ - + @@ -72,7 +72,7 @@ - template_id, case_name, step_model + id, case_name, step_model prerequisite, step_description, expected_result, actual_result, steps @@ -113,11 +113,11 @@ , from functional_case_template_extend - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from functional_case_template_extend - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from functional_case_template_extend @@ -126,11 +126,11 @@ - insert into functional_case_template_extend (template_id, case_name, step_model, + insert into functional_case_template_extend (id, case_name, step_model, prerequisite, step_description, expected_result, actual_result, steps ) - values (#{templateId,jdbcType=VARCHAR}, #{caseName,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, + values (#{id,jdbcType=VARCHAR}, #{caseName,jdbcType=VARCHAR}, #{stepModel,jdbcType=VARCHAR}, #{prerequisite,jdbcType=LONGVARCHAR}, #{stepDescription,jdbcType=LONGVARCHAR}, #{expectedResult,jdbcType=LONGVARCHAR}, #{actualResult,jdbcType=LONGVARCHAR}, #{steps,jdbcType=LONGVARCHAR} ) @@ -138,8 +138,8 @@ insert into functional_case_template_extend - - template_id, + + id, case_name, @@ -164,8 +164,8 @@ - - #{templateId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{caseName,jdbcType=VARCHAR}, @@ -199,8 +199,8 @@ update functional_case_template_extend - - template_id = #{record.templateId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, case_name = #{record.caseName,jdbcType=VARCHAR}, @@ -230,7 +230,7 @@ update functional_case_template_extend - set template_id = #{record.templateId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, case_name = #{record.caseName,jdbcType=VARCHAR}, step_model = #{record.stepModel,jdbcType=VARCHAR}, prerequisite = #{record.prerequisite,jdbcType=LONGVARCHAR}, @@ -244,7 +244,7 @@ update functional_case_template_extend - set template_id = #{record.templateId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, case_name = #{record.caseName,jdbcType=VARCHAR}, step_model = #{record.stepModel,jdbcType=VARCHAR} @@ -276,7 +276,7 @@ steps = #{steps,jdbcType=LONGVARCHAR}, - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update functional_case_template_extend @@ -287,12 +287,12 @@ expected_result = #{expectedResult,jdbcType=LONGVARCHAR}, actual_result = #{actualResult,jdbcType=LONGVARCHAR}, steps = #{steps,jdbcType=LONGVARCHAR} - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update functional_case_template_extend set case_name = #{caseName,jdbcType=VARCHAR}, step_model = #{stepModel,jdbcType=VARCHAR} - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.java index 2f2f6ca68b..1ba517c10d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.java @@ -10,7 +10,7 @@ public interface IssueTemplateExtendMapper { int deleteByExample(IssueTemplateExtendExample example); - int deleteByPrimaryKey(String templateId); + int deleteByPrimaryKey(String id); int insert(IssueTemplateExtend record); @@ -20,7 +20,7 @@ public interface IssueTemplateExtendMapper { List selectByExample(IssueTemplateExtendExample example); - IssueTemplateExtend selectByPrimaryKey(String templateId); + IssueTemplateExtend selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") IssueTemplateExtend record, @Param("example") IssueTemplateExtendExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.xml index 5adf2f9649..6cfb259b7d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/IssueTemplateExtendMapper.xml @@ -2,7 +2,7 @@ - + @@ -67,7 +67,7 @@ - template_id, title + id, title content @@ -108,11 +108,11 @@ , from issue_template_extend - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from issue_template_extend - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from issue_template_extend @@ -121,16 +121,16 @@ - insert into issue_template_extend (template_id, title, content + insert into issue_template_extend (id, title, content ) - values (#{templateId,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR} + values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR} ) insert into issue_template_extend - - template_id, + + id, title, @@ -140,8 +140,8 @@ - - #{templateId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, @@ -160,8 +160,8 @@ update issue_template_extend - - template_id = #{record.templateId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, title = #{record.title,jdbcType=VARCHAR}, @@ -176,7 +176,7 @@ update issue_template_extend - set template_id = #{record.templateId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, title = #{record.title,jdbcType=VARCHAR}, content = #{record.content,jdbcType=LONGVARCHAR} @@ -185,7 +185,7 @@ update issue_template_extend - set template_id = #{record.templateId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, title = #{record.title,jdbcType=VARCHAR} @@ -201,17 +201,17 @@ content = #{content,jdbcType=LONGVARCHAR}, - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update issue_template_extend set title = #{title,jdbcType=VARCHAR}, content = #{content,jdbcType=LONGVARCHAR} - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update issue_template_extend set title = #{title,jdbcType=VARCHAR} - where template_id = #{templateId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.java b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.java index 06f0e55143..4921ffeb10 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.java @@ -10,7 +10,7 @@ public interface ProjectExtendMapper { int deleteByExample(ProjectExtendExample example); - int deleteByPrimaryKey(String projectId); + int deleteByPrimaryKey(String id); int insert(ProjectExtend record); @@ -20,7 +20,7 @@ public interface ProjectExtendMapper { List selectByExample(ProjectExtendExample example); - ProjectExtend selectByPrimaryKey(String projectId); + ProjectExtend selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") ProjectExtend record, @Param("example") ProjectExtendExample example); diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.xml index 579786fd4f..d8bca540bf 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectExtendMapper.xml @@ -2,7 +2,7 @@ - + @@ -76,7 +76,7 @@ - project_id, tapd_id, jira_key, zentao_id, azure_devops_id, case_template_id, azure_filter_id, + id, tapd_id, jira_key, zentao_id, azure_devops_id, case_template_id, azure_filter_id, platform, third_part_template, version_enable, api_template_id @@ -118,11 +118,11 @@ , from project_extend - where project_id = #{projectId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from project_extend - where project_id = #{projectId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from project_extend @@ -131,12 +131,12 @@ - insert into project_extend (project_id, tapd_id, jira_key, + insert into project_extend (id, tapd_id, jira_key, zentao_id, azure_devops_id, case_template_id, azure_filter_id, platform, third_part_template, version_enable, api_template_id, issue_config ) - values (#{projectId,jdbcType=VARCHAR}, #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, + values (#{id,jdbcType=VARCHAR}, #{tapdId,jdbcType=VARCHAR}, #{jiraKey,jdbcType=VARCHAR}, #{zentaoId,jdbcType=VARCHAR}, #{azureDevopsId,jdbcType=VARCHAR}, #{caseTemplateId,jdbcType=VARCHAR}, #{azureFilterId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, #{thirdPartTemplate,jdbcType=BIT}, #{versionEnable,jdbcType=BIT}, #{apiTemplateId,jdbcType=VARCHAR}, #{issueConfig,jdbcType=LONGVARBINARY} @@ -145,8 +145,8 @@ insert into project_extend - - project_id, + + id, tapd_id, @@ -183,8 +183,8 @@ - - #{projectId,jdbcType=VARCHAR}, + + #{id,jdbcType=VARCHAR}, #{tapdId,jdbcType=VARCHAR}, @@ -230,8 +230,8 @@ update project_extend - - project_id = #{record.projectId,jdbcType=VARCHAR}, + + id = #{record.id,jdbcType=VARCHAR}, tapd_id = #{record.tapdId,jdbcType=VARCHAR}, @@ -273,7 +273,7 @@ update project_extend - set project_id = #{record.projectId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, tapd_id = #{record.tapdId,jdbcType=VARCHAR}, jira_key = #{record.jiraKey,jdbcType=VARCHAR}, zentao_id = #{record.zentaoId,jdbcType=VARCHAR}, @@ -291,7 +291,7 @@ update project_extend - set project_id = #{record.projectId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, tapd_id = #{record.tapdId,jdbcType=VARCHAR}, jira_key = #{record.jiraKey,jdbcType=VARCHAR}, zentao_id = #{record.zentaoId,jdbcType=VARCHAR}, @@ -343,7 +343,7 @@ issue_config = #{issueConfig,jdbcType=LONGVARBINARY}, - where project_id = #{projectId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update project_extend @@ -358,7 +358,7 @@ version_enable = #{versionEnable,jdbcType=BIT}, api_template_id = #{apiTemplateId,jdbcType=VARCHAR}, issue_config = #{issueConfig,jdbcType=LONGVARBINARY} - where project_id = #{projectId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update project_extend @@ -372,6 +372,6 @@ third_part_template = #{thirdPartTemplate,jdbcType=BIT}, version_enable = #{versionEnable,jdbcType=BIT}, api_template_id = #{apiTemplateId,jdbcType=VARCHAR} - where project_id = #{projectId,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 a216518d6b..3098d0a52d 100644 --- a/backend/framework/domain/src/main/resources/generatorConfig.xml +++ b/backend/framework/domain/src/main/resources/generatorConfig.xml @@ -53,44 +53,40 @@ - + - + - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+