From 987e5c30fe7aef3cb499a5c00a58b1dd648be7cf Mon Sep 17 00:00:00 2001 From: dc Date: Tue, 3 Jun 2025 21:24:02 +0800 Subject: [PATCH] =?UTF-8?q?GPU=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cationOrchestrationServiceApplication.java | 2 +- .../cache/task => cache}/CacheInitTask.java | 4 ++-- .../cache/task => cache}/CacheSyncTask.java | 9 ++++----- .../{gpu => }/config/CacheAopConfig.java | 8 ++++---- .../{gpu => }/config/RedisConfig.java | 3 +-- .../controller/GpuResourceController.java | 12 +++++------ .../{gpu => }/dao/GpuResourceDao.java | 4 ++-- .../deploy/deployment/ResourceAllocator.java | 3 +-- .../deploy/entity/DeploymentResource.java | 2 +- .../model => entity}/dto/GpuCreateDTO.java | 2 +- .../model => entity}/dto/GpuResponseDTO.java | 3 +-- .../model => entity}/dto/GpuUpdateDTO.java | 2 +- .../model => entity}/entity/GpuResource.java | 2 +- .../model => entity}/enums/ErrorCodeEnum.java | 3 +-- .../{gpu/model => entity}/vo/ResponseVO.java | 4 ++-- .../exception/CacheInitException.java | 2 +- .../exception/GlobalExceptionHandler.java | 6 +++--- .../exception/PermissionDeniedException.java | 4 ++-- .../gpu/mapper/GpuMapper.java | 17 ---------------- .../gpu/service/GpuManageService.java | 16 --------------- .../mapper/GpuMapper.java | 16 +++++++++++++++ .../{gpu/cache => service}/CacheManager.java | 8 ++++---- .../service/GpuManageService.java | 15 ++++++++++++++ .../cache => service}/RedisCacheService.java | 4 ++-- .../service/impl/GpuManageServiceImpl.java | 20 +++++++++---------- .../setmodel/config/GPUPoolConfig.java | 4 ---- .../setmodel/config/MQConfig.java | 4 ---- .../controller/ModelDeployController.java | 4 ---- .../setmodel/service/GrayDeployService.java | 4 ---- .../setmodel/service/ModelDeployService.java | 4 ---- .../service/scheduler/RequestReplicator.java | 4 ---- .../service/scheduler/ResourceScheduler.java | 4 ---- 32 files changed, 82 insertions(+), 117 deletions(-) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/cache/task => cache}/CacheInitTask.java (87%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/cache/task => cache}/CacheSyncTask.java (85%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/config/CacheAopConfig.java (85%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/config/RedisConfig.java (95%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/controller/GpuResourceController.java (71%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/dao/GpuResourceDao.java (95%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/model => entity}/dto/GpuCreateDTO.java (91%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/model => entity}/dto/GpuResponseDTO.java (93%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/model => entity}/dto/GpuUpdateDTO.java (94%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/model => entity}/entity/GpuResource.java (96%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/model => entity}/enums/ErrorCodeEnum.java (88%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/model => entity}/vo/ResponseVO.java (86%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/exception/CacheInitException.java (76%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/exception/GlobalExceptionHandler.java (83%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/exception/PermissionDeniedException.java (81%) delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/mapper/GpuMapper.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/GpuManageService.java create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuMapper.java rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/cache => service}/CacheManager.java (93%) create mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuManageService.java rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu/cache => service}/RedisCacheService.java (95%) rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{gpu => }/service/impl/GpuManageServiceImpl.java (68%) delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/GPUPoolConfig.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/MQConfig.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/controller/ModelDeployController.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/GrayDeployService.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/ModelDeployService.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/RequestReplicator.java delete mode 100644 src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/ResourceScheduler.java diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java index 520a423..9d24e1a 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java @@ -4,7 +4,7 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -@MapperScan("com.bipt.intelligentapplicationorchestrationservice.gpu.dao") +@MapperScan("com.bipt.intelligentapplicationorchestrationservice.dao") @SpringBootApplication public class IntelligentApplicationOrchestrationServiceApplication { diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/task/CacheInitTask.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheInitTask.java similarity index 87% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/task/CacheInitTask.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheInitTask.java index 0135f36..f494fa8 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/task/CacheInitTask.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheInitTask.java @@ -1,6 +1,6 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.cache.task; +package com.bipt.intelligentapplicationorchestrationservice.cache; -import com.bipt.intelligentapplicationorchestrationservice.gpu.cache.CacheManager; +import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/task/CacheSyncTask.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java similarity index 85% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/task/CacheSyncTask.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java index e19843f..1f579fc 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/task/CacheSyncTask.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java @@ -1,9 +1,8 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.cache.task; +package com.bipt.intelligentapplicationorchestrationservice.cache; -import com.bipt.intelligentapplicationorchestrationservice.gpu.cache.CacheManager; -import com.bipt.intelligentapplicationorchestrationservice.gpu.dao.GpuResourceDao; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; -import lombok.extern.slf4j.Slf4j; +import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager; +import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/config/CacheAopConfig.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/CacheAopConfig.java similarity index 85% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/config/CacheAopConfig.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/CacheAopConfig.java index c393d75..7a9c410 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/config/CacheAopConfig.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/CacheAopConfig.java @@ -1,8 +1,8 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.config; +package com.bipt.intelligentapplicationorchestrationservice.config; -import com.bipt.intelligentapplicationorchestrationservice.gpu.cache.CacheManager; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; @@ -22,7 +22,7 @@ public class CacheAopConfig { // 定义写操作切点 @Pointcut("@annotation(org.springframework.transaction.annotation.Transactional) && " + - "execution(* com.bipt.intelligentapplicationorchestrationservice.gpu.service..*.*(..))") + "execution(* com.bipt.intelligentapplicationorchestrationservice.service..*.*(..))") public void writeOperation() {} // 事务提交后操作 diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/config/RedisConfig.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfig.java similarity index 95% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/config/RedisConfig.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfig.java index 8437aef..95ef6cb 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/config/RedisConfig.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfig.java @@ -1,6 +1,5 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.config; +package com.bipt.intelligentapplicationorchestrationservice.config; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; import io.lettuce.core.ClientOptions; import io.lettuce.core.SocketOptions; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/controller/GpuResourceController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/GpuResourceController.java similarity index 71% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/controller/GpuResourceController.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/GpuResourceController.java index 595095d..507cde1 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/controller/GpuResourceController.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/GpuResourceController.java @@ -1,10 +1,10 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.controller; +package com.bipt.intelligentapplicationorchestrationservice.controller; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuCreateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuResponseDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuUpdateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.service.GpuManageService; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO; +import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService; import jakarta.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/dao/GpuResourceDao.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/dao/GpuResourceDao.java similarity index 95% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/dao/GpuResourceDao.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/dao/GpuResourceDao.java index 91a6c7f..a0fd58e 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/dao/GpuResourceDao.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/dao/GpuResourceDao.java @@ -1,6 +1,6 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.dao; +package com.bipt.intelligentapplicationorchestrationservice.dao; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import org.apache.ibatis.annotations.*; import org.apache.ibatis.jdbc.SQL; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/deployment/ResourceAllocator.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/deployment/ResourceAllocator.java index a6273f6..ec05ce7 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/deployment/ResourceAllocator.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/deployment/ResourceAllocator.java @@ -1,10 +1,9 @@ package com.bipt.intelligentapplicationorchestrationservice.deploy.deployment; import com.bipt.intelligentapplicationorchestrationservice.deploy.entity.DeploymentResource; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import com.bipt.intelligentapplicationorchestrationservice.utils.ConfigConstants; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.client.ResourceAccessException; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java index c1fb6de..08935ef 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java @@ -1,6 +1,6 @@ package com.bipt.intelligentapplicationorchestrationservice.deploy.entity; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuCreateDTO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuCreateDTO.java similarity index 91% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuCreateDTO.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuCreateDTO.java index 8f4e6ca..48b901e 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuCreateDTO.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuCreateDTO.java @@ -1,4 +1,4 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto; +package com.bipt.intelligentapplicationorchestrationservice.entity.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuResponseDTO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuResponseDTO.java similarity index 93% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuResponseDTO.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuResponseDTO.java index 6c6649c..66312b4 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuResponseDTO.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuResponseDTO.java @@ -1,9 +1,8 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto; +package com.bipt.intelligentapplicationorchestrationservice.entity.dto; import lombok.Data; import java.time.LocalDateTime; -import java.util.Date; @Data public class GpuResponseDTO { diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuUpdateDTO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuUpdateDTO.java similarity index 94% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuUpdateDTO.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuUpdateDTO.java index 312d49a..3ca1dbc 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/dto/GpuUpdateDTO.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuUpdateDTO.java @@ -1,4 +1,4 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto; +package com.bipt.intelligentapplicationorchestrationservice.entity.dto; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/entity/GpuResource.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/entity/GpuResource.java similarity index 96% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/entity/GpuResource.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/entity/GpuResource.java index 299d6aa..c1e5802 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/entity/GpuResource.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/entity/GpuResource.java @@ -1,4 +1,4 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity; +package com.bipt.intelligentapplicationorchestrationservice.entity.entity; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/enums/ErrorCodeEnum.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/enums/ErrorCodeEnum.java similarity index 88% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/enums/ErrorCodeEnum.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/enums/ErrorCodeEnum.java index 6c30eaa..9f28c98 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/enums/ErrorCodeEnum.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/enums/ErrorCodeEnum.java @@ -1,7 +1,6 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.model.enums; +package com.bipt.intelligentapplicationorchestrationservice.entity.enums; import lombok.Getter; -import org.hibernate.dialect.aggregate.DB2AggregateSupport; @Getter public enum ErrorCodeEnum { diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/vo/ResponseVO.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/vo/ResponseVO.java similarity index 86% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/vo/ResponseVO.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/vo/ResponseVO.java index 3e2adfb..e7ab79b 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/model/vo/ResponseVO.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/vo/ResponseVO.java @@ -1,6 +1,6 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo; +package com.bipt.intelligentapplicationorchestrationservice.entity.vo; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.enums.ErrorCodeEnum; +import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum; import java.io.Serializable; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/CacheInitException.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/CacheInitException.java similarity index 76% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/CacheInitException.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/CacheInitException.java index 3a13633..fd83490 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/CacheInitException.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/CacheInitException.java @@ -1,4 +1,4 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.exception; +package com.bipt.intelligentapplicationorchestrationservice.exception; public class CacheInitException extends RuntimeException{ public CacheInitException(String message) { diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/GlobalExceptionHandler.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/GlobalExceptionHandler.java similarity index 83% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/GlobalExceptionHandler.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/GlobalExceptionHandler.java index 1ff8e44..d300d77 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/GlobalExceptionHandler.java @@ -1,7 +1,7 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.exception; +package com.bipt.intelligentapplicationorchestrationservice.exception; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.enums.ErrorCodeEnum; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO; +import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum; +import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/PermissionDeniedException.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/PermissionDeniedException.java similarity index 81% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/PermissionDeniedException.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/PermissionDeniedException.java index bf77c61..fcb4513 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/exception/PermissionDeniedException.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/PermissionDeniedException.java @@ -1,6 +1,6 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.exception; +package com.bipt.intelligentapplicationorchestrationservice.exception; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.enums.ErrorCodeEnum; +import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum; import lombok.Getter; @Getter diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/mapper/GpuMapper.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/mapper/GpuMapper.java deleted file mode 100644 index a878c68..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/mapper/GpuMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.mapper; - -import ch.qos.logback.core.model.ComponentModel; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuCreateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuResponseDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuUpdateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; -import org.mapstruct.Mapper; -import org.mapstruct.MappingConstants; - -@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) -public interface GpuMapper { - GpuResource toEntity(GpuCreateDTO dto); - GpuResource toEntity(GpuUpdateDTO dto); - GpuResource toEntity(GpuResponseDTO dto); - GpuResponseDTO toDTO(GpuResource entity); -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/GpuManageService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/GpuManageService.java deleted file mode 100644 index 987b02f..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/GpuManageService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.service; - -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuCreateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuResponseDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuUpdateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO; - -import java.util.List; - -public interface GpuManageService { - public ResponseVO createGpuResource(GpuCreateDTO dto); - public ResponseVO deleteGpuResource(Long gpuId); - public void updateGpuResource(GpuUpdateDTO entity); - public List searchByCriteria(String model, Integer memorySize, String ip); -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuMapper.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuMapper.java new file mode 100644 index 0000000..4f52841 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuMapper.java @@ -0,0 +1,16 @@ +package com.bipt.intelligentapplicationorchestrationservice.mapper; + +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; +import org.mapstruct.Mapper; +import org.mapstruct.MappingConstants; + +@Mapper(componentModel = MappingConstants.ComponentModel.SPRING) +public interface GpuMapper { + GpuResource toEntity(GpuCreateDTO dto); + GpuResource toEntity(GpuUpdateDTO dto); + GpuResource toEntity(GpuResponseDTO dto); + GpuResponseDTO toDTO(GpuResource entity); +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/CacheManager.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java similarity index 93% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/CacheManager.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java index 9e2234a..0367af2 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/CacheManager.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java @@ -1,8 +1,8 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.cache; +package com.bipt.intelligentapplicationorchestrationservice.service; -import com.bipt.intelligentapplicationorchestrationservice.gpu.dao.GpuResourceDao; -import com.bipt.intelligentapplicationorchestrationservice.gpu.exception.CacheInitException; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao; +import com.bipt.intelligentapplicationorchestrationservice.exception.CacheInitException; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import jakarta.annotation.PostConstruct; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuManageService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuManageService.java new file mode 100644 index 0000000..870af09 --- /dev/null +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuManageService.java @@ -0,0 +1,15 @@ +package com.bipt.intelligentapplicationorchestrationservice.service; + +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO; + +import java.util.List; + +public interface GpuManageService { + public ResponseVO createGpuResource(GpuCreateDTO dto); + public ResponseVO deleteGpuResource(Long gpuId); + public void updateGpuResource(GpuUpdateDTO entity); + public List searchByCriteria(String model, Integer memorySize, String ip); +} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/RedisCacheService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/RedisCacheService.java similarity index 95% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/RedisCacheService.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/RedisCacheService.java index d307c9b..7661d6d 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/cache/RedisCacheService.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/RedisCacheService.java @@ -1,7 +1,7 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.cache; +package com.bipt.intelligentapplicationorchestrationservice.service; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisCallback; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/impl/GpuManageServiceImpl.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java similarity index 68% rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/impl/GpuManageServiceImpl.java rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java index 7bea9a0..185584f 100644 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/impl/GpuManageServiceImpl.java +++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java @@ -1,14 +1,14 @@ -package com.bipt.intelligentapplicationorchestrationservice.gpu.service.impl; +package com.bipt.intelligentapplicationorchestrationservice.service.impl; -import com.bipt.intelligentapplicationorchestrationservice.gpu.dao.GpuResourceDao; -import com.bipt.intelligentapplicationorchestrationservice.gpu.mapper.GpuMapper; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuCreateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuResponseDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuUpdateDTO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.enums.ErrorCodeEnum; -import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO; -import com.bipt.intelligentapplicationorchestrationservice.gpu.service.GpuManageService; +import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao; +import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuMapper; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO; +import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource; +import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum; +import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO; +import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService; import jakarta.transaction.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/GPUPoolConfig.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/GPUPoolConfig.java deleted file mode 100644 index 1d14b70..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/GPUPoolConfig.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.config; - -public class GPUPoolConfig { -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/MQConfig.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/MQConfig.java deleted file mode 100644 index e2ff6c6..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/MQConfig.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.config; - -public class MQConfig { -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/controller/ModelDeployController.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/controller/ModelDeployController.java deleted file mode 100644 index d1819e5..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/controller/ModelDeployController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.controller; - -public class ModelDeployController { -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/GrayDeployService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/GrayDeployService.java deleted file mode 100644 index d2ebf44..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/GrayDeployService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.service; - -public class GrayDeployService { -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/ModelDeployService.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/ModelDeployService.java deleted file mode 100644 index abf8ae3..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/ModelDeployService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.service; - -public class ModelDeployService { -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/RequestReplicator.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/RequestReplicator.java deleted file mode 100644 index 16854f4..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/RequestReplicator.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.service.scheduler; - -public class RequestReplicator { -} diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/ResourceScheduler.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/ResourceScheduler.java deleted file mode 100644 index 6af23be..0000000 --- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/ResourceScheduler.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bipt.intelligentapplicationorchestrationservice.setmodel.service.scheduler; - -public class ResourceScheduler { -}