weiweiw
/
Bonus-Cloud-AI-V2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回滚上次的操作

This commit is contained in:
weiweiw 2024-11-28 11:33:58 +08:00
parent 0791329e2e
commit 01a86c313a
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-ai/src/main/java/com/bonus/ai/domain/dataset/AnnotationTaskEntity.java
View File

@ -58,10 +58,10 @@ public class AnnotationTaskEntity extends BaseEntity {
// /**根据任务id，标注人id或审核人id 和文件标注状态返回满足条件的文件列表*/ // /**根据任务id，标注人id或审核人id 和文件标注状态返回满足条件的文件列表*/
private String annotatorId= ""; private String annotatorId= "";
private String reviewerId = ""; private String reviewerId = "";
// private String fileAnnotationStatus; private String fileAnnotationStatus;
// private String fileName; private String fileName;
// /**根据任务id 和文件id 返回审核驳回的原因*/ /**根据任务id 和文件id 返回审核驳回的原因*/
// private Long fileId = 0L; private Long fileId = 0L;
/**任务查询数据*/ /**任务查询数据*/
private String datasetName; private String datasetName;
private String ownerName; private String ownerName;

4
bonus-modules/bonus-ai/src/main/java/com/bonus/ai/mapper/AnnotationTaskMapper.java
View File

@ -64,9 +64,9 @@ public interface AnnotationTaskMapper
int updateAnnotationInfo(AnnotationTaskAnnotatorEntity entity); int updateAnnotationInfo(AnnotationTaskAnnotatorEntity entity);
/**根据文件标注状态，标注人或审核人等信息 返回任务关联的文件详情*/ /**根据文件标注状态，标注人或审核人等信息 返回任务关联的文件详情*/
List<DataSetBasicFileEntity>getTaskBasicFile(AnnotationTaskAnnotatorEntity annotationTask); List<DataSetBasicFileEntity>getTaskBasicFile(AnnotationTaskEntity annotationTask);
/**根据任务Id，文件id返回审核驳回的原因*/ /**根据任务Id，文件id返回审核驳回的原因*/
String getAuditFailReasonByFileId(AnnotationTaskAnnotatorEntity annotationTask); String getAuditFailReasonByFileId(AnnotationTaskEntity annotationTask);
//这个接口不需要，可以扩展selectAnnotationTaskList //这个接口不需要，可以扩展selectAnnotationTaskList
// AnnotationTaskEntity selectAnnotationTaskListUUID(Long taskId); // AnnotationTaskEntity selectAnnotationTaskListUUID(Long taskId);

18
bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java
View File

@ -212,14 +212,14 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
public List<DataSetBasicFileEntity> getMyAnnotaionTaskBasicFile(Long taskId, String annotationStatus){ public List<DataSetBasicFileEntity> getMyAnnotaionTaskBasicFile(Long taskId, String annotationStatus){
try { try {
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); AnnotationTaskEntity task = new AnnotationTaskEntity();
task.setTaskId(taskId); task.setTaskId(taskId);
task.setAnnotatorId(userId); task.setAnnotatorId(String.valueOf(userId));
Long intAnnotationStatus = Long.valueOf(annotationStatus); Long intAnnotationStatus = Long.valueOf(annotationStatus);
if (intAnnotationStatus < 4 && intAnnotationStatus >= 0) { if (intAnnotationStatus < 4 && intAnnotationStatus >= 0) {
task.setAnnotationStatus(annotationStatus); task.setFileAnnotationStatus(annotationStatus);
} else { } else {
task.setAnnotationStatus("5"); task.setFileAnnotationStatus("5");
} }
return annotationTaskMapper.getTaskBasicFile(task); return annotationTaskMapper.getTaskBasicFile(task);
}catch(Exception e){ }catch(Exception e){
@ -231,15 +231,15 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
@Override @Override
public List<DataSetBasicFileEntity> getMyAuditTaskBasicFile(Long taskId, String annotationStatus){ public List<DataSetBasicFileEntity> getMyAuditTaskBasicFile(Long taskId, String annotationStatus){
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); AnnotationTaskEntity task = new AnnotationTaskEntity();
task.setTaskId(taskId); task.setTaskId(taskId);
task.setReviewerId(userId); task.setReviewerId(String.valueOf(userId));
Long intAnnotationStatus = Long.valueOf(annotationStatus); Long intAnnotationStatus = Long.valueOf(annotationStatus);
if (intAnnotationStatus <4 && intAnnotationStatus >= 0) { if (intAnnotationStatus <4 && intAnnotationStatus >= 0) {
task.setAnnotationStatus(annotationStatus); task.setFileAnnotationStatus(annotationStatus);
} }
else { else {
task.setAnnotationStatus("5"); task.setFileAnnotationStatus("5");
} }
return annotationTaskMapper.getTaskBasicFile(task); return annotationTaskMapper.getTaskBasicFile(task);
} }
@ -248,7 +248,7 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService {
@Override @Override
public String getAuditFailReasonByFileId(Long taskId, Long fileId){ public String getAuditFailReasonByFileId(Long taskId, Long fileId){
try { try {
AnnotationTaskAnnotatorEntity task = new AnnotationTaskAnnotatorEntity(); AnnotationTaskEntity task = new AnnotationTaskEntity();
task.setTaskId(taskId); task.setTaskId(taskId);
task.setFileId(fileId); task.setFileId(fileId);
return annotationTaskMapper.getAuditFailReasonByFileId(task); return annotationTaskMapper.getAuditFailReasonByFileId(task);

6
bonus-modules/bonus-ai/src/main/resources/mapper/AnnotationTaskMapper.xml
View File

@ -241,7 +241,7 @@
</update> </update>
<!-- 根据taskid 返回由某人标注 或审核的的文件列表和文件详情--> <!-- 根据taskid 返回由某人标注 或审核的的文件列表和文件详情-->
<select id="getTaskBasicFile" parameterType="com.bonus.ai.domain.dataset.AnnotationTaskAnnotatorEntity" resultType="com.bonus.ai.domain.DataSetBasicFileEntity"> <select id="getTaskBasicFile" parameterType="com.bonus.ai.domain.dataset.AnnotationTaskEntity" resultType="com.bonus.ai.domain.DataSetBasicFileEntity">
SELECT SELECT
distinct adfm.file_id AS fileId, distinct adfm.file_id AS fileId,
abf.file_name AS fileName, abf.file_name AS fileName,
@ -264,12 +264,12 @@
AND atap.reviewer_id = #{reviewerId} AND atap.reviewer_id = #{reviewerId}
</if> </if>
<if test="fileAnnotationStatus != null and fileAnnotationStatus != '5'"> <if test="fileAnnotationStatus != null and fileAnnotationStatus != '5'">
AND atap.annotation_status = #{annotationStatus} AND atap.annotation_status = #{fileAnnotationStatus}
</if> </if>
</select> </select>
<!-- 根据taskid 和fileid 返回审核驳回的原因--> <!-- 根据taskid 和fileid 返回审核驳回的原因-->
<select id="getAuditFailReasonByFileId" parameterType="com.bonus.ai.domain.dataset.AnnotationTaskAnnotatorEntity" resultType="String"> <select id="getAuditFailReasonByFileId" parameterType="com.bonus.ai.domain.dataset.AnnotationTaskEntity" resultType="String">
SELECT SELECT
atap.audit_failed_reason atap.audit_failed_reason
FROM ai_basic_file abf FROM ai_basic_file abf