refactor(缺陷管理): add domain field

This commit is contained in:
song-cc-rock 2023-10-17 13:58:06 +08:00 committed by 刘瑞斌
parent fb6cc19881
commit 4030e11d64
6 changed files with 366 additions and 26 deletions

View File

@ -14,61 +14,64 @@ import java.util.Arrays;
@Data
public class Bug implements Serializable {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{bug.id.not_blank}", groups = {Updated.class})
@Size(min = 1, max = 50, message = "{bug.id.length_range}", groups = {Created.class, Updated.class})
private String id;
@Schema(description = "业务ID")
@Schema(title = "业务ID")
private Integer num;
@Schema(description = "缺陷标题", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "缺陷标题", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{bug.title.not_blank}", groups = {Created.class})
@Size(min = 1, max = 300, message = "{bug.title.length_range}", groups = {Created.class, Updated.class})
private String title;
@Schema(description = "指派人", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "指派人", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{bug.assign_user.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{bug.assign_user.length_range}", groups = {Created.class, Updated.class})
private String assignUser;
@Schema(description = "创建人")
@Schema(title = "创建人")
private String createUser;
@Schema(description = "创建时间")
@Schema(title = "创建时间")
private Long createTime;
@Schema(description = "更新时间")
@Schema(title = "更新时间")
private Long updateTime;
@Schema(description = "删除人")
@Schema(title = "删除人")
private String deleteUser;
@Schema(description = "删除时间")
@Schema(title = "删除时间")
private Long deleteTime;
@Schema(description = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "项目ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{bug.project_id.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{bug.project_id.length_range}", groups = {Created.class, Updated.class})
private String projectId;
@Schema(description = "模板ID")
@Schema(title = "模板ID")
private String templateId;
@Schema(description = "缺陷平台", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "缺陷平台", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{bug.platform.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{bug.platform.length_range}", groups = {Created.class, Updated.class})
private String platform;
@Schema(description = "平台状态", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "状态", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "{bug.status.not_blank}", groups = {Created.class})
@Size(min = 1, max = 50, message = "{bug.status.length_range}", groups = {Created.class, Updated.class})
private String status;
@Schema(description = "第三方平台缺陷ID")
@Schema(title = "标签")
private String tag;
@Schema(title = "第三方平台缺陷ID")
private String platformBugId;
@Schema(description = "是否回收站", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "是否回收站", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "{bug.trash.not_blank}", groups = {Created.class})
private Boolean trash;
@ -82,10 +85,13 @@ public class Bug implements Serializable {
createUser("create_user", "createUser", "VARCHAR", false),
createTime("create_time", "createTime", "BIGINT", false),
updateTime("update_time", "updateTime", "BIGINT", false),
deleteUser("delete_user", "deleteUser", "VARCHAR", false),
deleteTime("delete_time", "deleteTime", "BIGINT", false),
projectId("project_id", "projectId", "VARCHAR", false),
templateId("template_id", "templateId", "VARCHAR", false),
platform("platform", "platform", "VARCHAR", false),
status("status", "status", "VARCHAR", true),
tag("tag", "tag", "VARCHAR", false),
platformBugId("platform_bug_id", "platformBugId", "VARCHAR", false),
trash("trash", "trash", "BIT", false);

View File

@ -26,6 +26,9 @@ public class BugComment implements Serializable {
@Schema(description = "回复人")
private String replyUser;
@Schema(description = "通知人")
private String notifier;
@Schema(description = "父评论ID")
private String parentId;
@ -52,6 +55,7 @@ public class BugComment implements Serializable {
id("id", "id", "VARCHAR", false),
bugId("bug_id", "bugId", "VARCHAR", false),
replyUser("reply_user", "replyUser", "VARCHAR", false),
notifier("notifier", "notifier", "VARCHAR", false),
parentId("parent_id", "parentId", "VARCHAR", false),
createUser("create_user", "createUser", "VARCHAR", false),
createTime("create_time", "createTime", "BIGINT", false),

View File

@ -314,6 +314,76 @@ public class BugCommentExample {
return (Criteria) this;
}
public Criteria andNotifierIsNull() {
addCriterion("notifier is null");
return (Criteria) this;
}
public Criteria andNotifierIsNotNull() {
addCriterion("notifier is not null");
return (Criteria) this;
}
public Criteria andNotifierEqualTo(String value) {
addCriterion("notifier =", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierNotEqualTo(String value) {
addCriterion("notifier <>", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierGreaterThan(String value) {
addCriterion("notifier >", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierGreaterThanOrEqualTo(String value) {
addCriterion("notifier >=", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierLessThan(String value) {
addCriterion("notifier <", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierLessThanOrEqualTo(String value) {
addCriterion("notifier <=", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierLike(String value) {
addCriterion("notifier like", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierNotLike(String value) {
addCriterion("notifier not like", value, "notifier");
return (Criteria) this;
}
public Criteria andNotifierIn(List<String> values) {
addCriterion("notifier in", values, "notifier");
return (Criteria) this;
}
public Criteria andNotifierNotIn(List<String> values) {
addCriterion("notifier not in", values, "notifier");
return (Criteria) this;
}
public Criteria andNotifierBetween(String value1, String value2) {
addCriterion("notifier between", value1, value2, "notifier");
return (Criteria) this;
}
public Criteria andNotifierNotBetween(String value1, String value2) {
addCriterion("notifier not between", value1, value2, "notifier");
return (Criteria) this;
}
public Criteria andParentIdIsNull() {
addCriterion("parent_id is null");
return (Criteria) this;

View File

@ -564,6 +564,136 @@ public class BugExample {
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<String> values) {
addCriterion("delete_user in", values, "deleteUser");
return (Criteria) this;
}
public Criteria andDeleteUserNotIn(List<String> 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<Long> values) {
addCriterion("delete_time in", values, "deleteTime");
return (Criteria) this;
}
public Criteria andDeleteTimeNotIn(List<Long> 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 andProjectIdIsNull() {
addCriterion("project_id is null");
return (Criteria) this;
@ -844,6 +974,76 @@ public class BugExample {
return (Criteria) this;
}
public Criteria andTagIsNull() {
addCriterion("tag is null");
return (Criteria) this;
}
public Criteria andTagIsNotNull() {
addCriterion("tag is not null");
return (Criteria) this;
}
public Criteria andTagEqualTo(String value) {
addCriterion("tag =", value, "tag");
return (Criteria) this;
}
public Criteria andTagNotEqualTo(String value) {
addCriterion("tag <>", value, "tag");
return (Criteria) this;
}
public Criteria andTagGreaterThan(String value) {
addCriterion("tag >", value, "tag");
return (Criteria) this;
}
public Criteria andTagGreaterThanOrEqualTo(String value) {
addCriterion("tag >=", value, "tag");
return (Criteria) this;
}
public Criteria andTagLessThan(String value) {
addCriterion("tag <", value, "tag");
return (Criteria) this;
}
public Criteria andTagLessThanOrEqualTo(String value) {
addCriterion("tag <=", value, "tag");
return (Criteria) this;
}
public Criteria andTagLike(String value) {
addCriterion("tag like", value, "tag");
return (Criteria) this;
}
public Criteria andTagNotLike(String value) {
addCriterion("tag not like", value, "tag");
return (Criteria) this;
}
public Criteria andTagIn(List<String> values) {
addCriterion("tag in", values, "tag");
return (Criteria) this;
}
public Criteria andTagNotIn(List<String> values) {
addCriterion("tag not in", values, "tag");
return (Criteria) this;
}
public Criteria andTagBetween(String value1, String value2) {
addCriterion("tag between", value1, value2, "tag");
return (Criteria) this;
}
public Criteria andTagNotBetween(String value1, String value2) {
addCriterion("tag not between", value1, value2, "tag");
return (Criteria) this;
}
public Criteria andPlatformBugIdIsNull() {
addCriterion("platform_bug_id is null");
return (Criteria) this;

View File

@ -9,10 +9,13 @@
<result column="create_user" jdbcType="VARCHAR" property="createUser" />
<result column="create_time" jdbcType="BIGINT" property="createTime" />
<result column="update_time" jdbcType="BIGINT" property="updateTime" />
<result column="delete_user" jdbcType="VARCHAR" property="deleteUser" />
<result column="delete_time" jdbcType="BIGINT" property="deleteTime" />
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="template_id" jdbcType="VARCHAR" property="templateId" />
<result column="platform" jdbcType="VARCHAR" property="platform" />
<result column="status" jdbcType="VARCHAR" property="status" />
<result column="tag" jdbcType="VARCHAR" property="tag" />
<result column="platform_bug_id" jdbcType="VARCHAR" property="platformBugId" />
<result column="trash" jdbcType="BIT" property="trash" />
</resultMap>
@ -75,8 +78,8 @@
</where>
</sql>
<sql id="Base_Column_List">
id, num, title, assign_user, create_user, create_time, update_time, project_id, template_id,
platform, `status`, platform_bug_id, trash
id, num, title, assign_user, create_user, create_time, update_time, delete_user,
delete_time, project_id, template_id, platform, `status`, tag, platform_bug_id, trash
</sql>
<select id="selectByExample" parameterType="io.metersphere.bug.domain.BugExample" resultMap="BaseResultMap">
select
@ -111,13 +114,15 @@
<insert id="insert" parameterType="io.metersphere.bug.domain.Bug">
insert into bug (id, num, title,
assign_user, create_user, create_time,
update_time, project_id, template_id,
platform, `status`, platform_bug_id,
update_time, delete_user, delete_time,
project_id, template_id, platform,
`status`, tag, platform_bug_id,
trash)
values (#{id,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{title,jdbcType=VARCHAR},
#{assignUser,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT},
#{updateTime,jdbcType=BIGINT}, #{projectId,jdbcType=VARCHAR}, #{templateId,jdbcType=VARCHAR},
#{platform,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{platformBugId,jdbcType=VARCHAR},
#{updateTime,jdbcType=BIGINT}, #{deleteUser,jdbcType=VARCHAR}, #{deleteTime,jdbcType=BIGINT},
#{projectId,jdbcType=VARCHAR}, #{templateId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR},
#{status,jdbcType=VARCHAR}, #{tag,jdbcType=VARCHAR}, #{platformBugId,jdbcType=VARCHAR},
#{trash,jdbcType=BIT})
</insert>
<insert id="insertSelective" parameterType="io.metersphere.bug.domain.Bug">
@ -144,6 +149,12 @@
<if test="updateTime != null">
update_time,
</if>
<if test="deleteUser != null">
delete_user,
</if>
<if test="deleteTime != null">
delete_time,
</if>
<if test="projectId != null">
project_id,
</if>
@ -156,6 +167,9 @@
<if test="status != null">
`status`,
</if>
<if test="tag != null">
tag,
</if>
<if test="platformBugId != null">
platform_bug_id,
</if>
@ -185,6 +199,12 @@
<if test="updateTime != null">
#{updateTime,jdbcType=BIGINT},
</if>
<if test="deleteUser != null">
#{deleteUser,jdbcType=VARCHAR},
</if>
<if test="deleteTime != null">
#{deleteTime,jdbcType=BIGINT},
</if>
<if test="projectId != null">
#{projectId,jdbcType=VARCHAR},
</if>
@ -197,6 +217,9 @@
<if test="status != null">
#{status,jdbcType=VARCHAR},
</if>
<if test="tag != null">
#{tag,jdbcType=VARCHAR},
</if>
<if test="platformBugId != null">
#{platformBugId,jdbcType=VARCHAR},
</if>
@ -235,6 +258,12 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=BIGINT},
</if>
<if test="record.deleteUser != null">
delete_user = #{record.deleteUser,jdbcType=VARCHAR},
</if>
<if test="record.deleteTime != null">
delete_time = #{record.deleteTime,jdbcType=BIGINT},
</if>
<if test="record.projectId != null">
project_id = #{record.projectId,jdbcType=VARCHAR},
</if>
@ -247,6 +276,9 @@
<if test="record.status != null">
`status` = #{record.status,jdbcType=VARCHAR},
</if>
<if test="record.tag != null">
tag = #{record.tag,jdbcType=VARCHAR},
</if>
<if test="record.platformBugId != null">
platform_bug_id = #{record.platformBugId,jdbcType=VARCHAR},
</if>
@ -267,10 +299,13 @@
create_user = #{record.createUser,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=BIGINT},
delete_user = #{record.deleteUser,jdbcType=VARCHAR},
delete_time = #{record.deleteTime,jdbcType=BIGINT},
project_id = #{record.projectId,jdbcType=VARCHAR},
template_id = #{record.templateId,jdbcType=VARCHAR},
platform = #{record.platform,jdbcType=VARCHAR},
`status` = #{record.status,jdbcType=VARCHAR},
tag = #{record.tag,jdbcType=VARCHAR},
platform_bug_id = #{record.platformBugId,jdbcType=VARCHAR},
trash = #{record.trash,jdbcType=BIT}
<if test="_parameter != null">
@ -298,6 +333,12 @@
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=BIGINT},
</if>
<if test="deleteUser != null">
delete_user = #{deleteUser,jdbcType=VARCHAR},
</if>
<if test="deleteTime != null">
delete_time = #{deleteTime,jdbcType=BIGINT},
</if>
<if test="projectId != null">
project_id = #{projectId,jdbcType=VARCHAR},
</if>
@ -310,6 +351,9 @@
<if test="status != null">
`status` = #{status,jdbcType=VARCHAR},
</if>
<if test="tag != null">
tag = #{tag,jdbcType=VARCHAR},
</if>
<if test="platformBugId != null">
platform_bug_id = #{platformBugId,jdbcType=VARCHAR},
</if>
@ -327,24 +371,29 @@
create_user = #{createUser,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=BIGINT},
delete_user = #{deleteUser,jdbcType=VARCHAR},
delete_time = #{deleteTime,jdbcType=BIGINT},
project_id = #{projectId,jdbcType=VARCHAR},
template_id = #{templateId,jdbcType=VARCHAR},
platform = #{platform,jdbcType=VARCHAR},
`status` = #{status,jdbcType=VARCHAR},
tag = #{tag,jdbcType=VARCHAR},
platform_bug_id = #{platformBugId,jdbcType=VARCHAR},
trash = #{trash,jdbcType=BIT}
where id = #{id,jdbcType=VARCHAR}
</update>
<insert id="batchInsert" parameterType="map">
insert into bug
(id, num, title, assign_user, create_user, create_time, update_time, project_id,
template_id, platform, `status`, platform_bug_id, trash)
(id, num, title, assign_user, create_user, create_time, update_time, delete_user,
delete_time, project_id, template_id, platform, `status`, tag, platform_bug_id,
trash)
values
<foreach collection="list" item="item" separator=",">
(#{item.id,jdbcType=VARCHAR}, #{item.num,jdbcType=INTEGER}, #{item.title,jdbcType=VARCHAR},
#{item.assignUser,jdbcType=VARCHAR}, #{item.createUser,jdbcType=VARCHAR}, #{item.createTime,jdbcType=BIGINT},
#{item.updateTime,jdbcType=BIGINT}, #{item.projectId,jdbcType=VARCHAR}, #{item.templateId,jdbcType=VARCHAR},
#{item.platform,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, #{item.platformBugId,jdbcType=VARCHAR},
#{item.updateTime,jdbcType=BIGINT}, #{item.deleteUser,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=BIGINT},
#{item.projectId,jdbcType=VARCHAR}, #{item.templateId,jdbcType=VARCHAR}, #{item.platform,jdbcType=VARCHAR},
#{item.status,jdbcType=VARCHAR}, #{item.tag,jdbcType=VARCHAR}, #{item.platformBugId,jdbcType=VARCHAR},
#{item.trash,jdbcType=BIT})
</foreach>
</insert>
@ -379,6 +428,12 @@
<if test="'update_time'.toString() == column.value">
#{item.updateTime,jdbcType=BIGINT}
</if>
<if test="'delete_user'.toString() == column.value">
#{item.deleteUser,jdbcType=VARCHAR}
</if>
<if test="'delete_time'.toString() == column.value">
#{item.deleteTime,jdbcType=BIGINT}
</if>
<if test="'project_id'.toString() == column.value">
#{item.projectId,jdbcType=VARCHAR}
</if>
@ -391,6 +446,9 @@
<if test="'status'.toString() == column.value">
#{item.status,jdbcType=VARCHAR}
</if>
<if test="'tag'.toString() == column.value">
#{item.tag,jdbcType=VARCHAR}
</if>
<if test="'platform_bug_id'.toString() == column.value">
#{item.platformBugId,jdbcType=VARCHAR}
</if>

View File

@ -15,7 +15,8 @@ CREATE TABLE IF NOT EXISTS bug(
`project_id` VARCHAR(50) NOT NULL COMMENT '项目ID' ,
`template_id` VARCHAR(50) COMMENT '模板ID' ,
`platform` VARCHAR(50) NOT NULL COMMENT '缺陷平台' ,
`status` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '平台状态' ,
`status` VARCHAR(50) NOT NULL DEFAULT '' COMMENT '状态' ,
`tag` VARCHAR(1000) COMMENT '标签' ,
`platform_bug_id` VARCHAR(50) COMMENT '第三方平台缺陷ID' ,
`trash` BIT(1) NOT NULL COMMENT '是否回收站' ,
PRIMARY KEY (id)
@ -55,6 +56,7 @@ CREATE TABLE IF NOT EXISTS bug_comment(
`id` VARCHAR(50) NOT NULL COMMENT 'ID' ,
`bug_id` VARCHAR(50) NOT NULL COMMENT '缺陷ID' ,
`reply_user` VARCHAR(50) COMMENT '回复人' ,
`notifier` VARCHAR(1000) COMMENT '通知人' ,
`parent_id` VARCHAR(50) COMMENT '父评论ID' ,
`description` TEXT NOT NULL COMMENT '内容' ,
`create_user` VARCHAR(50) NOT NULL COMMENT '评论人' ,