diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorMap.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorMap.java new file mode 100644 index 0000000..ad3224c --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorMap.java @@ -0,0 +1,25 @@ +package com.bonus.ai.domain.dataset; +import lombok.Data; + +import java.util.Date; + +@Data +public class AnnotationTaskAnnotatorMap { + + private Long annotatorId; // 标注人员 + private Long reviewerId; // 审核人员 + private Long taskId; // 任务ID + private Long fileId; // 文件ID + private String description; // 描述 + private String annotationStatus; // 标注状态 + private String annotationResult; // 标注结果 (JSON串) + private String annotationResource; // 标注资源类型 + private String delFlag; // 删除标记 + private Date annotationTime; // 标注时间 + private Date reviewTime; // 审核时间 + private String auditFailedReason; // 审核驳回原因 + private String createBy; // 创建者 + private String updateBy; // 更新者 + private Date updateTime; // 更新时间 + private Date createTime; // 创建时间 +} \ No newline at end of file diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java index 5e7a126..ec22caf 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java @@ -16,6 +16,8 @@ public class AnnotationTaskEntity extends BaseEntity { private Long datasetId; /**标注团队id,为0表示未启用标注团队,1启用标注团队*/ private String isStartTeam; + + private String taskUuid; /**任务名称*/ private String taskName; /**任务描述*/ diff --git a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml index 05d5b07..e51e92e 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -4,62 +4,41 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - INSERT INTO ai_annotation_task (dataset_id, task_name, task_uuid, description, - annotation_scene, annotation_type, labels, is_annotation, - annotation_status, project_id, del_flag, create_by, create_time, update_by, update_time) - VALUES (#{datasetId}, #{taskName}, #{taskUuid}, #{taskDesc}, - #{annotateScene}, #{annotateType}, #{labels}, #{isStartTeam}, - #{annotateTaskStatus}, #{projectId}, #{delFlag}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}) - + + + + + + + + + + + + + + + + + + - - - UPDATE ai_annotation_task - SET dataset_id = #{datasetId}, - task_name = #{taskName}, - task_uuid = #{taskUuid}, - description = #{taskDesc}, - annotation_scene = #{annotateScene}, - annotation_type = #{annotateType}, - labels = #{labels}, - is_annotation = #{isStartTeam}, - annotation_status = #{annotateTaskStatus}, - project_id = #{projectId}, - del_flag = #{delFlag}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime} - WHERE task_id = #{taskId} - + + select distinct t.task_id, t.task_uuid, t.task_name, t.description, t.annotation_scene, t.annotation_type, + FROM ai_annotation_task t + left join ai_annotation_task_annotator_map a on t.task_id = a.task_id + - - - UPDATE ai_annotation_task - SET del_flag = '1' - WHERE task_id = #{taskId} - + - - + + + + INSERT INTO ai_annotation_task + + dataset_id, + task_name, + task_uuid, + description, + annotation_scene, + annotation_type, + labels, + is_annotation_team, + annotation_status, + project_id, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{datasetId}, + #{taskName}, + #{taskUuid}, + #{taskDesc}, + #{annotateScene}, + #{annotateType}, + #{labels}, + #{isStartTeam}, + #{annotateTaskStatus}, + #{projectId}, + #{delFlag}, + #{createBy}, + sysdate(), + #{updateBy}, + #{updateTime}, + + + + + + + UPDATE ai_annotation_task + + dataset_id = #{datasetId}, + task_name = #{taskName}, + task_uuid = #{taskUuid}, + description = #{taskDesc}, + annotation_scene = #{annotateScene}, + annotation_type = #{annotateType}, + labels = #{labels}, + is_annotation_team = #{isStartTeam}, + annotation_status = #{annotateTaskStatus}, + project_id = #{projectId}, + del_flag = #{delFlag}, + update_by = #{updateBy}, + update_time = sysdate(), + + WHERE task_id = #{taskId} + + + + + UPDATE ai_annotation_task + SET del_flag = '1' + WHERE task_id = #{taskId} + + + + diff --git a/sql/bonus_ai.sql b/sql/bonus_ai.sql index b005ece..6acb561 100644 --- a/sql/bonus_ai.sql +++ b/sql/bonus_ai.sql @@ -12,7 +12,7 @@ create table ai_annotation_task annotation_scene char(1) comment '标注场景(对应数据集的数据类型)', annotation_type char(2) comment '标注类型(不同数据类型有不同的标注类型,如图片:图像分类,物体检测等)', labels varchar(200) comment '允许的标签集', - is_annotation char(1) comment '标注团队id(0未启用,1启用团队)', + is_annotation_team char(1) comment '标注团队id(0未启用,1启用团队)', annotation_status char(1) default '0' comment '0未标注,1正在标注,2已标注,3正在审核,4已审核', del_flag char(1) default '0' comment '是否删除(0代表存在,1代表删除)', create_by varchar(64) default '' comment '创建者',