GPU路径修改

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 {
 

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;

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.service.CacheManager;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.dao.GpuResourceDao;
+import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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.service.CacheManager;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource;
+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() {}
 
     // 事务提交后操作

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;

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.entity.dto.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuResponseDTO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuUpdateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.service.GpuManageService;
+import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

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;
 

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;
 

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;
 

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;

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 {

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;

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;

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 {

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;

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) {

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.entity.enums.ErrorCodeEnum;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO;
+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;

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

src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/mapper/GpuMapper.java

@@ -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);
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/gpu/service/GpuManageService.java

@@ -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<GpuResponseDTO> searchByCriteria(String model, Integer memorySize, String ip);
-}

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);
+}

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.dao.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.exception.CacheInitException;
+import com.bipt.intelligentapplicationorchestrationservice.exception.CacheInitException;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;

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<GpuResponseDTO> searchByCriteria(String model, Integer memorySize, String ip);
+}

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;

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.dao.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.mapper.GpuMapper;
+import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuMapper;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuCreateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuResponseDTO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.dto.GpuUpdateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.enums.ErrorCodeEnum;
+import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.model.vo.ResponseVO;
+import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
-import com.bipt.intelligentapplicationorchestrationservice.gpu.service.GpuManageService;
+import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService;
 import jakarta.transaction.Transactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/GPUPoolConfig.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.config;
-
-public class GPUPoolConfig {
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/config/MQConfig.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.config;
-
-public class MQConfig {
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/controller/ModelDeployController.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.controller;
-
-public class ModelDeployController {
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/GrayDeployService.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.service;
-
-public class GrayDeployService {
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/ModelDeployService.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.service;
-
-public class ModelDeployService {
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/RequestReplicator.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.service.scheduler;
-
-public class RequestReplicator {
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/setmodel/service/scheduler/ResourceScheduler.java

@@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.setmodel.service.scheduler;
-
-public class ResourceScheduler {
-}