diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java index 26e521d..5cbb8b2 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/dataset/AnnotationTaskController.java @@ -1,12 +1,8 @@ package com.bonus.ai.controller.dataset; -import com.bonus.ai.client.AnnotationParam; import com.bonus.ai.domain.DataSetBasicFileEntity; -import com.bonus.ai.domain.dataset.AnnotationSubTaskEntity; import com.bonus.ai.domain.dataset.AnnotationTaskAnnotatorEntity; import com.bonus.ai.domain.dataset.AnnotationTaskEntity; -import com.bonus.ai.domain.dataset.DataSetEntity; -import com.bonus.ai.service.DataSetBasicFileService; import com.bonus.ai.service.dataset.AnnotationTaskService; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -17,7 +13,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; /** diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationSubTaskEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationSubTaskEntity.java deleted file mode 100644 index f6e13ac..0000000 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationSubTaskEntity.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.bonus.ai.domain.dataset; - -import com.bonus.ai.domain.enums.AnnotationFileStatus; -import lombok.Data; - -import java.util.Date; - -@Data -public class AnnotationSubTaskEntity { - - AnnotationSubTaskEntity(Long taskId, Long datasetId, Long annotatorId, Long reviewerId, Long fileId){ - this.taskId = taskId; - this.datasetId = datasetId; - this.annotatorId = annotatorId; - this.reviewerId = reviewerId; - this.fileId = fileId; - } - /**任务名称*/ - private Long taskId; - /**数据集id*/ - private Long datasetId; - /**标注人员id*/ - private Long annotatorId; - /**审核人员id*/ - private Long reviewerId; - /**文件id*/ - private Long fileId; - - /**文件标注状态*/ - private AnnotationFileStatus annotateFileStatus; - /**标注结果*/ - private String annotationResult; - /**标注来源,0人工标注,1智能标注*/ - private String annotationSource; - - /**审核驳回原因*/ - private String auditFailedReason; - - /**标注时间*/ - private Date annotationTime; - /**审核时间*/ - private Date reviewTime; -} \ No newline at end of file diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorEntity.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorEntity.java index 47597fc..41f8c05 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorEntity.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskAnnotatorEntity.java @@ -1,12 +1,15 @@ package com.bonus.ai.domain.dataset; +import com.bonus.common.core.web.domain.BaseEntity; import lombok.Data; import org.springframework.stereotype.Component; import java.util.Date; -@Data -@Component -public class AnnotationTaskAnnotatorEntity { +/** + * @author wangvivi + */ + +public class AnnotationTaskAnnotatorEntity extends BaseEntity { private Long annotatorId; // 标注人员 private Long reviewerId; // 审核人员 @@ -22,8 +25,116 @@ public class AnnotationTaskAnnotatorEntity { private Date annotationTime; // 标注时间 private Date reviewTime; // 审核时间 private String auditFailedReason; // 审核驳回原因 - private String createBy; // 创建者 - private String updateBy; // 更新者 - private Date updateTime; // 更新时间 - private Date createTime; // 创建时间 + + public Long getAnnotatorId() { + return annotatorId; + } + + public void setAnnotatorId(Long annotatorId) { + this.annotatorId = annotatorId; + } + + public Long getReviewerId() { + return reviewerId; + } + + public void setReviewerId(Long reviewerId) { + this.reviewerId = reviewerId; + } + + public Long getTaskId() { + return taskId; + } + + public void setTaskId(Long taskId) { + this.taskId = taskId; + } + + public Long getFileId() { + return fileId; + } + + public void setFileId(Long fileId) { + this.fileId = fileId; + } + + public String getFileUrl() { + return fileUrl; + } + + public void setFileUrl(String fileUrl) { + this.fileUrl = fileUrl; + } + + public Long getLabelStudioTaskId() { + return labelStudioTaskId; + } + + public void setLabelStudioTaskId(Long labelStudioTaskId) { + this.labelStudioTaskId = labelStudioTaskId; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getAnnotationStatus() { + return annotationStatus; + } + + public void setAnnotationStatus(String annotationStatus) { + this.annotationStatus = annotationStatus; + } + + public String getAnnotationResult() { + return annotationResult; + } + + public void setAnnotationResult(String annotationResult) { + this.annotationResult = annotationResult; + } + + public String getAnnotationResource() { + return annotationResource; + } + + public void setAnnotationResource(String annotationResource) { + this.annotationResource = annotationResource; + } + + public String getDelFlag() { + return delFlag; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public Date getAnnotationTime() { + return annotationTime; + } + + public void setAnnotationTime(Date annotationTime) { + this.annotationTime = annotationTime; + } + + public Date getReviewTime() { + return reviewTime; + } + + public void setReviewTime(Date reviewTime) { + this.reviewTime = reviewTime; + } + + public String getAuditFailedReason() { + return auditFailedReason; + } + + public void setAuditFailedReason(String auditFailedReason) { + this.auditFailedReason = auditFailedReason; + } } 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 7229f40..d8edf51 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 @@ -52,7 +52,7 @@ public class AnnotationTaskEntity extends BaseEntity { private List reviewers; /**分配后子任务,一个标注文件对应一个子任务*/ - private List subAnnotationTasks; + private List subAnnotationTasks; /**用于查询目的*/ /**根据任务id,标注人id或审核人id 和文件标注状态返回满足条件的文件列表*/ diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java index 7d33b22..ef77f8f 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/dataset/AnnotationTaskService.java @@ -1,11 +1,8 @@ package com.bonus.ai.service.dataset; import com.bonus.ai.domain.DataSetBasicFileEntity; -import com.bonus.ai.domain.dataset.AnnotationSubTaskEntity; import com.bonus.ai.domain.dataset.AnnotationTaskAnnotatorEntity; import com.bonus.ai.domain.dataset.AnnotationTaskEntity; -import com.bonus.ai.domain.dataset.DataSetEntity; -import com.bonus.common.core.web.page.TableDataInfo; import java.io.IOException; import java.util.List; 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 89a9787..d40c2e7 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -143,10 +143,12 @@ annotation_status, label_studio_project_id, del_flag, - create_by, create_time, + create_by, update_by, update_time, + start_time, + end_time, #{datasetId}, @@ -160,10 +162,12 @@ #{annotateTaskStatus}, #{labelStudioProjectId}, #{delFlag}, - #{createBy}, sysdate(), + #{createBy}, #{updateBy}, #{updateTime}, + STR_TO_DATE(#{startTime}, '%Y-%m-%d %H:%i:%s'), + STR_TO_DATE(#{endTime}, '%Y-%m-%d %H:%i:%s'), @@ -171,69 +175,45 @@ INSERT INTO ai_annotation_task_annotator_map - - task_id , - - - file_id , - - - file_url , - - - label_studio_task_id, - - - annotator_id , - - - reviewer_id , - - - description , - - - annotation_status , - - - annotation_result , - - - annotation_resource , - + task_id , + file_id , + file_url , + label_studio_task_id, + annotator_id , + reviewer_id , + description , + annotation_status , + audit_failed_reason , + annotation_result , + annotation_resource, + annotation_time , + review_time , + del_flag, + create_time, + create_by, + update_by, + update_time, VALUES - - #{taskId}, - - - #{fileId}, - - - #{fileUrl}, - - - #{labelStudioTaskId}, - - - #{annotatorId}, - - - #{reviewerId}, - - - #{description} , - - - #{annotationStatus}, - - - #{annotationResult}, - - - #{annotationResource}, - + #{taskId}, + #{fileId}, + #{fileUrl}, + #{labelStudioTaskId}, + #{annotatorId}, + #{reviewerId}, + #{description} , + #{annotationStatus}, + #{auditFailedReason} , + #{annotationResult}, + #{annotationResource}, + #{annotationTime} , + #{reviewTime} , + #{delFlag}, + sysdate(), + #{createBy}, + #{updateBy}, + #{updateTime}, @@ -254,7 +234,8 @@ label_studio_project_id = #{labelStudioProjectId}, del_flag = #{delFlag}, update_by = #{updateBy}, - update_time = sysdate(), + start_time = STR_TO_DATE(#{startTime}, '%Y-%m-%d %H:%i:%s'), + end_time= STR_TO_DATE(#{startTime}, '%Y-%m-%d %H:%i:%s'), WHERE task_id = #{taskId}