diff --git a/src/main/java/com/label/listener/ExtractionApprovedEventListener.java b/src/main/java/com/label/listener/ExtractionApprovedEventListener.java index 5f7a4e3..3cac541 100644 --- a/src/main/java/com/label/listener/ExtractionApprovedEventListener.java +++ b/src/main/java/com/label/listener/ExtractionApprovedEventListener.java @@ -8,8 +8,8 @@ import com.label.mapper.AnnotationResultMapper; import com.label.mapper.TrainingDatasetMapper; import com.label.entity.SourceData; import com.label.mapper.SourceDataMapper; -import com.label.module.task.service.TaskClaimService; -import com.label.module.task.service.TaskService; +import com.label.service.TaskClaimService; +import com.label.service.TaskService; import com.label.event.ExtractionApprovedEvent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/label/module/annotation/controller/ExtractionController.java b/src/main/java/com/label/module/annotation/controller/ExtractionController.java index 6dcef99..dee5d46 100644 --- a/src/main/java/com/label/module/annotation/controller/ExtractionController.java +++ b/src/main/java/com/label/module/annotation/controller/ExtractionController.java @@ -2,7 +2,7 @@ package com.label.module.annotation.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.annotation.service.ExtractionService; +import com.label.service.ExtractionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/annotation/controller/QaController.java b/src/main/java/com/label/module/annotation/controller/QaController.java index f87686d..887afb4 100644 --- a/src/main/java/com/label/module/annotation/controller/QaController.java +++ b/src/main/java/com/label/module/annotation/controller/QaController.java @@ -2,7 +2,7 @@ package com.label.module.annotation.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.annotation.service.QaService; +import com.label.service.QaService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/config/controller/SysConfigController.java b/src/main/java/com/label/module/config/controller/SysConfigController.java index 0c2267d..d81db75 100644 --- a/src/main/java/com/label/module/config/controller/SysConfigController.java +++ b/src/main/java/com/label/module/config/controller/SysConfigController.java @@ -3,7 +3,7 @@ package com.label.module.config.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; import com.label.entity.SysConfig; -import com.label.module.config.service.SysConfigService; +import com.label.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/export/controller/ExportController.java b/src/main/java/com/label/module/export/controller/ExportController.java index 64a43ac..99768e5 100644 --- a/src/main/java/com/label/module/export/controller/ExportController.java +++ b/src/main/java/com/label/module/export/controller/ExportController.java @@ -5,8 +5,8 @@ import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; import com.label.entity.TrainingDataset; import com.label.entity.ExportBatch; -import com.label.module.export.service.ExportService; -import com.label.module.export.service.FinetuneService; +import com.label.service.ExportService; +import com.label.service.FinetuneService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/source/controller/SourceController.java b/src/main/java/com/label/module/source/controller/SourceController.java index 937537c..ac6e1fd 100644 --- a/src/main/java/com/label/module/source/controller/SourceController.java +++ b/src/main/java/com/label/module/source/controller/SourceController.java @@ -4,7 +4,7 @@ import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; import com.label.dto.SourceResponse; -import com.label.module.source.service.SourceService; +import com.label.service.SourceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/task/controller/TaskController.java b/src/main/java/com/label/module/task/controller/TaskController.java index 1ff1d92..86fdbea 100644 --- a/src/main/java/com/label/module/task/controller/TaskController.java +++ b/src/main/java/com/label/module/task/controller/TaskController.java @@ -4,8 +4,8 @@ import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; import com.label.dto.TaskResponse; -import com.label.module.task.service.TaskClaimService; -import com.label.module.task.service.TaskService; +import com.label.service.TaskClaimService; +import com.label.service.TaskService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/user/controller/AuthController.java b/src/main/java/com/label/module/user/controller/AuthController.java index 78fab23..52df9aa 100644 --- a/src/main/java/com/label/module/user/controller/AuthController.java +++ b/src/main/java/com/label/module/user/controller/AuthController.java @@ -5,7 +5,7 @@ import com.label.common.shiro.TokenPrincipal; import com.label.dto.LoginRequest; import com.label.dto.LoginResponse; import com.label.dto.UserInfoResponse; -import com.label.module.user.service.AuthService; +import com.label.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/user/controller/UserController.java b/src/main/java/com/label/module/user/controller/UserController.java index 53a95a6..f47dcb1 100644 --- a/src/main/java/com/label/module/user/controller/UserController.java +++ b/src/main/java/com/label/module/user/controller/UserController.java @@ -16,7 +16,7 @@ import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; import com.label.entity.SysUser; -import com.label.module.user.service.UserService; +import com.label.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/label/module/video/controller/VideoController.java b/src/main/java/com/label/module/video/controller/VideoController.java index 9270477..34dbbb6 100644 --- a/src/main/java/com/label/module/video/controller/VideoController.java +++ b/src/main/java/com/label/module/video/controller/VideoController.java @@ -3,7 +3,7 @@ package com.label.module.video.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; import com.label.entity.VideoProcessJob; -import com.label.module.video.service.VideoProcessService; +import com.label.service.VideoProcessService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/label/module/user/service/AuthService.java b/src/main/java/com/label/service/AuthService.java similarity index 99% rename from src/main/java/com/label/module/user/service/AuthService.java rename to src/main/java/com/label/service/AuthService.java index 3ba2481..d6b8ca6 100644 --- a/src/main/java/com/label/module/user/service/AuthService.java +++ b/src/main/java/com/label/service/AuthService.java @@ -1,4 +1,4 @@ -package com.label.module.user.service; +package com.label.service; import com.label.common.exception.BusinessException; import com.label.common.redis.RedisKeyManager; diff --git a/src/main/java/com/label/module/export/service/ExportService.java b/src/main/java/com/label/service/ExportService.java similarity index 99% rename from src/main/java/com/label/module/export/service/ExportService.java rename to src/main/java/com/label/service/ExportService.java index 75a4f9f..6641afa 100644 --- a/src/main/java/com/label/module/export/service/ExportService.java +++ b/src/main/java/com/label/service/ExportService.java @@ -1,4 +1,4 @@ -package com.label.module.export.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/src/main/java/com/label/module/annotation/service/ExtractionService.java b/src/main/java/com/label/service/ExtractionService.java similarity index 99% rename from src/main/java/com/label/module/annotation/service/ExtractionService.java rename to src/main/java/com/label/service/ExtractionService.java index ef62a1d..e6d11e1 100644 --- a/src/main/java/com/label/module/annotation/service/ExtractionService.java +++ b/src/main/java/com/label/service/ExtractionService.java @@ -1,4 +1,4 @@ -package com.label.module.annotation.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.fasterxml.jackson.databind.ObjectMapper; @@ -16,7 +16,7 @@ import com.label.entity.SourceData; import com.label.mapper.SourceDataMapper; import com.label.entity.AnnotationTask; import com.label.mapper.AnnotationTaskMapper; -import com.label.module.task.service.TaskClaimService; +import com.label.service.TaskClaimService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/label/module/export/service/FinetuneService.java b/src/main/java/com/label/service/FinetuneService.java similarity index 99% rename from src/main/java/com/label/module/export/service/FinetuneService.java rename to src/main/java/com/label/service/FinetuneService.java index a7daab2..8f687df 100644 --- a/src/main/java/com/label/module/export/service/FinetuneService.java +++ b/src/main/java/com/label/service/FinetuneService.java @@ -1,4 +1,4 @@ -package com.label.module.export.service; +package com.label.service; import com.label.common.ai.AiServiceClient; import com.label.common.exception.BusinessException; diff --git a/src/main/java/com/label/module/annotation/service/QaService.java b/src/main/java/com/label/service/QaService.java similarity index 99% rename from src/main/java/com/label/module/annotation/service/QaService.java rename to src/main/java/com/label/service/QaService.java index 82289a1..976d07f 100644 --- a/src/main/java/com/label/module/annotation/service/QaService.java +++ b/src/main/java/com/label/service/QaService.java @@ -1,4 +1,4 @@ -package com.label.module.annotation.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.fasterxml.jackson.databind.ObjectMapper; @@ -12,7 +12,7 @@ import com.label.entity.SourceData; import com.label.mapper.SourceDataMapper; import com.label.entity.AnnotationTask; import com.label.mapper.AnnotationTaskMapper; -import com.label.module.task.service.TaskClaimService; +import com.label.service.TaskClaimService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/label/module/source/service/SourceService.java b/src/main/java/com/label/service/SourceService.java similarity index 99% rename from src/main/java/com/label/module/source/service/SourceService.java rename to src/main/java/com/label/service/SourceService.java index a15ce53..6f567c0 100644 --- a/src/main/java/com/label/module/source/service/SourceService.java +++ b/src/main/java/com/label/service/SourceService.java @@ -1,4 +1,4 @@ -package com.label.module.source.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/src/main/java/com/label/module/config/service/SysConfigService.java b/src/main/java/com/label/service/SysConfigService.java similarity index 99% rename from src/main/java/com/label/module/config/service/SysConfigService.java rename to src/main/java/com/label/service/SysConfigService.java index 3cc819a..f23ebd2 100644 --- a/src/main/java/com/label/module/config/service/SysConfigService.java +++ b/src/main/java/com/label/service/SysConfigService.java @@ -1,4 +1,4 @@ -package com.label.module.config.service; +package com.label.service; import com.label.common.exception.BusinessException; import com.label.entity.SysConfig; diff --git a/src/main/java/com/label/module/task/service/TaskClaimService.java b/src/main/java/com/label/service/TaskClaimService.java similarity index 99% rename from src/main/java/com/label/module/task/service/TaskClaimService.java rename to src/main/java/com/label/service/TaskClaimService.java index 52b6add..9ab317d 100644 --- a/src/main/java/com/label/module/task/service/TaskClaimService.java +++ b/src/main/java/com/label/service/TaskClaimService.java @@ -1,4 +1,4 @@ -package com.label.module.task.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.label.common.exception.BusinessException; diff --git a/src/main/java/com/label/module/task/service/TaskService.java b/src/main/java/com/label/service/TaskService.java similarity index 99% rename from src/main/java/com/label/module/task/service/TaskService.java rename to src/main/java/com/label/service/TaskService.java index 7062bd0..529da41 100644 --- a/src/main/java/com/label/module/task/service/TaskService.java +++ b/src/main/java/com/label/service/TaskService.java @@ -1,4 +1,4 @@ -package com.label.module.task.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; diff --git a/src/main/java/com/label/module/user/service/UserService.java b/src/main/java/com/label/service/UserService.java similarity index 99% rename from src/main/java/com/label/module/user/service/UserService.java rename to src/main/java/com/label/service/UserService.java index 3e9e2cc..def20f8 100644 --- a/src/main/java/com/label/module/user/service/UserService.java +++ b/src/main/java/com/label/service/UserService.java @@ -1,4 +1,4 @@ -package com.label.module.user.service; +package com.label.service; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/label/module/video/service/VideoProcessService.java b/src/main/java/com/label/service/VideoProcessService.java similarity index 99% rename from src/main/java/com/label/module/video/service/VideoProcessService.java rename to src/main/java/com/label/service/VideoProcessService.java index e154424..549a3f2 100644 --- a/src/main/java/com/label/module/video/service/VideoProcessService.java +++ b/src/main/java/com/label/service/VideoProcessService.java @@ -1,4 +1,4 @@ -package com.label.module.video.service; +package com.label.service; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.label.common.ai.AiServiceClient; diff --git a/src/test/java/com/label/unit/PackageStructureMigrationTest.java b/src/test/java/com/label/unit/PackageStructureMigrationTest.java index 3332d13..13b6fba 100644 --- a/src/test/java/com/label/unit/PackageStructureMigrationTest.java +++ b/src/test/java/com/label/unit/PackageStructureMigrationTest.java @@ -62,6 +62,25 @@ class PackageStructureMigrationTest { } } + @Test + @DisplayName("服务类已迁移到扁平 service 目录") + void serviceTypesMoved() { + for (String fqcn : java.util.List.of( + "com.label.service.ExtractionService", + "com.label.service.QaService", + "com.label.service.SysConfigService", + "com.label.service.ExportService", + "com.label.service.FinetuneService", + "com.label.service.SourceService", + "com.label.service.TaskClaimService", + "com.label.service.TaskService", + "com.label.service.AuthService", + "com.label.service.UserService", + "com.label.service.VideoProcessService")) { + assertClassExists(fqcn); + } + } + private static void assertClassExists(String fqcn) { assertThatCode(() -> Class.forName(fqcn)).doesNotThrowAnyException(); }