From 5b662b92d42198bc230ca10964be27ac6f1d8db4 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Thu, 24 Aug 2023 13:31:02 +0800 Subject: [PATCH] refactor: update robot column --- .../project/domain/ProjectRobot.java | 21 +- .../project/domain/ProjectRobotExample.java | 190 ------------------ .../project/mapper/ProjectRobotMapper.xml | 69 +------ .../ddl/V3.0.0_4__project_management.sql | 3 - 4 files changed, 9 insertions(+), 274 deletions(-) diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobot.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobot.java index 7dbefd82f8..0d107eeab3 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobot.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobot.java @@ -16,22 +16,22 @@ public class ProjectRobot implements Serializable { private String id; @Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{project_robot.project_id.not_blank}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{project_robot.project_id.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{project_robot.project_id.length_range}", groups = {Created.class, Updated.class}) private String projectId; @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{project_robot.name.not_blank}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{project_robot.name.not_blank}", groups = {Created.class}) @Size(min = 1, max = 255, message = "{project_robot.name.length_range}", groups = {Created.class, Updated.class}) private String name; @Schema(description = "所属平台（飞书，钉钉，企业微信，自定义）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{project_robot.platform.not_blank}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{project_robot.platform.not_blank}", groups = {Created.class}) @Size(min = 1, max = 50, message = "{project_robot.platform.length_range}", groups = {Created.class, Updated.class}) private String platform; @Schema(description = "webhook", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "{project_robot.webhook.not_blank}", groups = {Created.class, Updated.class}) + @NotBlank(message = "{project_robot.webhook.not_blank}", groups = {Created.class}) @Size(min = 1, max = 255, message = "{project_robot.webhook.length_range}", groups = {Created.class, Updated.class}) private String webhook; @@ -59,16 +59,6 @@ public class ProjectRobot implements Serializable { @Schema(description = "更新时间") private Long updateTime; - @Schema(description = "删除人") - private String deleteUser; - - @Schema(description = "删除时间") - private Long deleteTime; - - @Schema(description = "是否删除", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "{project_robot.deleted.not_blank}", groups = {Created.class}) - private Boolean deleted; - @Schema(description = "描述") private String description; @@ -88,9 +78,6 @@ public class ProjectRobot implements Serializable { createTime("create_time", "createTime", "BIGINT", false), updateUser("update_user", "updateUser", "VARCHAR", false), updateTime("update_time", "updateTime", "BIGINT", false), - deleteUser("delete_user", "deleteUser", "VARCHAR", false), - deleteTime("delete_time", "deleteTime", "BIGINT", false), - deleted("deleted", "deleted", "BIT", false), description("description", "description", "VARCHAR", false); private static final String BEGINNING_DELIMITER = "`"; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobotExample.java b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobotExample.java index 37e4cc8430..d66fcc3c34 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobotExample.java +++ b/backend/framework/domain/src/main/java/io/metersphere/project/domain/ProjectRobotExample.java @@ -984,196 +984,6 @@ public class ProjectRobotExample { return (Criteria) this; } - public Criteria andDeleteUserIsNull() { - addCriterion("delete_user is null"); - return (Criteria) this; - } - - public Criteria andDeleteUserIsNotNull() { - addCriterion("delete_user is not null"); - return (Criteria) this; - } - - public Criteria andDeleteUserEqualTo(String value) { - addCriterion("delete_user =", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserNotEqualTo(String value) { - addCriterion("delete_user <>", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserGreaterThan(String value) { - addCriterion("delete_user >", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserGreaterThanOrEqualTo(String value) { - addCriterion("delete_user >=", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserLessThan(String value) { - addCriterion("delete_user <", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserLessThanOrEqualTo(String value) { - addCriterion("delete_user <=", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserLike(String value) { - addCriterion("delete_user like", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserNotLike(String value) { - addCriterion("delete_user not like", value, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserIn(List values) { - addCriterion("delete_user in", values, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserNotIn(List values) { - addCriterion("delete_user not in", values, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserBetween(String value1, String value2) { - addCriterion("delete_user between", value1, value2, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteUserNotBetween(String value1, String value2) { - addCriterion("delete_user not between", value1, value2, "deleteUser"); - return (Criteria) this; - } - - public Criteria andDeleteTimeIsNull() { - addCriterion("delete_time is null"); - return (Criteria) this; - } - - public Criteria andDeleteTimeIsNotNull() { - addCriterion("delete_time is not null"); - return (Criteria) this; - } - - public Criteria andDeleteTimeEqualTo(Long value) { - addCriterion("delete_time =", value, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeNotEqualTo(Long value) { - addCriterion("delete_time <>", value, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeGreaterThan(Long value) { - addCriterion("delete_time >", value, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeGreaterThanOrEqualTo(Long value) { - addCriterion("delete_time >=", value, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeLessThan(Long value) { - addCriterion("delete_time <", value, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeLessThanOrEqualTo(Long value) { - addCriterion("delete_time <=", value, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeIn(List values) { - addCriterion("delete_time in", values, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeNotIn(List values) { - addCriterion("delete_time not in", values, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeBetween(Long value1, Long value2) { - addCriterion("delete_time between", value1, value2, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeleteTimeNotBetween(Long value1, Long value2) { - addCriterion("delete_time not between", value1, value2, "deleteTime"); - return (Criteria) this; - } - - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); - return (Criteria) this; - } - - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); - return (Criteria) this; - } - - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); - return (Criteria) this; - } - public Criteria andDescriptionIsNull() { addCriterion("description is null"); return (Criteria) this; diff --git a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectRobotMapper.xml b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectRobotMapper.xml index a161a435f9..bc9a181d0d 100644 --- a/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectRobotMapper.xml +++ b/backend/framework/domain/src/main/java/io/metersphere/project/mapper/ProjectRobotMapper.xml @@ -15,9 +15,6 @@ - - - @@ -80,8 +77,7 @@ id, project_id, `name`, platform, webhook, `type`, app_key, app_secret, `enable`, - create_user, create_time, update_user, update_time, delete_user, delete_time, deleted, - description + create_user, create_time, update_user, update_time, description