diff --git a/src/main/java/com/label/module/user/dto/LoginRequest.java b/src/main/java/com/label/dto/LoginRequest.java similarity index 94% rename from src/main/java/com/label/module/user/dto/LoginRequest.java rename to src/main/java/com/label/dto/LoginRequest.java index e71d4b2..320d048 100644 --- a/src/main/java/com/label/module/user/dto/LoginRequest.java +++ b/src/main/java/com/label/dto/LoginRequest.java @@ -1,4 +1,4 @@ -package com.label.module.user.dto; +package com.label.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/label/module/user/dto/LoginResponse.java b/src/main/java/com/label/dto/LoginResponse.java similarity index 96% rename from src/main/java/com/label/module/user/dto/LoginResponse.java rename to src/main/java/com/label/dto/LoginResponse.java index 6ed6a5c..7d9d923 100644 --- a/src/main/java/com/label/module/user/dto/LoginResponse.java +++ b/src/main/java/com/label/dto/LoginResponse.java @@ -1,4 +1,4 @@ -package com.label.module.user.dto; +package com.label.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/label/module/source/dto/SourceResponse.java b/src/main/java/com/label/dto/SourceResponse.java similarity index 97% rename from src/main/java/com/label/module/source/dto/SourceResponse.java rename to src/main/java/com/label/dto/SourceResponse.java index fa3a088..857d0a2 100644 --- a/src/main/java/com/label/module/source/dto/SourceResponse.java +++ b/src/main/java/com/label/dto/SourceResponse.java @@ -1,4 +1,4 @@ -package com.label.module.source.dto; +package com.label.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/label/module/task/dto/TaskResponse.java b/src/main/java/com/label/dto/TaskResponse.java similarity index 97% rename from src/main/java/com/label/module/task/dto/TaskResponse.java rename to src/main/java/com/label/dto/TaskResponse.java index caa7397..555088f 100644 --- a/src/main/java/com/label/module/task/dto/TaskResponse.java +++ b/src/main/java/com/label/dto/TaskResponse.java @@ -1,4 +1,4 @@ -package com.label.module.task.dto; +package com.label.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/label/module/user/dto/UserInfoResponse.java b/src/main/java/com/label/dto/UserInfoResponse.java similarity index 95% rename from src/main/java/com/label/module/user/dto/UserInfoResponse.java rename to src/main/java/com/label/dto/UserInfoResponse.java index bf60ae0..45bddd8 100644 --- a/src/main/java/com/label/module/user/dto/UserInfoResponse.java +++ b/src/main/java/com/label/dto/UserInfoResponse.java @@ -1,4 +1,4 @@ -package com.label.module.user.dto; +package com.label.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/label/module/annotation/entity/AnnotationResult.java b/src/main/java/com/label/entity/AnnotationResult.java similarity index 94% rename from src/main/java/com/label/module/annotation/entity/AnnotationResult.java rename to src/main/java/com/label/entity/AnnotationResult.java index 6b9dce1..9e7461c 100644 --- a/src/main/java/com/label/module/annotation/entity/AnnotationResult.java +++ b/src/main/java/com/label/entity/AnnotationResult.java @@ -1,4 +1,4 @@ -package com.label.module.annotation.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/task/entity/AnnotationTask.java b/src/main/java/com/label/entity/AnnotationTask.java similarity index 97% rename from src/main/java/com/label/module/task/entity/AnnotationTask.java rename to src/main/java/com/label/entity/AnnotationTask.java index c8fcce7..d171801 100644 --- a/src/main/java/com/label/module/task/entity/AnnotationTask.java +++ b/src/main/java/com/label/entity/AnnotationTask.java @@ -1,4 +1,4 @@ -package com.label.module.task.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/task/entity/AnnotationTaskHistory.java b/src/main/java/com/label/entity/AnnotationTaskHistory.java similarity index 96% rename from src/main/java/com/label/module/task/entity/AnnotationTaskHistory.java rename to src/main/java/com/label/entity/AnnotationTaskHistory.java index 6e2c638..f114f45 100644 --- a/src/main/java/com/label/module/task/entity/AnnotationTaskHistory.java +++ b/src/main/java/com/label/entity/AnnotationTaskHistory.java @@ -1,4 +1,4 @@ -package com.label.module.task.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/export/entity/ExportBatch.java b/src/main/java/com/label/entity/ExportBatch.java similarity index 96% rename from src/main/java/com/label/module/export/entity/ExportBatch.java rename to src/main/java/com/label/entity/ExportBatch.java index d7447b0..299b083 100644 --- a/src/main/java/com/label/module/export/entity/ExportBatch.java +++ b/src/main/java/com/label/entity/ExportBatch.java @@ -1,4 +1,4 @@ -package com.label.module.export.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/source/entity/SourceData.java b/src/main/java/com/label/entity/SourceData.java similarity index 97% rename from src/main/java/com/label/module/source/entity/SourceData.java rename to src/main/java/com/label/entity/SourceData.java index 81a342e..3d11893 100644 --- a/src/main/java/com/label/module/source/entity/SourceData.java +++ b/src/main/java/com/label/entity/SourceData.java @@ -1,4 +1,4 @@ -package com.label.module.source.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/user/entity/SysCompany.java b/src/main/java/com/label/entity/SysCompany.java similarity index 95% rename from src/main/java/com/label/module/user/entity/SysCompany.java rename to src/main/java/com/label/entity/SysCompany.java index 9f79582..70fcaa4 100644 --- a/src/main/java/com/label/module/user/entity/SysCompany.java +++ b/src/main/java/com/label/entity/SysCompany.java @@ -1,4 +1,4 @@ -package com.label.module.user.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/config/entity/SysConfig.java b/src/main/java/com/label/entity/SysConfig.java similarity index 96% rename from src/main/java/com/label/module/config/entity/SysConfig.java rename to src/main/java/com/label/entity/SysConfig.java index f28e4fb..94978be 100644 --- a/src/main/java/com/label/module/config/entity/SysConfig.java +++ b/src/main/java/com/label/entity/SysConfig.java @@ -1,4 +1,4 @@ -package com.label.module.config.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/user/entity/SysUser.java b/src/main/java/com/label/entity/SysUser.java similarity index 96% rename from src/main/java/com/label/module/user/entity/SysUser.java rename to src/main/java/com/label/entity/SysUser.java index 95307f7..1f67e34 100644 --- a/src/main/java/com/label/module/user/entity/SysUser.java +++ b/src/main/java/com/label/entity/SysUser.java @@ -1,4 +1,4 @@ -package com.label.module.user.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/annotation/entity/TrainingDataset.java b/src/main/java/com/label/entity/TrainingDataset.java similarity index 95% rename from src/main/java/com/label/module/annotation/entity/TrainingDataset.java rename to src/main/java/com/label/entity/TrainingDataset.java index feafa45..0811713 100644 --- a/src/main/java/com/label/module/annotation/entity/TrainingDataset.java +++ b/src/main/java/com/label/entity/TrainingDataset.java @@ -1,4 +1,4 @@ -package com.label.module.annotation.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/module/video/entity/VideoProcessJob.java b/src/main/java/com/label/entity/VideoProcessJob.java similarity index 97% rename from src/main/java/com/label/module/video/entity/VideoProcessJob.java rename to src/main/java/com/label/entity/VideoProcessJob.java index b4833e6..d039929 100644 --- a/src/main/java/com/label/module/video/entity/VideoProcessJob.java +++ b/src/main/java/com/label/entity/VideoProcessJob.java @@ -1,4 +1,4 @@ -package com.label.module.video.entity; +package com.label.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/label/listener/ExtractionApprovedEventListener.java b/src/main/java/com/label/listener/ExtractionApprovedEventListener.java index 6e222ae..5f7a4e3 100644 --- a/src/main/java/com/label/listener/ExtractionApprovedEventListener.java +++ b/src/main/java/com/label/listener/ExtractionApprovedEventListener.java @@ -3,11 +3,11 @@ package com.label.listener; import com.fasterxml.jackson.databind.ObjectMapper; import com.label.common.ai.AiServiceClient; import com.label.common.context.CompanyContext; -import com.label.module.annotation.entity.TrainingDataset; -import com.label.module.annotation.mapper.AnnotationResultMapper; -import com.label.module.annotation.mapper.TrainingDatasetMapper; -import com.label.module.source.entity.SourceData; -import com.label.module.source.mapper.SourceDataMapper; +import com.label.entity.TrainingDataset; +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.event.ExtractionApprovedEvent; diff --git a/src/main/java/com/label/module/annotation/mapper/AnnotationResultMapper.java b/src/main/java/com/label/mapper/AnnotationResultMapper.java similarity index 91% rename from src/main/java/com/label/module/annotation/mapper/AnnotationResultMapper.java rename to src/main/java/com/label/mapper/AnnotationResultMapper.java index 4290c62..c7d8804 100644 --- a/src/main/java/com/label/module/annotation/mapper/AnnotationResultMapper.java +++ b/src/main/java/com/label/mapper/AnnotationResultMapper.java @@ -1,7 +1,7 @@ -package com.label.module.annotation.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.annotation.entity.AnnotationResult; +import com.label.entity.AnnotationResult; import org.apache.ibatis.annotations.*; /** diff --git a/src/main/java/com/label/module/task/mapper/AnnotationTaskMapper.java b/src/main/java/com/label/mapper/AnnotationTaskMapper.java similarity index 92% rename from src/main/java/com/label/module/task/mapper/AnnotationTaskMapper.java rename to src/main/java/com/label/mapper/AnnotationTaskMapper.java index 3159e54..0a17128 100644 --- a/src/main/java/com/label/module/task/mapper/AnnotationTaskMapper.java +++ b/src/main/java/com/label/mapper/AnnotationTaskMapper.java @@ -1,7 +1,7 @@ -package com.label.module.task.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.task.entity.AnnotationTask; +import com.label.entity.AnnotationTask; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/label/module/export/mapper/ExportBatchMapper.java b/src/main/java/com/label/mapper/ExportBatchMapper.java similarity index 92% rename from src/main/java/com/label/module/export/mapper/ExportBatchMapper.java rename to src/main/java/com/label/mapper/ExportBatchMapper.java index acbb1d8..f27b041 100644 --- a/src/main/java/com/label/module/export/mapper/ExportBatchMapper.java +++ b/src/main/java/com/label/mapper/ExportBatchMapper.java @@ -1,7 +1,7 @@ -package com.label.module.export.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.export.entity.ExportBatch; +import com.label.entity.ExportBatch; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/label/module/source/mapper/SourceDataMapper.java b/src/main/java/com/label/mapper/SourceDataMapper.java similarity index 90% rename from src/main/java/com/label/module/source/mapper/SourceDataMapper.java rename to src/main/java/com/label/mapper/SourceDataMapper.java index c6ea424..29b20df 100644 --- a/src/main/java/com/label/module/source/mapper/SourceDataMapper.java +++ b/src/main/java/com/label/mapper/SourceDataMapper.java @@ -1,7 +1,7 @@ -package com.label.module.source.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.source.entity.SourceData; +import com.label.entity.SourceData; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/label/module/user/mapper/SysCompanyMapper.java b/src/main/java/com/label/mapper/SysCompanyMapper.java similarity index 88% rename from src/main/java/com/label/module/user/mapper/SysCompanyMapper.java rename to src/main/java/com/label/mapper/SysCompanyMapper.java index f22b053..7d0b32b 100644 --- a/src/main/java/com/label/module/user/mapper/SysCompanyMapper.java +++ b/src/main/java/com/label/mapper/SysCompanyMapper.java @@ -1,7 +1,7 @@ -package com.label.module.user.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.user.entity.SysCompany; +import com.label.entity.SysCompany; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/label/module/config/mapper/SysConfigMapper.java b/src/main/java/com/label/mapper/SysConfigMapper.java similarity index 94% rename from src/main/java/com/label/module/config/mapper/SysConfigMapper.java rename to src/main/java/com/label/mapper/SysConfigMapper.java index c63c5c9..a952ba0 100644 --- a/src/main/java/com/label/module/config/mapper/SysConfigMapper.java +++ b/src/main/java/com/label/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.label.module.config.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.config.entity.SysConfig; +import com.label.entity.SysConfig; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/label/module/user/mapper/SysUserMapper.java b/src/main/java/com/label/mapper/SysUserMapper.java similarity index 93% rename from src/main/java/com/label/module/user/mapper/SysUserMapper.java rename to src/main/java/com/label/mapper/SysUserMapper.java index fae02b5..79033ff 100644 --- a/src/main/java/com/label/module/user/mapper/SysUserMapper.java +++ b/src/main/java/com/label/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ -package com.label.module.user.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.user.entity.SysUser; +import com.label.entity.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/src/main/java/com/label/module/task/mapper/TaskHistoryMapper.java b/src/main/java/com/label/mapper/TaskHistoryMapper.java similarity index 79% rename from src/main/java/com/label/module/task/mapper/TaskHistoryMapper.java rename to src/main/java/com/label/mapper/TaskHistoryMapper.java index c4f2f2a..3b6a233 100644 --- a/src/main/java/com/label/module/task/mapper/TaskHistoryMapper.java +++ b/src/main/java/com/label/mapper/TaskHistoryMapper.java @@ -1,7 +1,7 @@ -package com.label.module.task.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.task.entity.AnnotationTaskHistory; +import com.label.entity.AnnotationTaskHistory; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/label/module/annotation/mapper/TrainingDatasetMapper.java b/src/main/java/com/label/mapper/TrainingDatasetMapper.java similarity index 91% rename from src/main/java/com/label/module/annotation/mapper/TrainingDatasetMapper.java rename to src/main/java/com/label/mapper/TrainingDatasetMapper.java index 94eefde..e1759de 100644 --- a/src/main/java/com/label/module/annotation/mapper/TrainingDatasetMapper.java +++ b/src/main/java/com/label/mapper/TrainingDatasetMapper.java @@ -1,7 +1,7 @@ -package com.label.module.annotation.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.annotation.entity.TrainingDataset; +import com.label.entity.TrainingDataset; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/src/main/java/com/label/module/video/mapper/VideoProcessJobMapper.java b/src/main/java/com/label/mapper/VideoProcessJobMapper.java similarity index 71% rename from src/main/java/com/label/module/video/mapper/VideoProcessJobMapper.java rename to src/main/java/com/label/mapper/VideoProcessJobMapper.java index a90ea58..68a98c3 100644 --- a/src/main/java/com/label/module/video/mapper/VideoProcessJobMapper.java +++ b/src/main/java/com/label/mapper/VideoProcessJobMapper.java @@ -1,7 +1,7 @@ -package com.label.module.video.mapper; +package com.label.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.label.module.video.entity.VideoProcessJob; +import com.label.entity.VideoProcessJob; import org.apache.ibatis.annotations.Mapper; /** diff --git a/src/main/java/com/label/module/annotation/service/ExtractionService.java b/src/main/java/com/label/module/annotation/service/ExtractionService.java index 0bdd7b6..ef62a1d 100644 --- a/src/main/java/com/label/module/annotation/service/ExtractionService.java +++ b/src/main/java/com/label/module/annotation/service/ExtractionService.java @@ -7,15 +7,15 @@ import com.label.common.exception.BusinessException; import com.label.common.shiro.TokenPrincipal; import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.TaskStatus; -import com.label.module.annotation.entity.AnnotationResult; -import com.label.module.annotation.entity.TrainingDataset; +import com.label.entity.AnnotationResult; +import com.label.entity.TrainingDataset; import com.label.event.ExtractionApprovedEvent; -import com.label.module.annotation.mapper.AnnotationResultMapper; -import com.label.module.annotation.mapper.TrainingDatasetMapper; -import com.label.module.source.entity.SourceData; -import com.label.module.source.mapper.SourceDataMapper; -import com.label.module.task.entity.AnnotationTask; -import com.label.module.task.mapper.AnnotationTaskMapper; +import com.label.mapper.AnnotationResultMapper; +import com.label.mapper.TrainingDatasetMapper; +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 lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/label/module/annotation/service/QaService.java b/src/main/java/com/label/module/annotation/service/QaService.java index ca7576a..82289a1 100644 --- a/src/main/java/com/label/module/annotation/service/QaService.java +++ b/src/main/java/com/label/module/annotation/service/QaService.java @@ -6,12 +6,12 @@ import com.label.common.exception.BusinessException; import com.label.common.shiro.TokenPrincipal; import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.TaskStatus; -import com.label.module.annotation.entity.TrainingDataset; -import com.label.module.annotation.mapper.TrainingDatasetMapper; -import com.label.module.source.entity.SourceData; -import com.label.module.source.mapper.SourceDataMapper; -import com.label.module.task.entity.AnnotationTask; -import com.label.module.task.mapper.AnnotationTaskMapper; +import com.label.entity.TrainingDataset; +import com.label.mapper.TrainingDatasetMapper; +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 lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 e53aebd..0c2267d 100644 --- a/src/main/java/com/label/module/config/controller/SysConfigController.java +++ b/src/main/java/com/label/module/config/controller/SysConfigController.java @@ -2,7 +2,7 @@ package com.label.module.config.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.config.entity.SysConfig; +import com.label.entity.SysConfig; import com.label.module.config.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/label/module/config/service/SysConfigService.java b/src/main/java/com/label/module/config/service/SysConfigService.java index 5e0d01e..3cc819a 100644 --- a/src/main/java/com/label/module/config/service/SysConfigService.java +++ b/src/main/java/com/label/module/config/service/SysConfigService.java @@ -1,8 +1,8 @@ package com.label.module.config.service; import com.label.common.exception.BusinessException; -import com.label.module.config.entity.SysConfig; -import com.label.module.config.mapper.SysConfigMapper; +import com.label.entity.SysConfig; +import com.label.mapper.SysConfigMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; 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 b60e7a5..64a43ac 100644 --- a/src/main/java/com/label/module/export/controller/ExportController.java +++ b/src/main/java/com/label/module/export/controller/ExportController.java @@ -3,8 +3,8 @@ package com.label.module.export.controller; import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.annotation.entity.TrainingDataset; -import com.label.module.export.entity.ExportBatch; +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 io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/label/module/export/service/ExportService.java b/src/main/java/com/label/module/export/service/ExportService.java index 75361fc..75a4f9f 100644 --- a/src/main/java/com/label/module/export/service/ExportService.java +++ b/src/main/java/com/label/module/export/service/ExportService.java @@ -7,10 +7,10 @@ import com.label.common.exception.BusinessException; import com.label.common.result.PageResult; import com.label.common.shiro.TokenPrincipal; import com.label.common.storage.RustFsClient; -import com.label.module.annotation.entity.TrainingDataset; -import com.label.module.annotation.mapper.TrainingDatasetMapper; -import com.label.module.export.entity.ExportBatch; -import com.label.module.export.mapper.ExportBatchMapper; +import com.label.entity.TrainingDataset; +import com.label.mapper.TrainingDatasetMapper; +import com.label.entity.ExportBatch; +import com.label.mapper.ExportBatchMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/label/module/export/service/FinetuneService.java b/src/main/java/com/label/module/export/service/FinetuneService.java index 0359fc0..a7daab2 100644 --- a/src/main/java/com/label/module/export/service/FinetuneService.java +++ b/src/main/java/com/label/module/export/service/FinetuneService.java @@ -3,8 +3,8 @@ package com.label.module.export.service; import com.label.common.ai.AiServiceClient; import com.label.common.exception.BusinessException; import com.label.common.shiro.TokenPrincipal; -import com.label.module.export.entity.ExportBatch; -import com.label.module.export.mapper.ExportBatchMapper; +import com.label.entity.ExportBatch; +import com.label.mapper.ExportBatchMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; 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 379272f..937537c 100644 --- a/src/main/java/com/label/module/source/controller/SourceController.java +++ b/src/main/java/com/label/module/source/controller/SourceController.java @@ -3,7 +3,7 @@ package com.label.module.source.controller; import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.source.dto.SourceResponse; +import com.label.dto.SourceResponse; import com.label.module.source.service.SourceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/label/module/source/service/SourceService.java b/src/main/java/com/label/module/source/service/SourceService.java index f4bb740..a15ce53 100644 --- a/src/main/java/com/label/module/source/service/SourceService.java +++ b/src/main/java/com/label/module/source/service/SourceService.java @@ -7,9 +7,9 @@ import com.label.common.exception.BusinessException; import com.label.common.result.PageResult; import com.label.common.shiro.TokenPrincipal; import com.label.common.storage.RustFsClient; -import com.label.module.source.dto.SourceResponse; -import com.label.module.source.entity.SourceData; -import com.label.module.source.mapper.SourceDataMapper; +import com.label.dto.SourceResponse; +import com.label.entity.SourceData; +import com.label.mapper.SourceDataMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; 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 a9563c6..1ff1d92 100644 --- a/src/main/java/com/label/module/task/controller/TaskController.java +++ b/src/main/java/com/label/module/task/controller/TaskController.java @@ -3,7 +3,7 @@ package com.label.module.task.controller; import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.task.dto.TaskResponse; +import com.label.dto.TaskResponse; import com.label.module.task.service.TaskClaimService; import com.label.module.task.service.TaskService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/label/module/task/service/TaskClaimService.java b/src/main/java/com/label/module/task/service/TaskClaimService.java index 9f8f883..52b6add 100644 --- a/src/main/java/com/label/module/task/service/TaskClaimService.java +++ b/src/main/java/com/label/module/task/service/TaskClaimService.java @@ -7,10 +7,10 @@ import com.label.common.redis.RedisService; import com.label.common.shiro.TokenPrincipal; import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.TaskStatus; -import com.label.module.task.entity.AnnotationTask; -import com.label.module.task.entity.AnnotationTaskHistory; -import com.label.module.task.mapper.AnnotationTaskMapper; -import com.label.module.task.mapper.TaskHistoryMapper; +import com.label.entity.AnnotationTask; +import com.label.entity.AnnotationTaskHistory; +import com.label.mapper.AnnotationTaskMapper; +import com.label.mapper.TaskHistoryMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/label/module/task/service/TaskService.java b/src/main/java/com/label/module/task/service/TaskService.java index 042ee28..7062bd0 100644 --- a/src/main/java/com/label/module/task/service/TaskService.java +++ b/src/main/java/com/label/module/task/service/TaskService.java @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.label.common.exception.BusinessException; import com.label.common.result.PageResult; import com.label.common.shiro.TokenPrincipal; -import com.label.module.task.dto.TaskResponse; -import com.label.module.task.entity.AnnotationTask; -import com.label.module.task.mapper.AnnotationTaskMapper; +import com.label.dto.TaskResponse; +import com.label.entity.AnnotationTask; +import com.label.mapper.AnnotationTaskMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; 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 c3e8f24..78fab23 100644 --- a/src/main/java/com/label/module/user/controller/AuthController.java +++ b/src/main/java/com/label/module/user/controller/AuthController.java @@ -2,9 +2,9 @@ package com.label.module.user.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.user.dto.LoginRequest; -import com.label.module.user.dto.LoginResponse; -import com.label.module.user.dto.UserInfoResponse; +import com.label.dto.LoginRequest; +import com.label.dto.LoginResponse; +import com.label.dto.UserInfoResponse; import com.label.module.user.service.AuthService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; 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 c31b9eb..53a95a6 100644 --- a/src/main/java/com/label/module/user/controller/UserController.java +++ b/src/main/java/com/label/module/user/controller/UserController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import com.label.common.result.PageResult; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.user.entity.SysUser; +import com.label.entity.SysUser; import com.label.module.user.service.UserService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/label/module/user/service/AuthService.java b/src/main/java/com/label/module/user/service/AuthService.java index cc3709a..3ba2481 100644 --- a/src/main/java/com/label/module/user/service/AuthService.java +++ b/src/main/java/com/label/module/user/service/AuthService.java @@ -4,13 +4,13 @@ import com.label.common.exception.BusinessException; import com.label.common.redis.RedisKeyManager; import com.label.common.redis.RedisService; import com.label.common.shiro.TokenPrincipal; -import com.label.module.user.dto.LoginRequest; -import com.label.module.user.dto.LoginResponse; -import com.label.module.user.dto.UserInfoResponse; -import com.label.module.user.entity.SysCompany; -import com.label.module.user.entity.SysUser; -import com.label.module.user.mapper.SysCompanyMapper; -import com.label.module.user.mapper.SysUserMapper; +import com.label.dto.LoginRequest; +import com.label.dto.LoginResponse; +import com.label.dto.UserInfoResponse; +import com.label.entity.SysCompany; +import com.label.entity.SysUser; +import com.label.mapper.SysCompanyMapper; +import com.label.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/label/module/user/service/UserService.java b/src/main/java/com/label/module/user/service/UserService.java index 0f0edd8..3e9e2cc 100644 --- a/src/main/java/com/label/module/user/service/UserService.java +++ b/src/main/java/com/label/module/user/service/UserService.java @@ -15,8 +15,8 @@ import com.label.common.redis.RedisKeyManager; import com.label.common.redis.RedisService; import com.label.common.result.PageResult; import com.label.common.shiro.TokenPrincipal; -import com.label.module.user.entity.SysUser; -import com.label.module.user.mapper.SysUserMapper; +import com.label.entity.SysUser; +import com.label.mapper.SysUserMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; 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 6848e5d..9270477 100644 --- a/src/main/java/com/label/module/video/controller/VideoController.java +++ b/src/main/java/com/label/module/video/controller/VideoController.java @@ -2,7 +2,7 @@ package com.label.module.video.controller; import com.label.common.result.Result; import com.label.common.shiro.TokenPrincipal; -import com.label.module.video.entity.VideoProcessJob; +import com.label.entity.VideoProcessJob; import com.label.module.video.service.VideoProcessService; 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/service/VideoProcessService.java b/src/main/java/com/label/module/video/service/VideoProcessService.java index 86736c2..e154424 100644 --- a/src/main/java/com/label/module/video/service/VideoProcessService.java +++ b/src/main/java/com/label/module/video/service/VideoProcessService.java @@ -5,10 +5,10 @@ import com.label.common.ai.AiServiceClient; import com.label.common.exception.BusinessException; import com.label.common.statemachine.SourceStatus; import com.label.common.statemachine.StateValidator; -import com.label.module.source.entity.SourceData; -import com.label.module.source.mapper.SourceDataMapper; -import com.label.module.video.entity.VideoProcessJob; -import com.label.module.video.mapper.VideoProcessJobMapper; +import com.label.entity.SourceData; +import com.label.mapper.SourceDataMapper; +import com.label.entity.VideoProcessJob; +import com.label.mapper.VideoProcessJobMapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/test/java/com/label/integration/AuthIntegrationTest.java b/src/test/java/com/label/integration/AuthIntegrationTest.java index 9bc8b94..3964778 100644 --- a/src/test/java/com/label/integration/AuthIntegrationTest.java +++ b/src/test/java/com/label/integration/AuthIntegrationTest.java @@ -2,7 +2,7 @@ package com.label.integration; import com.label.AbstractIntegrationTest; import com.label.common.result.Result; -import com.label.module.user.dto.LoginRequest; +import com.label.dto.LoginRequest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/com/label/integration/ExtractionApprovalIntegrationTest.java b/src/test/java/com/label/integration/ExtractionApprovalIntegrationTest.java index b88379c..7fa9d52 100644 --- a/src/test/java/com/label/integration/ExtractionApprovalIntegrationTest.java +++ b/src/test/java/com/label/integration/ExtractionApprovalIntegrationTest.java @@ -1,7 +1,7 @@ package com.label.integration; import com.label.AbstractIntegrationTest; -import com.label.module.user.dto.LoginRequest; +import com.label.dto.LoginRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/label/integration/QaApprovalIntegrationTest.java b/src/test/java/com/label/integration/QaApprovalIntegrationTest.java index 4c00970..9b18b1c 100644 --- a/src/test/java/com/label/integration/QaApprovalIntegrationTest.java +++ b/src/test/java/com/label/integration/QaApprovalIntegrationTest.java @@ -1,7 +1,7 @@ package com.label.integration; import com.label.AbstractIntegrationTest; -import com.label.module.user.dto.LoginRequest; +import com.label.dto.LoginRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/label/integration/UserManagementIntegrationTest.java b/src/test/java/com/label/integration/UserManagementIntegrationTest.java index 4676b14..439984e 100644 --- a/src/test/java/com/label/integration/UserManagementIntegrationTest.java +++ b/src/test/java/com/label/integration/UserManagementIntegrationTest.java @@ -1,7 +1,7 @@ package com.label.integration; import com.label.AbstractIntegrationTest; -import com.label.module.user.dto.LoginRequest; +import com.label.dto.LoginRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/label/unit/OpenApiAnnotationTest.java b/src/test/java/com/label/unit/OpenApiAnnotationTest.java index 5d26dcb..e32c7c7 100644 --- a/src/test/java/com/label/unit/OpenApiAnnotationTest.java +++ b/src/test/java/com/label/unit/OpenApiAnnotationTest.java @@ -5,14 +5,14 @@ import com.label.module.annotation.controller.QaController; import com.label.module.config.controller.SysConfigController; import com.label.module.export.controller.ExportController; import com.label.module.source.controller.SourceController; -import com.label.module.source.dto.SourceResponse; +import com.label.dto.SourceResponse; import com.label.module.task.controller.TaskController; -import com.label.module.task.dto.TaskResponse; +import com.label.dto.TaskResponse; import com.label.module.user.controller.AuthController; import com.label.module.user.controller.UserController; -import com.label.module.user.dto.LoginRequest; -import com.label.module.user.dto.LoginResponse; -import com.label.module.user.dto.UserInfoResponse; +import com.label.dto.LoginRequest; +import com.label.dto.LoginResponse; +import com.label.dto.UserInfoResponse; import com.label.module.video.controller.VideoController; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/test/java/com/label/unit/PackageStructureMigrationTest.java b/src/test/java/com/label/unit/PackageStructureMigrationTest.java index 7ea8bc7..3332d13 100644 --- a/src/test/java/com/label/unit/PackageStructureMigrationTest.java +++ b/src/test/java/com/label/unit/PackageStructureMigrationTest.java @@ -29,6 +29,39 @@ class PackageStructureMigrationTest { assertClassMissing("com.label.module.annotation.service.ExtractionApprovedEventListener"); } + @Test + @DisplayName("DTO、实体、Mapper 已迁移到扁平数据层") + void dataTypesMoved() { + for (String fqcn : java.util.List.of( + "com.label.dto.LoginRequest", + "com.label.dto.LoginResponse", + "com.label.dto.UserInfoResponse", + "com.label.dto.TaskResponse", + "com.label.dto.SourceResponse", + "com.label.entity.AnnotationResult", + "com.label.entity.TrainingDataset", + "com.label.entity.SysConfig", + "com.label.entity.ExportBatch", + "com.label.entity.SourceData", + "com.label.entity.AnnotationTask", + "com.label.entity.AnnotationTaskHistory", + "com.label.entity.SysCompany", + "com.label.entity.SysUser", + "com.label.entity.VideoProcessJob", + "com.label.mapper.AnnotationResultMapper", + "com.label.mapper.TrainingDatasetMapper", + "com.label.mapper.SysConfigMapper", + "com.label.mapper.ExportBatchMapper", + "com.label.mapper.SourceDataMapper", + "com.label.mapper.AnnotationTaskMapper", + "com.label.mapper.TaskHistoryMapper", + "com.label.mapper.SysCompanyMapper", + "com.label.mapper.SysUserMapper", + "com.label.mapper.VideoProcessJobMapper")) { + assertClassExists(fqcn); + } + } + private static void assertClassExists(String fqcn) { assertThatCode(() -> Class.forName(fqcn)).doesNotThrowAnyException(); }