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 28fe210..7b2c72b 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 @@ -178,6 +178,7 @@ public class AnnotationTaskController extends BaseController { * @param subTask 标注文件的信息 * @return 返回影响的行数或错误信 */ + @RequiresPermissions("dataCenter:task:file:manualAnnotate") @PostMapping("/manualAnnotate") public AjaxResult manualAnnotate(@Validated @RequestBody AnnotationTaskAnnotatorEntity subTask) { int result = annotationTaskService.manualAnnotate(subTask); @@ -242,5 +243,15 @@ public class AnnotationTaskController extends BaseController { } } + @RequiresPermissions("dataCenter:dataset:latest:version") + @GetMapping(value = "/getLatestDatasetVersion/{datasetId}") + public AjaxResult getLatestDatasetVersion(@PathVariable Long datasetId ) { + try { + String latestVersion = annotationTaskService.getLatestDatasetVersion(datasetId); + return AjaxResult.success(latestVersion); + }catch (Exception e){ + return AjaxResult.error("获取文件列表失败"); + } + } } diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java index 34c4b85..822d035 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java @@ -71,6 +71,7 @@ public interface AnnotationTaskMapper /**根据任务Id,文件id返回审核驳回的原因*/ String getAuditFailReasonByFileId(AnnotationTaskEntity annotationTask); + String getLatestDatasetVersion(Long datasetId ); //这个接口不需要,可以扩展selectAnnotationTaskList // AnnotationTaskEntity selectAnnotationTaskListUUID(Long taskId); diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java index b06d9f2..ea71aef 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java @@ -347,4 +347,13 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { return new ArrayList<>(); } } + @Override + public String getLatestDatasetVersion(Long datasetId ){ + try { + return annotationTaskMapper.getLatestDatasetVersion(datasetId); + }catch (Exception e) + { + return ""; + } + } } 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 e1a8d00..c50600f 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 @@ -61,5 +61,7 @@ public interface AnnotationTaskService { /**根据taskid获取所有已经审核的标注结果*/ List geAllAuditAnnotationByTaskId(Long taskId); + + String getLatestDatasetVersion(Long datasetId ) ; } 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 83f92d5..9a08b19 100644 --- a/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml +++ b/bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml @@ -84,23 +84,13 @@ SUM(CASE WHEN ap.annotation_status = '2' THEN 1 ELSE 0 END) AS status2Count, SUM(CASE WHEN ap.annotation_status = '3' THEN 1 ELSE 0 END) AS status3Count, COUNT(*) AS totalCount, - atv.version_name as lastVersionName, 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 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 LEFT JOIN sys_user su on su.user_id = at.create_by - LEFT JOIN ( - SELECT dataset_id, version_name - FROM ai_dataset_version - WHERE (dataset_id, create_time) IN ( - SELECT dataset_id, MAX(create_time) - FROM ai_dataset_version - GROUP BY dataset_id - ) - ) atv ON atv.dataset_id = at.dataset_id - WHERE at.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3') + WHERE at.del_flag = '0' and ap.del_flag = '0' and ap.annotation_status IN ('0', '1', '2','3') AND at.task_name LIKE CONCAT('%', #{taskName}, '%') @@ -255,7 +245,7 @@ LEFT JOIN ai_dataset_file_map adfm ON abf.file_id = adfm.file_id LEFT JOIN ai_annotation_task aat ON aat.dataset_id= adfm.dataset_id LEFT JOIN ai_annotation_task_annotator_map atap on atap.task_id = aat.task_id and abf.file_id = atap.file_id - where abf.del_flag = '0' and aat.del_flag = '0' and aat.task_id = #{taskId} + where abf.del_flag = '0' and aat.del_flag = '0' and atap.del_flag = '0' and aat.task_id = #{taskId} AND abf.file_name like concat('%', #{fileName}, '%') @@ -326,7 +316,7 @@ SELECT distinct at.task_id AS taskId, at.task_name AS taskName, at.labels as labels 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.annotator_id = #{annotatorId} + WHERE at.del_flag = '0' and ap.del_flag = '0' and ap.annotator_id = #{annotatorId} @@ -334,7 +324,7 @@ SELECT distinct at.task_id AS taskId , at.task_name AS taskName, at.labels as labels 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.reviewer_id = #{reviewerId} + WHERE at.del_flag = '0' and ap.del_flag = '0' and ap.reviewer_id = #{reviewerId} + +