修改返回数据集最新的版本信息

This commit is contained in:
weiweiw 2024-12-02 16:08:58 +08:00
parent 052eda7838
commit b2facc0436
5 changed files with 41 additions and 10 deletions

View File

@ -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("获取文件列表失败");
}
}
}

View File

@ -71,6 +71,7 @@ public interface AnnotationTaskMapper
/**根据任务Id文件id返回审核驳回的原因*/
String getAuditFailReasonByFileId(AnnotationTaskEntity annotationTask);
String getLatestDatasetVersion(Long datasetId );
//这个接口不需要可以扩展selectAnnotationTaskList
// AnnotationTaskEntity selectAnnotationTaskListUUID(Long taskId);

View File

@ -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 "";
}
}
}

View File

@ -61,5 +61,7 @@ public interface AnnotationTaskService {
/**根据taskid获取所有已经审核的标注结果*/
List<DataSetBasicFileEntity> geAllAuditAnnotationByTaskId(Long taskId);
String getLatestDatasetVersion(Long datasetId )
;
}

View File

@ -84,22 +84,12 @@
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')
<if test="taskName != null and taskName != ''">
AND at.task_name LIKE CONCAT('%', #{taskName}, '%')
@ -360,5 +350,23 @@
</if>
</select>
<select id="getLatestDatasetVersion"
parameterType="Long" resultType="String">
SELECT
t.version_name
FROM
ai_dataset_version t
WHERE
t.create_time = (
SELECT
MAX(create_time)
FROM
ai_dataset_version
WHERE
dataset_id = t.dataset_id
)
AND t.dataset_id = #{datasetId}
</select>
</mapper>