增加接口
This commit is contained in:
parent
fca8d47163
commit
72118386d0
|
|
@ -121,7 +121,7 @@ public class AnnotationTaskController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* 根据任务id返回由我标注任务的所有文件列表
|
||||
* 根据任务id返回由我标注任务的所有文件列表,并可以根据文件名称进行检索
|
||||
* 0未标注,1已标注,2已审核,3审核驳回
|
||||
* ,String annotationStatus 5 表示全部,0-4表示标注和审核状态
|
||||
* @return 返回数据集详情
|
||||
|
|
@ -139,7 +139,7 @@ public class AnnotationTaskController extends BaseController {
|
|||
}
|
||||
|
||||
/**
|
||||
* * 根据任务id返回由我审核任务的所有文件列表
|
||||
* * 根据任务id返回由我审核任务的所有文件列表,并可以根据文件名称进行检索
|
||||
* @return 返回数据集详情
|
||||
*/
|
||||
@RequiresPermissions("dataCenter:task:file:audit")
|
||||
|
|
@ -219,5 +219,34 @@ public class AnnotationTaskController extends BaseController {
|
|||
}
|
||||
|
||||
|
||||
/**获取由我标注的未完成标注的任务列表
|
||||
* @return 标注任务列表
|
||||
*/
|
||||
@RequiresPermissions("dataCenter:no_annotation_task:list:status")
|
||||
@GetMapping(value = "/getMyNoAnnotatedTask/")
|
||||
public AjaxResult getMyNoAnnotationTask() {
|
||||
try {
|
||||
|
||||
List<AnnotationTaskEntity> dataSetBasicFile = annotationTaskService.getMyNoAnnotationTask();
|
||||
return AjaxResult.success(dataSetBasicFile);
|
||||
}catch (Exception e){
|
||||
return AjaxResult.error("获取文件列表失败");
|
||||
}
|
||||
}
|
||||
|
||||
/**获取由我审核的未完成审核的任务列表
|
||||
* @return 审核任务列表
|
||||
*/
|
||||
@RequiresPermissions("dataCenter:no_audit_task:list:status")
|
||||
@GetMapping(value = "/getMyNoAuditedTask/")
|
||||
public AjaxResult getMyNoAuditTask() {
|
||||
try {
|
||||
List<AnnotationTaskEntity> dataSetBasicFile = annotationTaskService.getMyNoAuditTask();
|
||||
return AjaxResult.success(dataSetBasicFile);
|
||||
}catch (Exception e){
|
||||
return AjaxResult.error("获取文件列表失败");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public interface AnnotationTaskMapper
|
|||
* @param taskId 任务ID
|
||||
* @return 影响的行数
|
||||
*/
|
||||
int deleteAnnotationTaskById(Long taskId);
|
||||
int deleteTaskById(Long taskId);
|
||||
|
||||
/**
|
||||
* 查询标注任务列表
|
||||
|
|
@ -49,17 +49,26 @@ public interface AnnotationTaskMapper
|
|||
*/
|
||||
List<AnnotationTaskEntity> selectMyAnnotationTaskList(AnnotationTaskEntity annotationTask);
|
||||
|
||||
/**获取由我标注的未完成标注的任务列表*/
|
||||
List<AnnotationTaskEntity> getMyNoAnnotationTask(Long annotatorId);
|
||||
|
||||
/**获取由我审核的未完成审核的任务列表*/
|
||||
List<AnnotationTaskEntity> getMyNoAuditTask(Long reviewerId);
|
||||
|
||||
/**插入标注任务,文件和标注人和审核人到任务文件标注人关联表*/
|
||||
int insertAnnotTaskannotator(AnnotationTaskAnnotatorEntity annotationTaskAnnotatorEntities);
|
||||
|
||||
int deleteTaskById(Long taskId);
|
||||
|
||||
/**根据任务id 删除任务文件和标注人记录*/
|
||||
int deleteAnnotator(Long taskId);
|
||||
|
||||
/**更新标注文件信息,如标注结果和审核驳回原因*/
|
||||
int updateAnnotationInfo(AnnotationTaskAnnotatorEntity entity);
|
||||
|
||||
/**根据文件标注状态,标注人或审核人等信息 返回任务关联的文件详情*/
|
||||
List<DataSetBasicFileEntity>getTaskBasicFile(AnnotationTaskEntity annotationTask);
|
||||
/**根据任务Id,文件id返回审核驳回的原因*/
|
||||
String getAuditFailReasonByFileId(Long taskId, Long fileId);
|
||||
|
||||
int updateAnnotationInfo(AnnotationTaskAnnotatorEntity entity);
|
||||
//这个接口不需要,可以扩展selectAnnotationTaskList
|
||||
// AnnotationTaskEntity selectAnnotationTaskListUUID(Long taskId);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
|
|||
task.setTaskId(taskId);
|
||||
task.setReviewerId(userId);
|
||||
Long intAnnotationStatus = Long.valueOf(annotationStatus);
|
||||
if (intAnnotationStatus < 4 && intAnnotationStatus >= 0) {
|
||||
if (intAnnotationStatus <4 && intAnnotationStatus >= 0) {
|
||||
task.setFileAnnotationStatus(annotationStatus);
|
||||
}
|
||||
else {
|
||||
|
|
@ -304,4 +304,16 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
|
|||
}
|
||||
|
||||
|
||||
@Override
|
||||
public List<AnnotationTaskEntity> getMyNoAnnotationTask(){
|
||||
Long annotatorId = SecurityUtils.getUserId();
|
||||
return annotationTaskMapper.getMyNoAnnotationTask(annotatorId);
|
||||
}
|
||||
@Override
|
||||
public List<AnnotationTaskEntity> getMyNoAuditTask(){
|
||||
Long reviewerId = SecurityUtils.getUserId();
|
||||
return annotationTaskMapper.getMyNoAnnotationTask(reviewerId);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,5 +49,10 @@ public interface AnnotationTaskService {
|
|||
List<DataSetBasicFileEntity> getMyAuditTaskBasicFile(Long taskId,String annotationStatus);
|
||||
|
||||
String getAuditFailReasonByFileId(Long taskId, Long fileId);
|
||||
|
||||
/**获取由我标注的未完成标注的任务列表*/
|
||||
List<AnnotationTaskEntity> getMyNoAnnotationTask();
|
||||
/**获取由我审核的未完成审核的任务列表*/
|
||||
List<AnnotationTaskEntity> getMyNoAuditTask();
|
||||
;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -240,13 +240,6 @@
|
|||
WHERE task_id = #{taskId}
|
||||
</update>
|
||||
|
||||
<!-- 根据任务ID删除标注任务 (逻辑删除) -->
|
||||
<update id="deleteAnnotationTaskById" parameterType="long">
|
||||
UPDATE ai_annotation_task
|
||||
SET del_flag = '1'
|
||||
WHERE task_id = #{taskId}
|
||||
</update>
|
||||
|
||||
<!-- 根据taskid 返回由某人标注 或审核的的文件列表和文件详情-->
|
||||
<select id="getTaskBasicFile" parameterType="com.bonus.ai.domain.dataset.AnnotationTaskEntity" resultType="com.bonus.ai.domain.DataSetBasicFileEntity">
|
||||
SELECT
|
||||
|
|
@ -319,6 +312,19 @@
|
|||
GROUP BY annotation_status
|
||||
</select>
|
||||
|
||||
<select id="getMyNoAnnotationTask" parameterType="Long" resultType="com.bonus.ai.domain.dataset.AnnotationTaskEntity">
|
||||
SELECT distinct at.task_id AS taskId, at.task_name AS taskName
|
||||
FROM ai_annotation_task at
|
||||
LEFT JOIN ai_annotation_task_annotator_map ap on at.task_id = ap.task_id
|
||||
WHERE at.del_flag = '0' and ap.annotation_status IN ('0') and ap.annotator_id = #{annotatorId}
|
||||
</select>
|
||||
|
||||
<select id="getMyNoAuditTask" resultType="com.bonus.ai.domain.dataset.AnnotationTaskEntity">
|
||||
SELECT distinct at.task_id AS taskId , at.task_name AS taskName
|
||||
FROM ai_annotation_task at
|
||||
LEFT JOIN ai_annotation_task_annotator_map ap on at.task_id = ap.task_id
|
||||
WHERE at.del_flag = '0' and ap.annotation_status IN ('1') and ap.reviewer_id = #{reviewerId}
|
||||
</select>
|
||||
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue