Merge commit 'd404c7d1879e1dc8854731e4c8d8578d92fccb1b'

2026-04-27 23:23:06 +08:00
parent 298e8eb35c d404c7d187
commit 1314e290d5
101 changed files with 3223 additions and 343 deletions
--- a/src/main/java/com/labelsys/backend/controller/AnnotationResultController.java
+++ b/src/main/java/com/labelsys/backend/controller/AnnotationResultController.java
@@ -0,0 +1,72 @@
+package com.labelsys.backend.controller;
+
+import com.labelsys.backend.annotation.RequirePosition;
+import com.labelsys.backend.common.Result;
+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;
+import com.labelsys.backend.dto.response.AnnotationResultCompareResponse;
+import com.labelsys.backend.dto.response.AnnotationResultResponse;
+import com.labelsys.backend.dto.response.MergeReviewResultResponse;
+import com.labelsys.backend.enums.UserPosition;
+import com.labelsys.backend.service.AnnotationResultArchiveService;
+import com.labelsys.backend.service.AnnotationResultService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "标注结果管理")
+@RestController
+@RequestMapping("/api/annotation-results")
+@RequiredArgsConstructor
+public class AnnotationResultController {
+
+    private final AnnotationResultService annotationResultService;
+    private final AnnotationResultArchiveService annotationResultArchiveService;
+
+    @Operation(summary = "分页查询标注结果")
+    @GetMapping
+    public Result<PageResult<AnnotationResultResponse>> page(@ParameterObject AnnotationResultPageQuery query) {
+        return Result.success(annotationResultService.pageResults(UserContext.requireUser(), query));
+    }
+
+    @Operation(summary = "查询标注结果详情")
+    @GetMapping("/{id}")
+    public Result<AnnotationResultResponse> detail(
+        @Parameter(description = "结果ID", example = "191000000000000401")
+        @PathVariable Long id
+    ) {
+        return Result.success(annotationResultService.getResult(UserContext.requireUser(), id));
+    }
+
+    @Operation(summary = "查询标注结果比对信息")
+    @RequirePosition(UserPosition.REVIEWER)
+    @GetMapping("/{id}/compare")
+    public Result<AnnotationResultCompareResponse> compare(
+        @Parameter(description = "结果ID", example = "191000000000000401")
+        @PathVariable Long id
+    ) {
+        return Result.success(annotationResultService.compareResult(UserContext.requireUser(), id));
+    }
+
+    @Operation(summary = "提交合并审核结果")
+    @RequirePosition(UserPosition.REVIEWER)
+    @PostMapping("/{id}/merge-review")
+    public Result<MergeReviewResultResponse> mergeReview(
+        @Parameter(description = "结果ID", example = "191000000000000401")
+        @PathVariable Long id,
+        @Valid @RequestBody MergeReviewResultRequest request
+    ) {
+        return Result.success(annotationResultArchiveService.mergeReview(UserContext.requireUser(), id, request));
+    }
+}
--- a/src/main/java/com/labelsys/backend/controller/AnnotationTaskController.java
+++ b/src/main/java/com/labelsys/backend/controller/AnnotationTaskController.java
@@ -0,0 +1,74 @@
+package com.labelsys.backend.controller;
+
+import com.labelsys.backend.common.Result;
+import com.labelsys.backend.context.UserContext;
+import com.labelsys.backend.dto.common.PageResult;
+import com.labelsys.backend.dto.request.AnnotationTaskPageQuery;
+import com.labelsys.backend.dto.request.CreateAnnotationTaskRequest;
+import com.labelsys.backend.dto.request.UpdateAnnotationTaskRequest;
+import com.labelsys.backend.dto.response.AnnotationTaskResponse;
+import com.labelsys.backend.service.AnnotationTaskService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "标注任务管理")
+@RestController
+@RequestMapping("/api/annotation-tasks")
+@RequiredArgsConstructor
+public class AnnotationTaskController {
+
+    private final AnnotationTaskService annotationTaskService;
+
+    @Operation(summary = "创建标注任务")
+    @PostMapping
+    public Result<AnnotationTaskResponse> create(@Valid @RequestBody CreateAnnotationTaskRequest request) {
+        return Result.success(annotationTaskService.createTask(UserContext.requireUser(), request));
+    }
+
+    @Operation(summary = "更新标注任务")
+    @PutMapping("/{id}")
+    public Result<AnnotationTaskResponse> update(
+        @Parameter(description = "任务ID", example = "191000000000000301")
+        @PathVariable Long id,
+        @Valid @RequestBody UpdateAnnotationTaskRequest request
+    ) {
+        return Result.success(annotationTaskService.updateTask(UserContext.requireUser(), id, request));
+    }
+
+    @Operation(summary = "分页查询标注任务")
+    @GetMapping
+    public Result<PageResult<AnnotationTaskResponse>> page(@ParameterObject AnnotationTaskPageQuery query) {
+        return Result.success(annotationTaskService.pageTasks(UserContext.requireUser(), query));
+    }
+
+    @Operation(summary = "查询标注任务详情")
+    @GetMapping("/{id}")
+    public Result<AnnotationTaskResponse> detail(
+        @Parameter(description = "任务ID", example = "191000000000000301")
+        @PathVariable Long id
+    ) {
+        return Result.success(annotationTaskService.getTask(UserContext.requireUser(), id));
+    }
+
+    @Operation(summary = "删除标注任务")
+    @DeleteMapping("/{id}")
+    public Result<Void> delete(
+        @Parameter(description = "任务ID", example = "191000000000000301")
+        @PathVariable Long id
+    ) {
+        annotationTaskService.deleteTask(UserContext.requireUser(), id);
+        return Result.success();
+    }
+}
--- a/src/main/java/com/labelsys/backend/controller/AuthController.java
+++ b/src/main/java/com/labelsys/backend/controller/AuthController.java
@@ -10,6 +10,7 @@ import com.labelsys.backend.dto.response.CurrentUserResponse;
 import com.labelsys.backend.dto.response.LoginResponse;
 import com.labelsys.backend.service.AuthService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
@@ -33,7 +34,10 @@ public class AuthController {

    @Operation(summary = "根据手机号查询可登录公司")
    @GetMapping("/companies")
-    public Result<List<CompanyOptionResponse>> listCompanies(@RequestParam String phone) {
+    public Result<List<CompanyOptionResponse>> listCompanies(
+        @Parameter(description = "手机号", example = "13800138000")
+        @RequestParam String phone
+    ) {
        return Result.success(authService.listAvailableCompanies(phone));
    }

@@ -52,7 +56,10 @@ public class AuthController {

    @Operation(summary = "退出登录")
    @PostMapping("/logout")
-    public Result<Void> logout(@RequestHeader(HttpHeaders.AUTHORIZATION) String authorization) {
+    public Result<Void> logout(
+        @Parameter(description = "Bearer 访问令牌", example = "Bearer eyJhbGciOiJIUzI1NiJ9.demo.token")
+        @RequestHeader(HttpHeaders.AUTHORIZATION) String authorization
+    ) {
        authService.logout(extractToken(authorization));
        return Result.success();
    }
--- a/src/main/java/com/labelsys/backend/controller/CompanyUserController.java
+++ b/src/main/java/com/labelsys/backend/controller/CompanyUserController.java
@@ -10,6 +10,7 @@ import com.labelsys.backend.dto.response.UserResponse;
 import com.labelsys.backend.enums.UserPosition;
 import com.labelsys.backend.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
@@ -45,14 +46,22 @@ public class CompanyUserController {

    @Operation(summary = "修改员工角色和岗位")
    @PutMapping("/{userId}/assignment")
-    public Result<Void> updateAssignment(@PathVariable Long userId, @Valid @RequestBody UpdateUserAssignmentRequest request) {
+    public Result<Void> updateAssignment(
+        @Parameter(description = "用户ID", example = "191000000000000021")
+        @PathVariable Long userId,
+        @Valid @RequestBody UpdateUserAssignmentRequest request
+    ) {
        userService.updateAssignment(UserContext.requireUser(), userId, request);
        return Result.success();
    }

    @Operation(summary = "修改员工状态")
    @PutMapping("/{userId}/status")
-    public Result<Void> updateStatus(@PathVariable Long userId, @Valid @RequestBody UpdateUserStatusRequest request) {
+    public Result<Void> updateStatus(
+        @Parameter(description = "用户ID", example = "191000000000000021")
+        @PathVariable Long userId,
+        @Valid @RequestBody UpdateUserStatusRequest request
+    ) {
        userService.updateStatus(UserContext.requireUser(), userId, request);
        return Result.success();
    }
--- a/src/main/java/com/labelsys/backend/controller/PlatformCompanyAdminController.java
+++ b/src/main/java/com/labelsys/backend/controller/PlatformCompanyAdminController.java
@@ -4,11 +4,13 @@ import com.labelsys.backend.annotation.RequirePosition;
 import com.labelsys.backend.common.Result;
 import com.labelsys.backend.context.UserContext;
 import com.labelsys.backend.dto.request.CreateCompanyAdminRequest;
+import com.labelsys.backend.dto.request.CreateSystemEngineerAdminRequest;
 import com.labelsys.backend.dto.request.UpdateUserStatusRequest;
 import com.labelsys.backend.dto.response.UserResponse;
 import com.labelsys.backend.enums.UserPosition;
 import com.labelsys.backend.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
@@ -25,7 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "平台公司管理员管理")
@RestController
@RequestMapping("/api/platform/company-admins")
-@RequirePosition(UserPosition.ADMIN)
+@RequirePosition(UserPosition.SUPER_ADMIN)
@RequiredArgsConstructor
 public class PlatformCompanyAdminController {

@@ -33,20 +35,37 @@ public class PlatformCompanyAdminController {

    @Operation(summary = "查询指定公司管理员列表")
    @GetMapping
-    public Result<List<UserResponse>> listCompanyAdmins(@RequestParam Long companyId) {
+    public Result<List<UserResponse>> listCompanyAdmins(
+        @Parameter(description = "公司ID", example = "191000000000000001")
+        @RequestParam Long companyId
+    ) {
        return Result.success(userService.listCompanyAdmins(UserContext.requireUser(), companyId).stream().map(UserResponse::from).toList());
    }

+    @Operation(summary = "查询所有公司用户列表")
+    @GetMapping("/all")
+    public Result<List<UserResponse>> listAllUsers() {
+        return Result.success(userService.listAllUsers(UserContext.requireUser()).stream().map(UserResponse::from).toList());
+    }
+
    @Operation(summary = "创建公司管理员")
    @PostMapping
    public Result<UserResponse> createCompanyAdmin(@Valid @RequestBody CreateCompanyAdminRequest request) {
        return Result.success(UserResponse.from(userService.createCompanyAdmin(UserContext.requireUser(), request)));
    }

+        @Operation(summary = "创建系统管理员")
+    @PostMapping("/system-engineer")
+    public Result<UserResponse> createSystemEngineerAdmin(@Valid @RequestBody CreateSystemEngineerAdminRequest request) {
+        return Result.success(UserResponse.from(userService.createSystemEngineerAdmin(UserContext.requireUser(), request)));
+    }
+
    @Operation(summary = "修改公司管理员状态")
    @PutMapping("/{companyId}/{userId}/status")
    public Result<Void> updateCompanyAdminStatus(
+        @Parameter(description = "公司ID", example = "191000000000000001")
        @PathVariable Long companyId,
+        @Parameter(description = "用户ID", example = "191000000000000021")
        @PathVariable Long userId,
        @Valid @RequestBody UpdateUserStatusRequest request
    ) {
--- a/src/main/java/com/labelsys/backend/controller/PlatformCompanyController.java
+++ b/src/main/java/com/labelsys/backend/controller/PlatformCompanyController.java
@@ -9,6 +9,7 @@ import com.labelsys.backend.dto.response.CompanyResponse;
 import com.labelsys.backend.enums.UserPosition;
 import com.labelsys.backend.service.CompanyService;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import java.util.List;
@@ -24,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
@Tag(name = "平台公司管理")
@RestController
@RequestMapping("/api/platform/companies")
-@RequirePosition(UserPosition.ADMIN)
+@RequirePosition(UserPosition.SUPER_ADMIN)
@RequiredArgsConstructor
 public class PlatformCompanyController {

@@ -44,7 +45,11 @@ public class PlatformCompanyController {

    @Operation(summary = "修改公司状态")
    @PutMapping("/{companyId}/status")
-    public Result<Void> updateCompanyStatus(@PathVariable Long companyId, @Valid @RequestBody UpdateCompanyStatusRequest request) {
+    public Result<Void> updateCompanyStatus(
+        @Parameter(description = "公司ID", example = "191000000000000001")
+        @PathVariable Long companyId,
+        @Valid @RequestBody UpdateCompanyStatusRequest request
+    ) {
        companyService.updateStatus(UserContext.requireUser(), companyId, request);
        return Result.success();
    }
--- a/src/main/java/com/labelsys/backend/controller/SourceResourceController.java
+++ b/src/main/java/com/labelsys/backend/controller/SourceResourceController.java
@@ -0,0 +1,62 @@
+package com.labelsys.backend.controller;
+
+import com.labelsys.backend.common.Result;
+import com.labelsys.backend.context.UserContext;
+import com.labelsys.backend.dto.common.PageResult;
+import com.labelsys.backend.dto.request.SourceResourcePageQuery;
+import com.labelsys.backend.dto.request.SourceUploadRequest;
+import com.labelsys.backend.dto.response.SourceResourceResponse;
+import com.labelsys.backend.dto.response.SourceUploadResponse;
+import com.labelsys.backend.service.SourceResourceService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "资源管理")
+@RestController
+@RequestMapping("/api/source-resources")
+@RequiredArgsConstructor
+public class SourceResourceController {
+
+    private final SourceResourceService sourceResourceService;
+
+    @Operation(summary = "上传资源")
+    @PostMapping("/upload")
+    public Result<SourceUploadResponse> upload(@ParameterObject @ModelAttribute SourceUploadRequest request) {
+        return Result.success(sourceResourceService.upload(UserContext.requireUser(), request));
+    }
+
+    @Operation(summary = "分页查询资源")
+    @GetMapping
+    public Result<PageResult<SourceResourceResponse>> page(@ParameterObject @ModelAttribute SourceResourcePageQuery query) {
+        return Result.success(sourceResourceService.pageResources(UserContext.requireUser(), query));
+    }
+
+    @Operation(summary = "查询资源详情")
+    @GetMapping("/{id}")
+    public Result<SourceResourceResponse> detail(
+        @Parameter(description = "资源ID", example = "191000000000000101")
+        @PathVariable Long id
+    ) {
+        return Result.success(sourceResourceService.getResource(UserContext.requireUser(), id));
+    }
+
+    @Operation(summary = "删除资源")
+    @DeleteMapping("/{id}")
+    public Result<Void> delete(
+        @Parameter(description = "资源ID", example = "191000000000000101")
+        @PathVariable Long id
+    ) {
+        sourceResourceService.deleteResource(UserContext.requireUser(), id);
+        return Result.success();
+    }
+}
--- a/src/main/java/com/labelsys/backend/controller/SysConfigController.java
+++ b/src/main/java/com/labelsys/backend/controller/SysConfigController.java
@@ -0,0 +1,66 @@
+package com.labelsys.backend.controller;
+
+import com.labelsys.backend.annotation.RequirePosition;
+import com.labelsys.backend.common.Result;
+import com.labelsys.backend.context.UserContext;
+import com.labelsys.backend.dto.common.PageResult;
+import com.labelsys.backend.dto.request.SaveSysConfigRequest;
+import com.labelsys.backend.dto.request.SysConfigPageQuery;
+import com.labelsys.backend.dto.response.SysConfigResponse;
+import com.labelsys.backend.enums.UserPosition;
+import com.labelsys.backend.service.SysConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name = "系统配置管理")
+@RestController
+@RequestMapping("/api/sys-configs")
+@RequiredArgsConstructor
+public class SysConfigController {
+
+    private final SysConfigService sysConfigService;
+
+    @Operation(summary = "创建系统配置")
+    @RequirePosition(UserPosition.ADMIN)
+    @PostMapping
+    public Result<SysConfigResponse> create(@Valid @RequestBody SaveSysConfigRequest request) {
+        return Result.success(sysConfigService.toResponse(sysConfigService.saveConfig(UserContext.requireUser(), request)));
+    }
+
+    @Operation(summary = "更新系统配置")
+    @RequirePosition(UserPosition.ADMIN)
+    @PutMapping("/{id}")
+    public Result<SysConfigResponse> update(
+        @Parameter(description = "配置ID", example = "191000000000000501")
+        @PathVariable Long id,
+        @Valid @RequestBody SaveSysConfigRequest request
+    ) {
+        return Result.success(sysConfigService.toResponse(sysConfigService.updateConfig(UserContext.requireUser(), id, request)));
+    }
+
+    @Operation(summary = "分页查询系统配置")
+    @GetMapping
+    public Result<PageResult<SysConfigResponse>> page(@ParameterObject SysConfigPageQuery query) {
+        return Result.success(sysConfigService.pageConfigs(UserContext.requireUser(), query));
+    }
+
+    @Operation(summary = "查询系统配置详情")
+    @GetMapping("/{id}")
+    public Result<SysConfigResponse> detail(
+        @Parameter(description = "配置ID", example = "191000000000000501")
+        @PathVariable Long id
+    ) {
+        return Result.success(sysConfigService.getConfig(UserContext.requireUser(), id));
+    }
+}