refactor: flatten dto entity and mapper packages

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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.*;
 
 /**

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;

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;

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;

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;
 

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;

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;

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;
 
 /**

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;