diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/IntelligentAnnotationController.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/IntelligentAnnotationController.java index 7ce2328..b02d9ef 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/IntelligentAnnotationController.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/controller/IntelligentAnnotationController.java @@ -52,6 +52,18 @@ public class IntelligentAnnotationController extends BaseController { } + @GetMapping("/service/listWithNoPage") + public AjaxResult listWithNoPage(IntelligentAnnotationServiceEntity entity) + { + try { + List list = intelligentAnnotationService.getAIAnnotationServiceList(entity); + return AjaxResult.success(list); + }catch (Exception e) { + return AjaxResult.error("信息获取失败"); + } + + } + /** * 获取详细信息 */ @@ -136,9 +148,7 @@ public class IntelligentAnnotationController extends BaseController { List fileList = annotationTaskService.getMyAnnotaionTaskBasicFile(task.getTaskId(), "2"); //根据以上信息进行智能标注,并将标注结果保存数据库 - intelligentAnnotationService.aiAnnotate(taskInfo, fileList, service); - - return AjaxResult.success(); + return intelligentAnnotationService.aiAnnotate(taskInfo, fileList, service); }catch (Exception e){ return AjaxResult.error(); } 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 97b42ca..d853d9c 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 @@ -81,6 +81,9 @@ public class AnnotationTaskEntity extends BaseEntity { /**用于传入智能标注信息*/ private Long intelligentAnnotationServiceId; + /**用于返回任务的标注人id列表和审核人id列表,多个id 之间用‘,’分割*/ + private String annotatorIds; + private String reviewerIds; @Data 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 7d3cb9a..851f479 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -85,7 +85,9 @@ SUM(CASE WHEN ap.annotation_status = '3' THEN 1 ELSE 0 END) AS status3Count, COUNT(*) AS totalCount, DATE_FORMAT(at.start_time, '%Y-%m-%d %H:%i:%s') AS startTime, - DATE_FORMAT(at.end_time, '%Y-%m-%d %H:%i:%s') AS endTime + DATE_FORMAT(at.end_time, '%Y-%m-%d %H:%i:%s') AS endTime, + GROUP_CONCAT(DISTINCT ap.annotator_id) AS annotator_ids, + GROUP_CONCAT(DISTINCT ap.reviewer_id) AS reviewer_ids FROM ai_annotation_task at LEFT JOIN ai_annotation_task_annotator_map ap on at.task_id = ap.task_id LEFT JOIN ai_dataset ad on ad.dataset_id = at.dataset_id