refactor: flatten dto entity and mapper packages

This commit is contained in:
wh
2026-04-14 13:39:24 +08:00
parent 3e33398dd2
commit 0dbb88b803
50 changed files with 137 additions and 104 deletions

View File

@@ -1,4 +1,4 @@
package com.label.module.user.dto; package com.label.dto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;

View File

@@ -1,4 +1,4 @@
package com.label.module.user.dto; package com.label.dto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@@ -1,4 +1,4 @@
package com.label.module.source.dto; package com.label.dto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder; import lombok.Builder;

View File

@@ -1,4 +1,4 @@
package com.label.module.task.dto; package com.label.dto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder; import lombok.Builder;

View File

@@ -1,4 +1,4 @@
package com.label.module.user.dto; package com.label.dto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@@ -3,11 +3,11 @@ package com.label.listener;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.label.common.ai.AiServiceClient; import com.label.common.ai.AiServiceClient;
import com.label.common.context.CompanyContext; import com.label.common.context.CompanyContext;
import com.label.module.annotation.entity.TrainingDataset; import com.label.entity.TrainingDataset;
import com.label.module.annotation.mapper.AnnotationResultMapper; import com.label.mapper.AnnotationResultMapper;
import com.label.module.annotation.mapper.TrainingDatasetMapper; import com.label.mapper.TrainingDatasetMapper;
import com.label.module.source.entity.SourceData; import com.label.entity.SourceData;
import com.label.module.source.mapper.SourceDataMapper; import com.label.mapper.SourceDataMapper;
import com.label.module.task.service.TaskClaimService; import com.label.module.task.service.TaskClaimService;
import com.label.module.task.service.TaskService; import com.label.module.task.service.TaskService;
import com.label.event.ExtractionApprovedEvent; import com.label.event.ExtractionApprovedEvent;

View File

@@ -1,7 +1,7 @@
package com.label.module.annotation.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.label.module.annotation.entity.AnnotationResult; import com.label.entity.AnnotationResult;
import org.apache.ibatis.annotations.*; import org.apache.ibatis.annotations.*;
/** /**

View File

@@ -1,7 +1,7 @@
package com.label.module.task.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;

View File

@@ -1,7 +1,7 @@
package com.label.module.export.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;

View File

@@ -1,7 +1,7 @@
package com.label.module.source.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;

View File

@@ -1,7 +1,7 @@
package com.label.module.user.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;

View File

@@ -1,7 +1,7 @@
package com.label.module.config.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;

View File

@@ -1,8 +1,8 @@
package com.label.module.user.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;

View File

@@ -1,7 +1,7 @@
package com.label.module.task.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@@ -1,7 +1,7 @@
package com.label.module.annotation.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update; import org.apache.ibatis.annotations.Update;

View File

@@ -1,7 +1,7 @@
package com.label.module.video.mapper; package com.label.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@@ -7,15 +7,15 @@ import com.label.common.exception.BusinessException;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.StateValidator;
import com.label.common.statemachine.TaskStatus; import com.label.common.statemachine.TaskStatus;
import com.label.module.annotation.entity.AnnotationResult; import com.label.entity.AnnotationResult;
import com.label.module.annotation.entity.TrainingDataset; import com.label.entity.TrainingDataset;
import com.label.event.ExtractionApprovedEvent; import com.label.event.ExtractionApprovedEvent;
import com.label.module.annotation.mapper.AnnotationResultMapper; import com.label.mapper.AnnotationResultMapper;
import com.label.module.annotation.mapper.TrainingDatasetMapper; import com.label.mapper.TrainingDatasetMapper;
import com.label.module.source.entity.SourceData; import com.label.entity.SourceData;
import com.label.module.source.mapper.SourceDataMapper; import com.label.mapper.SourceDataMapper;
import com.label.module.task.entity.AnnotationTask; import com.label.entity.AnnotationTask;
import com.label.module.task.mapper.AnnotationTaskMapper; import com.label.mapper.AnnotationTaskMapper;
import com.label.module.task.service.TaskClaimService; import com.label.module.task.service.TaskClaimService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@@ -6,12 +6,12 @@ import com.label.common.exception.BusinessException;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.StateValidator;
import com.label.common.statemachine.TaskStatus; import com.label.common.statemachine.TaskStatus;
import com.label.module.annotation.entity.TrainingDataset; import com.label.entity.TrainingDataset;
import com.label.module.annotation.mapper.TrainingDatasetMapper; import com.label.mapper.TrainingDatasetMapper;
import com.label.module.source.entity.SourceData; import com.label.entity.SourceData;
import com.label.module.source.mapper.SourceDataMapper; import com.label.mapper.SourceDataMapper;
import com.label.module.task.entity.AnnotationTask; import com.label.entity.AnnotationTask;
import com.label.module.task.mapper.AnnotationTaskMapper; import com.label.mapper.AnnotationTaskMapper;
import com.label.module.task.service.TaskClaimService; import com.label.module.task.service.TaskClaimService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@@ -2,7 +2,7 @@ package com.label.module.config.controller;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; 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 com.label.module.config.service.SysConfigService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;

View File

@@ -1,8 +1,8 @@
package com.label.module.config.service; package com.label.module.config.service;
import com.label.common.exception.BusinessException; import com.label.common.exception.BusinessException;
import com.label.module.config.entity.SysConfig; import com.label.entity.SysConfig;
import com.label.module.config.mapper.SysConfigMapper; import com.label.mapper.SysConfigMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

View File

@@ -3,8 +3,8 @@ package com.label.module.export.controller;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.module.annotation.entity.TrainingDataset; import com.label.entity.TrainingDataset;
import com.label.module.export.entity.ExportBatch; import com.label.entity.ExportBatch;
import com.label.module.export.service.ExportService; import com.label.module.export.service.ExportService;
import com.label.module.export.service.FinetuneService; import com.label.module.export.service.FinetuneService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

View File

@@ -7,10 +7,10 @@ import com.label.common.exception.BusinessException;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.common.storage.RustFsClient; import com.label.common.storage.RustFsClient;
import com.label.module.annotation.entity.TrainingDataset; import com.label.entity.TrainingDataset;
import com.label.module.annotation.mapper.TrainingDatasetMapper; import com.label.mapper.TrainingDatasetMapper;
import com.label.module.export.entity.ExportBatch; import com.label.entity.ExportBatch;
import com.label.module.export.mapper.ExportBatchMapper; import com.label.mapper.ExportBatchMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

View File

@@ -3,8 +3,8 @@ package com.label.module.export.service;
import com.label.common.ai.AiServiceClient; import com.label.common.ai.AiServiceClient;
import com.label.common.exception.BusinessException; import com.label.common.exception.BusinessException;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.module.export.entity.ExportBatch; import com.label.entity.ExportBatch;
import com.label.module.export.mapper.ExportBatchMapper; import com.label.mapper.ExportBatchMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

View File

@@ -3,7 +3,7 @@ package com.label.module.source.controller;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; 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 com.label.module.source.service.SourceService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;

View File

@@ -7,9 +7,9 @@ import com.label.common.exception.BusinessException;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.common.storage.RustFsClient; import com.label.common.storage.RustFsClient;
import com.label.module.source.dto.SourceResponse; import com.label.dto.SourceResponse;
import com.label.module.source.entity.SourceData; import com.label.entity.SourceData;
import com.label.module.source.mapper.SourceDataMapper; import com.label.mapper.SourceDataMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

View File

@@ -3,7 +3,7 @@ package com.label.module.task.controller;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; 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.TaskClaimService;
import com.label.module.task.service.TaskService; import com.label.module.task.service.TaskService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

View File

@@ -7,10 +7,10 @@ import com.label.common.redis.RedisService;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.StateValidator;
import com.label.common.statemachine.TaskStatus; import com.label.common.statemachine.TaskStatus;
import com.label.module.task.entity.AnnotationTask; import com.label.entity.AnnotationTask;
import com.label.module.task.entity.AnnotationTaskHistory; import com.label.entity.AnnotationTaskHistory;
import com.label.module.task.mapper.AnnotationTaskMapper; import com.label.mapper.AnnotationTaskMapper;
import com.label.module.task.mapper.TaskHistoryMapper; import com.label.mapper.TaskHistoryMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

View File

@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.label.common.exception.BusinessException; import com.label.common.exception.BusinessException;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.module.task.dto.TaskResponse; import com.label.dto.TaskResponse;
import com.label.module.task.entity.AnnotationTask; import com.label.entity.AnnotationTask;
import com.label.module.task.mapper.AnnotationTaskMapper; import com.label.mapper.AnnotationTaskMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;

View File

@@ -2,9 +2,9 @@ package com.label.module.user.controller;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.module.user.dto.LoginRequest; import com.label.dto.LoginRequest;
import com.label.module.user.dto.LoginResponse; import com.label.dto.LoginResponse;
import com.label.module.user.dto.UserInfoResponse; import com.label.dto.UserInfoResponse;
import com.label.module.user.service.AuthService; import com.label.module.user.service.AuthService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;

View File

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; 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 com.label.module.user.service.UserService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;

View File

@@ -4,13 +4,13 @@ import com.label.common.exception.BusinessException;
import com.label.common.redis.RedisKeyManager; import com.label.common.redis.RedisKeyManager;
import com.label.common.redis.RedisService; import com.label.common.redis.RedisService;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.module.user.dto.LoginRequest; import com.label.dto.LoginRequest;
import com.label.module.user.dto.LoginResponse; import com.label.dto.LoginResponse;
import com.label.module.user.dto.UserInfoResponse; import com.label.dto.UserInfoResponse;
import com.label.module.user.entity.SysCompany; import com.label.entity.SysCompany;
import com.label.module.user.entity.SysUser; import com.label.entity.SysUser;
import com.label.module.user.mapper.SysCompanyMapper; import com.label.mapper.SysCompanyMapper;
import com.label.module.user.mapper.SysUserMapper; import com.label.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

View File

@@ -15,8 +15,8 @@ import com.label.common.redis.RedisKeyManager;
import com.label.common.redis.RedisService; import com.label.common.redis.RedisService;
import com.label.common.result.PageResult; import com.label.common.result.PageResult;
import com.label.common.shiro.TokenPrincipal; import com.label.common.shiro.TokenPrincipal;
import com.label.module.user.entity.SysUser; import com.label.entity.SysUser;
import com.label.module.user.mapper.SysUserMapper; import com.label.mapper.SysUserMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@@ -2,7 +2,7 @@ package com.label.module.video.controller;
import com.label.common.result.Result; import com.label.common.result.Result;
import com.label.common.shiro.TokenPrincipal; 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 com.label.module.video.service.VideoProcessService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;

View File

@@ -5,10 +5,10 @@ import com.label.common.ai.AiServiceClient;
import com.label.common.exception.BusinessException; import com.label.common.exception.BusinessException;
import com.label.common.statemachine.SourceStatus; import com.label.common.statemachine.SourceStatus;
import com.label.common.statemachine.StateValidator; import com.label.common.statemachine.StateValidator;
import com.label.module.source.entity.SourceData; import com.label.entity.SourceData;
import com.label.module.source.mapper.SourceDataMapper; import com.label.mapper.SourceDataMapper;
import com.label.module.video.entity.VideoProcessJob; import com.label.entity.VideoProcessJob;
import com.label.module.video.mapper.VideoProcessJobMapper; import com.label.mapper.VideoProcessJobMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

View File

@@ -2,7 +2,7 @@ package com.label.integration;
import com.label.AbstractIntegrationTest; import com.label.AbstractIntegrationTest;
import com.label.common.result.Result; 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.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@@ -1,7 +1,7 @@
package com.label.integration; package com.label.integration;
import com.label.AbstractIntegrationTest; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

View File

@@ -1,7 +1,7 @@
package com.label.integration; package com.label.integration;
import com.label.AbstractIntegrationTest; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

View File

@@ -1,7 +1,7 @@
package com.label.integration; package com.label.integration;
import com.label.AbstractIntegrationTest; 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.BeforeEach;
import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;

View File

@@ -5,14 +5,14 @@ import com.label.module.annotation.controller.QaController;
import com.label.module.config.controller.SysConfigController; import com.label.module.config.controller.SysConfigController;
import com.label.module.export.controller.ExportController; import com.label.module.export.controller.ExportController;
import com.label.module.source.controller.SourceController; 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.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.AuthController;
import com.label.module.user.controller.UserController; import com.label.module.user.controller.UserController;
import com.label.module.user.dto.LoginRequest; import com.label.dto.LoginRequest;
import com.label.module.user.dto.LoginResponse; import com.label.dto.LoginResponse;
import com.label.module.user.dto.UserInfoResponse; import com.label.dto.UserInfoResponse;
import com.label.module.video.controller.VideoController; import com.label.module.video.controller.VideoController;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

View File

@@ -29,6 +29,39 @@ class PackageStructureMigrationTest {
assertClassMissing("com.label.module.annotation.service.ExtractionApprovedEventListener"); 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) { private static void assertClassExists(String fqcn) {
assertThatCode(() -> Class.forName(fqcn)).doesNotThrowAnyException(); assertThatCode(() -> Class.forName(fqcn)).doesNotThrowAnyException();
} }