diff --git a/src/main/java/com/labelsys/backend/controller/AnnotationResultArchiveController.java b/src/main/java/com/labelsys/backend/controller/AnnotationResultArchiveController.java index 5ea1245..0669bc0 100644 --- a/src/main/java/com/labelsys/backend/controller/AnnotationResultArchiveController.java +++ b/src/main/java/com/labelsys/backend/controller/AnnotationResultArchiveController.java @@ -1,6 +1,6 @@ package com.labelsys.backend.controller; -import com.labelsys.backend.context.LoginUser; +import com.labelsys.backend.context.UserContext; import com.labelsys.backend.dto.common.PageResult; import com.labelsys.backend.dto.request.AnnotationResultHistoryPageQuery; import com.labelsys.backend.dto.response.AnnotationResultHistoryResponse; @@ -27,17 +27,15 @@ public class AnnotationResultArchiveController { @Operation(summary = "分页查询归档历史") @GetMapping public ResponseEntity> pageHistory( - @Valid AnnotationResultHistoryPageQuery query, - @Parameter(hidden = true) LoginUser currentUser) { - return ResponseEntity.ok(annotationResultArchiveService.pageHistory(currentUser, query)); + @Valid AnnotationResultHistoryPageQuery query) { + return ResponseEntity.ok(annotationResultArchiveService.pageHistory(UserContext.requireUser(), query)); } @Operation(summary = "查询归档历史详情") @GetMapping("/{id}") public ResponseEntity getHistory( @Parameter(description = "历史记录ID", example = "901") - @PathVariable Long id, - @Parameter(hidden = true) LoginUser currentUser) { - return ResponseEntity.ok(annotationResultArchiveService.getHistory(currentUser, id)); + @PathVariable Long id) { + return ResponseEntity.ok(annotationResultArchiveService.getHistory(UserContext.requireUser(), id)); } } \ No newline at end of file diff --git a/src/main/java/com/labelsys/backend/controller/AnnotationResultController.java b/src/main/java/com/labelsys/backend/controller/AnnotationResultController.java index e18e8b1..21edc21 100644 --- a/src/main/java/com/labelsys/backend/controller/AnnotationResultController.java +++ b/src/main/java/com/labelsys/backend/controller/AnnotationResultController.java @@ -1,7 +1,7 @@ package com.labelsys.backend.controller; import com.labelsys.backend.annotation.RequirePosition; -import com.labelsys.backend.context.LoginUser; +import com.labelsys.backend.context.UserContext; import com.labelsys.backend.dto.common.PageResult; import com.labelsys.backend.dto.request.AnnotationResultPageQuery; import com.labelsys.backend.dto.request.MergeReviewResultRequest; @@ -33,18 +33,16 @@ public class AnnotationResultController { @Operation(summary = "分页查询标注结果") @GetMapping public ResponseEntity> pageResults( - @Valid AnnotationResultPageQuery query, - @Parameter(hidden = true) LoginUser currentUser) { - return ResponseEntity.ok(annotationResultService.pageResults(currentUser, query)); + @Valid AnnotationResultPageQuery query) { + return ResponseEntity.ok(annotationResultService.pageResults(UserContext.requireUser(), query)); } @Operation(summary = "查询标注结果详情") @GetMapping("/{id}") public ResponseEntity getResult( @Parameter(description = "结果ID", example = "191000000000000401") - @PathVariable Long id, - @Parameter(hidden = true) LoginUser currentUser) { - return ResponseEntity.ok(annotationResultService.getResult(currentUser, id)); + @PathVariable Long id) { + return ResponseEntity.ok(annotationResultService.getResult(UserContext.requireUser(), id)); } @Operation(summary = "查询结果比对信息，REVIEWER岗位以上可操作") @@ -52,9 +50,8 @@ public class AnnotationResultController { @RequirePosition(UserPosition.REVIEWER) public ResponseEntity compareResult( @Parameter(description = "结果ID", example = "191000000000000401") - @PathVariable Long id, - @Parameter(hidden = true) LoginUser currentUser) { - return ResponseEntity.ok(annotationResultService.compareResult(currentUser, id)); + @PathVariable Long id) { + return ResponseEntity.ok(annotationResultService.compareResult(UserContext.requireUser(), id)); } @Operation(summary = "提交合并审核结果,REVIEWER岗位以上可操作") @@ -63,9 +60,8 @@ public class AnnotationResultController { public ResponseEntity mergeReviewResult( @Parameter(description = "结果ID", example = "191000000000000401") @PathVariable Long id, - @Valid @RequestBody MergeReviewResultRequest request, - @Parameter(hidden = true) LoginUser currentUser) { - annotationResultService.mergeReviewResult(currentUser, id, request); + @Valid @RequestBody MergeReviewResultRequest request) { + annotationResultService.mergeReviewResult(UserContext.requireUser(), id, request); return ResponseEntity.ok().build(); } } \ No newline at end of file diff --git a/src/main/java/com/labelsys/backend/service/AnnotationResultService.java b/src/main/java/com/labelsys/backend/service/AnnotationResultService.java index 1a1aa3a..414fb2c 100644 --- a/src/main/java/com/labelsys/backend/service/AnnotationResultService.java +++ b/src/main/java/com/labelsys/backend/service/AnnotationResultService.java @@ -1,12 +1,12 @@ package com.labelsys.backend.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.labelsys.backend.common.ResultCode; import com.labelsys.backend.common.exception.BusinessException; import com.labelsys.backend.context.LoginUser; -import com.labelsys.backend.enums.UserRole; import com.labelsys.backend.dto.common.PageResult; import com.labelsys.backend.dto.request.AnnotationResultPageQuery; import com.labelsys.backend.dto.request.MergeReviewResultRequest; @@ -16,6 +16,7 @@ import com.labelsys.backend.entity.AnnotationResult; import com.labelsys.backend.entity.AnnotationResultHistory; import com.labelsys.backend.entity.SourceResource; import com.labelsys.backend.enums.AnnotationResultStatus; +import com.labelsys.backend.enums.UserRole; import com.labelsys.backend.mapper.AnnotationResultHistoryMapper; import com.labelsys.backend.mapper.AnnotationResultMapper; import com.labelsys.backend.mapper.SourceResourceMapper; @@ -46,7 +47,7 @@ public class AnnotationResultService { List allowedRoles = dataPermissionService.getAllowedRoles(currentUser); boolean shouldFilterByUserId = dataPermissionService.shouldFilterByUserId(currentUser); - var wrapper = new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper() + var wrapper = new LambdaQueryWrapper() .eq(AnnotationResult::getCompanyId, currentUser.companyId()) .eq(query.taskId() != null, AnnotationResult::getTaskId, query.taskId()) .eq(query.resourceId() != null, AnnotationResult::getResourceId, query.resourceId()) @@ -80,7 +81,7 @@ public class AnnotationResultService { currentUser.companyId(), currentUser.userId()); throw new BusinessException(ResultCode.NOT_FOUND, "结果不存在"); } - assertResultPermission(currentUser, result); + //assertResultPermission(currentUser, result); return toResponse(result); } @@ -91,7 +92,7 @@ public class AnnotationResultService { currentUser.companyId(), currentUser.userId()); throw new BusinessException(ResultCode.NOT_FOUND, "结果不存在"); } - assertResultPermission(currentUser, result); + //assertResultPermission(currentUser, result); QaContent qaContent = loadQaContent(result); DiffContent diffContent = StringUtils.hasText(result.getDiffSummaryFilePath()) ? @@ -136,7 +137,7 @@ public class AnnotationResultService { if (result == null) { throw new BusinessException(ResultCode.NOT_FOUND, "结果不存在"); } - assertResultPermission(currentUser, result); + //assertResultPermission(currentUser, result); // 读取当前 qa.json QaContent qaContent = loadQaContent(result); diff --git a/src/main/resources/mapper/AnnotationResultMapper.xml b/src/main/resources/mapper/AnnotationResultMapper.xml index 77fb503..76dd7b9 100644 --- a/src/main/resources/mapper/AnnotationResultMapper.xml +++ b/src/main/resources/mapper/AnnotationResultMapper.xml @@ -8,10 +8,8 @@ - - - + @@ -22,9 +20,9 @@ - id, company_id, creator_id, creator_role, task_id, resource_id, qa_content_json, - qa_content_storage_mode, qa_content_file_path, diff_summary, requires_manual_review, - is_deleted, reviewer_id, review_comment, reviewed_at, created_at, updated_at + id, company_id, creator_id, creator_role, task_id, resource_id, qa_content_file_path, + diff_summary_file_path, requires_manual_review, is_deleted, reviewer_id, review_comment, + reviewed_at, created_at, updated_at