优化了模型创建、版本构建、模型修改和模型更新的部分功能异常

Reviewed-on: #21

pom.xml

@@ -18,7 +18,7 @@
 	<url/>
 
 	<properties>
-		<java.version>21</java.version>
+		<java.version>17</java.version>
 		<!-- 添加 Spring Cloud 版本控制 -->
 		<spring-cloud.version>2022.0.4</spring-cloud.version>
 	</properties>
@@ -92,7 +92,6 @@
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 			<version>2.3.0</version>
 		</dependency>
-
 		<!-- Nacos 配置依赖（移除手动版本，由上方依赖管理控制） -->
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
@@ -103,7 +102,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
-
 		<!-- 测试依赖 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -137,8 +135,6 @@
 			<artifactId>mapstruct</artifactId>
 			<version>1.5.5.Final</version> <!-- 确保版本 ≥1.2.0 -->
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>
@@ -165,6 +161,30 @@
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
+
+		<!--阿里OSS依赖-->
+		<dependency>
+			<groupId>com.aliyun.oss</groupId>
+			<artifactId>aliyun-sdk-oss</artifactId>
+			<version>3.15.1</version>
+		</dependency>
+		<!--如果使用的是Java 9及以上的版本，则需要添加JAXB相关依赖。添加JAXB相关依赖-->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<!-- no more than 2.3.3-->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.3</version> <!-- 注意：版本不超过2.3.3 -->
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -182,19 +202,17 @@
 							<artifactId>lombok</artifactId>
 							<version>1.18.38</version>
 						</path>
-					</annotationProcessorPaths>
+						<path>
-				</configuration>
+							<groupId>org.mapstruct</groupId>
-			</plugin>
+							<artifactId>mapstruct-processor</artifactId>
-			<plugin>
+							<version>1.5.5.Final</version>
-				<groupId>org.springframework.boot</groupId>
+						</path>
-				<artifactId>spring-boot-maven-plugin</artifactId>
+						<path>
-				<configuration>
-					<excludes>
-						<exclude>
 							<groupId>org.projectlombok</groupId>
-							<artifactId>lombok</artifactId>
+							<artifactId>lombok-mapstruct-binding</artifactId>
-						</exclude>
+							<version>0.2.0</version>
-					</excludes>
+						</path>
+					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 		</plugins>

src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java

@@ -1,9 +1,12 @@
 package com.bipt.intelligentapplicationorchestrationservice;
 
+import com.bipt.intelligentapplicationorchestrationservice.config.IpConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -11,9 +14,10 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableDiscoveryClient
-@Slf4j
+@EnableConfigurationProperties(IpConfig.class)
+//@Slf4j
 public class IntelligentApplicationOrchestrationServiceApplication {
-
+	private static final Logger log = org.slf4j.LoggerFactory.getLogger(IntelligentApplicationOrchestrationServiceApplication.class);
 	public static void main(String[] args) {
 		SpringApplication.run(IntelligentApplicationOrchestrationServiceApplication.class, args);
 		log.info("server started");

src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java

@@ -2,7 +2,7 @@ package com.bipt.intelligentapplicationorchestrationservice.cache;
 
 import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager;
 import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/CacheAopConfig.java

@@ -2,7 +2,7 @@ package com.bipt.intelligentapplicationorchestrationservice.config;
 
 
 import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;

src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/IpConfig.java

@@ -0,0 +1,21 @@
+package com.bipt.intelligentapplicationorchestrationservice.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Configuration
+@ConfigurationProperties(prefix = "available")
+public class IpConfig {
+    private List<String> ips;
+
+    public List<String> getIps() {
+        return ips;
+    }
+
+    public void setIps(String ips) {
+        this.ips = Arrays.asList(ips.split(","));
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/OssConfiguration.java

@@ -0,0 +1,29 @@
+package com.bipt.intelligentapplicationorchestrationservice.config;
+
+
+import com.bipt.intelligentapplicationorchestrationservice.properties.AliOssProperties;
+import com.bipt.intelligentapplicationorchestrationservice.util.AliOssUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/*
+ * 配置类，用于创建阿里云文件上传工具类对象
+ */
+@Slf4j
+@Configuration
+public class OssConfiguration {
+    private final AliOssProperties aliOssProperties;
+    public OssConfiguration(AliOssProperties aliOssProperties) {
+        this.aliOssProperties = aliOssProperties;
+    }
+    @Bean
+    public AliOssUtil aliOssUtil(){
+        log.info("开始创建阿里云文件上传工具类对象...");
+        return new AliOssUtil(
+                aliOssProperties.getEndpoint(),
+                aliOssProperties.getAccessKeyId(),
+                aliOssProperties.getAccessKeySecret(),
+                aliOssProperties.getBucketName());
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfig.java

@@ -1,6 +1,9 @@
 package com.bipt.intelligentapplicationorchestrationservice.config;
 
 import ch.qos.logback.classic.Logger;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.SocketOptions;
 import org.slf4j.LoggerFactory;
@@ -15,6 +18,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.web.client.RestTemplate;
 
 import java.time.Duration;
 
@@ -35,6 +39,11 @@ public class RedisConfig {
     @Value("${spring.data.redis.ssl:false}")
     private boolean useSsl;
 
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+
     @Bean
     public RedisConnectionFactory redisConnectionFactory() {
         // 1. 创建 SocketOptions
@@ -54,44 +63,41 @@ public class RedisConfig {
                 .clientOptions(clientOptions)          // 注入 ClientOptions
                 .commandTimeout(Duration.ofSeconds(30)) // 全局命令超时
                 .build();
+
         RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
         config.setHostName(redisHost);
         config.setPort(redisPort);
         config.setUsername(redisUsername);  // Redis 6.0+ 支持用户名
         config.setPassword(RedisPassword.of(redisPassword));
 
-//        LettuceClientConfiguration clientConfig = LettuceClientConfiguration.builder()
-//                .commandTimeout(Duration.ofSeconds(30)) // 增加命令超时
-//                .socketOptions(SocketOptions.builder()
-//                        .connectTimeout(Duration.ofSeconds(15)) // TCP连接超时
-//                        .build())
-//                .build();
-
         return new LettuceConnectionFactory(config, clientConfig);
     }
 
-
-//    @Bean
-//    public RedisConnectionFactory redisConnectionFactory() {
-//        RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
-//        config.setPassword("");
-//        return new LettuceConnectionFactory(config);
-//    }
-
     @Bean
-    public RedisTemplate<String, Object> redisTemplate(){
+    public RedisTemplate<String, Object> redisTemplate() {
         RedisTemplate<String, Object> template = new RedisTemplate<>();
         Logger log = (Logger) LoggerFactory.getLogger(RedisConfig.class);
         log.info("开始创建redis模板对象...");
-        //RedisTemplate redisTemplate = new RedisTemplate();
-        //设置redis的连接工厂对象
-        //redisTemplate.setConnectionFactory(redisConnectionFactory);
-        //设置redis key的序列化器
-        //redisTemplate.setKeySerializer(new StringRedisSerializer());
-        //RedisTemplate<String, GpuResource> template = new RedisTemplate<>();
         template.setConnectionFactory(redisConnectionFactory());
+
+        // 创建自定义的ObjectMapper并注册JavaTimeModule
+        ObjectMapper mapper = new ObjectMapper();
+        // 禁用将日期序列化为时间戳
+        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        // 注册Java 8日期时间模块
+        mapper.registerModule(new JavaTimeModule());
+
+        // 使用自定义的ObjectMapper创建JSON序列化器
+        GenericJackson2JsonRedisSerializer jsonSerializer =
+                new GenericJackson2JsonRedisSerializer(mapper);
+
+        // 设置键和值的序列化方式
         template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+        template.setValueSerializer(jsonSerializer);
+        template.setHashKeySerializer(new StringRedisSerializer());
+        template.setHashValueSerializer(jsonSerializer);
+
+        template.afterPropertiesSet();
         return template;
     }
-}
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/constant/ConfigConstants.java

@@ -1,4 +1,4 @@
-package com.bipt.intelligentapplicationorchestrationservice.utils;
+package com.bipt.intelligentapplicationorchestrationservice.constant;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/com/bipt/intelligentapplicationorchestrationservice/constant/MessageConstant.java

@@ -10,5 +10,10 @@ public class MessageConstant {
     public static final String ERROR_DEPLOYED_TO_DESIGNING = "已部署的模型不能直接调整成设计，需先下线再设计";
     public static final String ERROR_ABANDONED_CANNOT_UPDATE = "已废弃的模型只能查看信息，不能更新生命周期";
     public static final String ERROR_TRAINING_INVALID_TRANSITION = "训练中的模型只能调整成设计和评估";
-    public static final String UPDATE_FAILURE = "更新模型生命周期失败";
+    public static final String LIFECYCLE_UPDATE_FAILURE = "更新模型生命周期失败";
+    public static final String LIFECYCLE_UPDATE_SUCCESS = "生命周期更新成功";
+
+    //文件上传常量
+    public static final String UPLOAD_FAILURE = "上传文件失败";
+    public static final String  FILE_EMPTY= "文件为空";
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/CommonController.java

@@ -0,0 +1,59 @@
+package com.bipt.intelligentapplicationorchestrationservice.controller;
+
+import com.bipt.intelligentapplicationorchestrationservice.constant.MessageConstant;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.OptResult;
+import com.bipt.intelligentapplicationorchestrationservice.util.AliOssUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.UUID;
+
+@Slf4j
+@RestController
+@RequestMapping("/common")
+@Tag(name = "通用接口")
+@CrossOrigin(origins = "http://localhost:3000")
+public class CommonController {
+    @Autowired
+    private AliOssUtil aliOssUtil;
+    // 默认上传的文件夹
+    private static final String DEFAULT_FOLDER= "File/";
+
+    /**
+     * 文件上传
+     * @param file
+     * @return
+     */
+    @Operation(summary = "文件上传")
+    @PostMapping("/upload")
+    public OptResult uploadFile(@RequestParam("file") MultipartFile file) throws IOException {
+        log.info("收到上传请求");
+        if (file.isEmpty()){
+            return OptResult.error(MessageConstant.FILE_EMPTY);
+        }
+        try  {
+            // 1.生成唯一文件名
+            String originalFilename = file.getOriginalFilename();   //  原始文件名
+            log.info("原始文件名:{}", originalFilename);
+            String fileSuffix = originalFilename.substring(originalFilename.lastIndexOf("."));  // 文件后缀
+            log.info("文件后缀:{}", fileSuffix);
+            String fileName = UUID.randomUUID().toString() + fileSuffix; // 唯一文件名
+            log.info("唯一文件名:{}", fileName);
+            // 2.构建oss存储路径
+            String objectName = DEFAULT_FOLDER + fileName;
+            // 3.调用工具类上传文件
+            String fileUrl = aliOssUtil.upload(file.getInputStream(), objectName);
+            // 4.返回文件URL
+            return OptResult.success(fileUrl);
+        } catch (Exception e) {
+            log.error(MessageConstant.UPLOAD_FAILURE +":{}", e.getMessage(), e);
+            return OptResult.error(MessageConstant.UPLOAD_FAILURE);
+        }
+
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java

@@ -7,12 +7,10 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 @Tag(name = "模型评估相关接口")
+@CrossOrigin(origins = "http://localhost:3000")
 @RestController
 @RequestMapping("/evaluation")
 @Slf4j

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/GpuResourceController.java

@@ -1,32 +1,27 @@
 package com.bipt.intelligentapplicationorchestrationservice.controller;
-
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ResponseVO;
-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.*;
-
 import java.util.List;
-
 @RestController
-@RequestMapping
+@RequestMapping("/gpu")
+@CrossOrigin(origins = "http://localhost:3000")
 public class GpuResourceController {
     @Autowired
     private GpuManageService gpuManageService;
-
+    @PostMapping(value = "/add", produces = "application/json")
-    @PostMapping
     public ResponseVO addGpu(@Valid @RequestBody GpuCreateDTO dto){
         return gpuManageService.createGpuResource(dto);
     }
-
     @DeleteMapping("/{gpuId}")
     public ResponseVO removeGpu(@PathVariable("gpuId") Long gpuId){
         return gpuManageService.deleteGpuResource(gpuId);
     }
-
     @PutMapping("/{gpuId}")
     public void updateGpuResource(
             @PathVariable Long gpuId,
@@ -34,15 +29,12 @@ public class GpuResourceController {
         dto.setGPUId(gpuId);
         gpuManageService.updateGpuResource(dto);
     }
-
     @GetMapping("/search")
     public ResponseVO<List<GpuResponseDTO>> searchGpuResources(
             @RequestParam(required = false) String model,
             @RequestParam(required = false) Integer memorySize,
             @RequestParam(required = false) String ip){
-
         List<GpuResponseDTO> resources = gpuManageService.searchByCriteria(model, memorySize,ip);
-
         return ResponseVO.success(resources);
     }
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java

@@ -1,5 +1,6 @@
 package com.bipt.intelligentapplicationorchestrationservice.controller;
 
+import com.bipt.intelligentapplicationorchestrationservice.constant.MessageConstant;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
 import com.bipt.intelligentapplicationorchestrationservice.service.ModelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -52,14 +53,16 @@ public class ModelController {
     }
 
     @Operation(summary = "模型更新")
-    @PutMapping("/updateModel")
+    @PutMapping("/updateModel/{id}")
-    public OptResult updateModel(@RequestBody ModelVersionDTO dto){
+    public OptResult updateModel(@PathVariable("id") Long id, @RequestBody ModelVersionDTO dto) {
-        log.info("模型更新");
+        log.info("模型更新，id: {}", id);
+        dto.setId(id);
         modelService.updateModel(dto);
         return OptResult.success();
     }
 
 
+
     @Operation(summary = "模型版本删除")
     @DeleteMapping("/deleteModelVersion")
     public OptResult deleteModelVersion(Long id){
@@ -70,10 +73,18 @@ public class ModelController {
 
     @Operation(summary = "更新生命周期")
     @PutMapping("/updateLifeCycle")
-    public OptResult updateLifeCycle(Long id,String lifeCycle){
+    public OptResult updateLifeCycle(@RequestParam Long id, @RequestParam String lifeCycle){
         log.info("更新生命周期");
-        modelService.updateLifeCycle(id,lifeCycle);
+        try {
-        return OptResult.success();
+            modelService.updateLifeCycle(id,lifeCycle);
+            return OptResult.success(MessageConstant.LIFECYCLE_UPDATE_SUCCESS);
+        } catch (IllegalArgumentException e) {
+            return OptResult.error(e.getMessage());
+        } catch (RuntimeException e) {
+            return OptResult.error(e.getMessage());
+        } catch (Exception e){
+            return OptResult.error(MessageConstant.UNKNOWN_ERROR);
+        }
     }
 
     @Operation(summary = "查询生命周期列表")
@@ -91,5 +102,31 @@ public class ModelController {
         return OptResult.success(datasetList);
     }
 
+    @Operation(summary = "获取模型训练信息")
+    @GetMapping("/getModelTrainInfo")
+    public OptResult getModelTrainInfo(Long id){
+        log.info("获取模型训练信息");
+        ModelTrainInfoVO modelTrainInfo = modelService.getModelTrainInfo(id);
+        return OptResult.success(modelTrainInfo);
+    }
+
+    @Operation(summary = "模型修改成训练中")
+    @PutMapping("/updateModelTrain")
+    public OptResult updateModelTrain(Long id){
+        log.info("模型修改成训练中");
+        modelService.updateModelTrain(id);
+        return OptResult.success();
+    }
+
+    @Operation(summary = "模型更新小版本")
+    @PutMapping("/updateModelVersionMinor")
+    public OptResult updateModelVersionMinor(@RequestBody ModelVersionDTO dto){
+        log.info("模型更新小版本");
+        modelService.updateModelVersionMinor(dto);
+        return OptResult.success();
+    }
+
+
+
 
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/PublishController.java

@@ -1,11 +1,16 @@
 package com.bipt.intelligentapplicationorchestrationservice.controller;
 
+import com.bipt.intelligentapplicationorchestrationservice.config.IpConfig;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployRequest;
+import com.bipt.intelligentapplicationorchestrationservice.mapper.ModelMapper;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
+import com.bipt.intelligentapplicationorchestrationservice.service.ModelDeployer;
 import com.bipt.intelligentapplicationorchestrationservice.service.PublishService;
 import com.bipt.intelligentapplicationorchestrationservice.util.NacosServiceUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,6 +22,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/publish")
 @Slf4j
+@CrossOrigin(origins = "http://localhost:3000")   // 生产环境指定具体域名
+
 public class PublishController {
     @Autowired
     private PublishService publishService;
@@ -24,21 +31,35 @@ public class PublishController {
     @Autowired
     private NacosServiceUtil nacosServiceUtil;
 
+    @Autowired
+    private ModelMapper modelMapper;
+    @Autowired
+    private IpConfig ipConfig;
+
+    @Autowired
+    private ModelDeployer modelDeployer;
+
     @PostMapping
     @Operation(summary ="新增发布请求")
     @Transactional
     public OptResult<List<ServicePublishVO>> save(@RequestBody ServicePublishDTO servicePublishDTO) {
         log.info("模型发布请求:{}", servicePublishDTO);
         publishService.save(servicePublishDTO);
-        //todo 调用模型部署
+        //调用模型部署
-
+        DeployRequest request = new DeployRequest();
+        Long modelId = servicePublishDTO.getModelId();
+        ModelVersion modelVersion = modelMapper.selectById(modelId);
+        String modelConfig = modelVersion.getModelConfig();
+        //假设modelConfig只存GPU数据
+        request.setModelId(String.valueOf(modelId));
+        request.setRequiredMemory(Integer.parseInt(modelConfig));
+        modelDeployer.deploy(request);
         // 获取前端传来的IP字符串
         String ipListStr = servicePublishDTO.getIp();
         if (ipListStr == null || ipListStr.trim().isEmpty()) {
             log.warn("IP列表为空，不进行Nacos注册");
             return OptResult.success();
         }
-
         try {
             // 使用逗号分割IP字符串
             String[] ipArray = ipListStr.split(",");
@@ -59,15 +80,31 @@ public class PublishController {
             log.error("Nacos服务注册失败", e);
             return OptResult.error("Nacos服务注册失败"); // 根据业务需求返回错误
         }
-
-
         return OptResult.success();
     }
 
+    /**
+     * 获取已发布的服务列表
+     * @return
+     */
+    @GetMapping("/list")
+    @Operation(summary ="获取已发布服务列表")
+    public OptResult<List<ServicePublishVO>> listPublishedServices() {
+        log.info("获取已发布服务列表接口被调用");
+        List<ServicePublishVO> services = publishService.listPublishedServices();
+        log.info("返回的数据: {}", services);
+        return OptResult.success(services);
+    }
 
-
+    /**
-
+     * 获取IP列表
-
+     * @return
-
+     */
-
+    @GetMapping("/config/ips")
+    @Operation(summary = "获取可用IP地址列表")
+    public OptResult<List<String>> getAvailableIps() {
+        List<String> ips = ipConfig.getIps();
+        log.info("返回列表；{}",ips);
+        return OptResult.success(ips);
+    }
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java

@@ -1,12 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.entity;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class DeploymentResource {
-    private final GpuResource gpu;
-    private final String url;
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/DeployRequest.java

@@ -0,0 +1,87 @@
+package com.bipt.intelligentapplicationorchestrationservice.entity;
+
+import java.util.Objects;
+
+public class DeployRequest {
+    private String modelId;
+    private int requiredMemory;
+    private DeployType deployType;
+    private ModelInfo modelInfo;
+
+    // 部署类型枚举
+    public enum DeployType {
+        NORMAL,
+        GRAY
+    }
+    // 默认构造函数
+    public DeployRequest() {
+    }
+
+    public DeployRequest(String modelId, int requiredMemory, DeployType deployType, ModelInfo modelInfo) {
+        this.modelId = modelId;
+        this.requiredMemory = requiredMemory;
+        this.deployType = deployType;
+        this.modelInfo = modelInfo;
+    }
+
+    // Getter & Setter 方法
+    public String getModelId() {
+        return modelId;
+    }
+
+    public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+
+    public int getRequiredMemory() {
+        return requiredMemory;
+    }
+
+    public void setRequiredMemory(int requiredMemory) {
+        this.requiredMemory = requiredMemory;
+    }
+
+    public DeployType getDeployType() {
+        return deployType;
+    }
+
+    public void setDeployType(DeployType deployType) {
+        this.deployType = deployType;
+    }
+
+    public ModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    public void setModelInfo(ModelInfo modelInfo) {
+        this.modelInfo = modelInfo;
+    }
+
+    // Equals 和 HashCode 方法
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeployRequest that = (DeployRequest) o;
+        return requiredMemory == that.requiredMemory &&
+                Objects.equals(modelId, that.modelId) &&
+                deployType == that.deployType &&
+                Objects.equals(modelInfo, that.modelInfo);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(modelId, requiredMemory, deployType, modelInfo);
+    }
+
+    // toString 方法
+    @Override
+    public String toString() {
+        return "DeployRequest{" +
+                "modelId='" + modelId + '\'' +
+                ", requiredMemory=" + requiredMemory +
+                ", deployType=" + deployType +
+                ", modelInfo=" + modelInfo +
+                '}';
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/DeployResponse.java

@@ -1,4 +1,4 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.entity;
+package com.bipt.intelligentapplicationorchestrationservice.entity;
 
 public class DeployResponse<T> {
     private boolean isSuccess;

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/DeploymentResource.java

@@ -0,0 +1,15 @@
+package com.bipt.intelligentapplicationorchestrationservice.entity;
+
+import lombok.Getter;
+
+@Getter
+//@AllArgsConstructor
+public class DeploymentResource {
+    private final GpuResource gpu;
+    private final String url;
+
+    public DeploymentResource(GpuResource gpu, String url) {
+        this.gpu = gpu;
+        this.url = url;
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/GpuMapper.java

@@ -0,0 +1,16 @@
+package com.bipt.intelligentapplicationorchestrationservice.entity;
+
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuCreateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuResponseDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuUpdateDTO;
+import org.mapstruct.Mapper;
+import org.springframework.stereotype.Component;
+
+@Component
+@Mapper(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/entity/GpuResource.java

@@ -0,0 +1,111 @@
+package com.bipt.intelligentapplicationorchestrationservice.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.*;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@Setter
+@Getter
+public class GpuResource {
+    @TableField("GPUId")
+    private Long GPUId;
+
+    @TableField("GPUModel")
+    private String GPUModel;
+
+    @TableField("GPUMemorySize")
+    private Integer GPUMemorySize;
+
+    @TableField("is_deleted")
+    private Integer isDeleted = 0;
+
+    @TableField("Ip")
+    private String Ip;
+
+    @TableField("created_time")
+    private LocalDateTime createTime;
+
+    @TableField("update_time")
+    private LocalDateTime UpdateTime;
+
+    @TableField("GPUMaxMemory")
+    private Integer GPUMaxMemory;
+
+    public GpuResource(long l, String s, boolean b) {
+        this.GPUId = l;
+        this.GPUModel = s;
+        this.isDeleted = b ? 1 : 0;
+    }
+//    public @Pattern(regexp = "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$") String getIp() {
+//        return Ip;
+//    }
+
+    public Boolean getIsDeleted() {
+        return isDeleted != 0;
+    }
+
+
+
+    public GpuResource(Long Id, String GPUModel, Integer GPUMemorySize, String ip, LocalDateTime create_time) {
+        this.GPUId = Id;
+        this.GPUModel = GPUModel;
+        this.GPUMemorySize = GPUMemorySize;
+        this.Ip = ip;
+        this.createTime = create_time;
+    }
+
+    public GpuResource() {}
+
+    public Integer getGPUMemorySize() {
+        return GPUMemorySize;
+    }
+
+    public Long getGPUId() {
+        return GPUId;
+    }
+
+    public String getGPUModel() {
+        return GPUModel;
+    }
+
+    public String getIp() {
+        return Ip;
+    }
+
+    public LocalDateTime getCreateTime() {
+        return createTime;
+    }
+
+    public Integer getGPUMaxMemory() {
+        return GPUMaxMemory;
+    }
+
+    public void setGPUId(Long GPUId) {
+        this.GPUId = GPUId;
+    }
+
+    public void setGPUModel(String GPUModel) {
+        this.GPUModel = GPUModel;
+    }
+
+    public void setGPUMemorySize(Integer GPUMemorySize) {
+        this.GPUMemorySize = GPUMemorySize;
+    }
+
+    public void setIsDeleted(Integer isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+
+    public void setIp(String ip) {
+        Ip = ip;
+    }
+
+    public void setCreateTime(LocalDateTime createTime) {
+        this.createTime = createTime;
+    }
+
+
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/GpuResourceRepository.java

@@ -0,0 +1,79 @@
+package com.bipt.intelligentapplicationorchestrationservice.entity;
+
+import com.bipt.intelligentapplicationorchestrationservice.service.RedisCacheService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Repository
+public class GpuResourceRepository {
+    // Redis键定义
+    // Redis键模式定义
+    private static final String GPU_KEY_PREFIX = "gpu:";
+
+    private final RedisCacheService redisCacheService;
+
+    @Autowired
+    public GpuResourceRepository(RedisCacheService redisCacheService) {
+        this.redisCacheService = redisCacheService;
+    }
+
+    /**
+     * 保存或更新GPU资源
+     * @param resource GPU资源对象
+     */
+    public void save(GpuResource resource) {
+        redisCacheService.put(resource.getGPUId().toString(), resource);
+    }
+
+    /**
+     * 按ID查询GPU资源
+     * @param id GPU资源ID
+     * @return GPU资源对象（可能为null）
+     */
+    public GpuResource findById(Long id) {
+        return redisCacheService.get(id.toString());
+    }
+
+    /**
+    public List<GpuResource> findByStatus(Status status) {
+        // 由于Redis存储结构不支持直接按属性查询，需要通过keys + 过滤方式实现
+        // 注意：生产环境中应考虑使用RedisSCAN替代KEYS（此处为简写）
+        Set<String> keys = redisCacheService.scanKeys(GPU_KEY_PREFIX + "*");
+
+        List<GpuResource> result = new ArrayList<>();
+        keys.forEach(key -> {
+            String gpuId = key.substring(GPU_KEY_PREFIX.length());
+            GpuResource resource = redisCacheService.get(gpuId);
+            if (resource != null && resource.getStatus() == status) {
+                result.add(resource);
+            }
+        });
+
+        return result;
+    }
+
+    public void updateStatus(Long gpuId, Status newStatus) {
+        GpuResource resource = findById(gpuId);
+        if (resource != null) {
+            resource.setStatus(newStatus);
+            save(resource);
+        }
+    }
+    */
+    public List<GpuResource> findAll() {
+        Set<String> keys = redisCacheService.scanKeys("gpu:*");
+        return keys.stream()
+                .map(key -> {
+                    String gpuId = key.substring(4); // 去除"gpu:"前缀
+                    return redisCacheService.get(gpuId);
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+}
+

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/ModelInfo.java

@@ -0,0 +1,102 @@
+package com.bipt.intelligentapplicationorchestrationservice.entity;
+
+import java.util.Objects;
+
+public class ModelInfo {
+    private String modelId;
+    private String modelName;
+    private String modelType;
+    private String preprocessScript;
+    private String modelFilePath;
+    private String storageLocation;
+
+    public String getModelId() {
+        return modelId;
+    }
+
+    public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+
+    // Getter & Setter 方法
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getModelType() {
+        return modelType;
+    }
+
+    public void setModelType(String modelType) {
+        this.modelType = modelType;
+    }
+
+    public String getPreprocessScript() {
+        return preprocessScript;
+    }
+
+    public void setPreprocessScript(String preprocessScript) {
+        this.preprocessScript = preprocessScript;
+    }
+
+    public String getModelFilePath() {
+        return modelFilePath;
+    }
+
+    public void setModelFilePath(String modelFilePath) {
+        this.modelFilePath = modelFilePath;
+    }
+
+    public void setStorageLocation(String storageLocation) {
+        // 验证路径格式
+        if (storageLocation != null && !isValidStoragePath(storageLocation)) {
+            throw new IllegalArgumentException("无效的存储路径: " + storageLocation);
+        }
+        this.storageLocation = storageLocation;
+    }
+
+    private boolean isValidStoragePath(String path) {
+        // 1. 基本非空检查
+        if (path == null || path.trim().isEmpty()) return false;
+
+        // 2. 防止路径遍历攻击
+        if (path.contains("..")) return false;
+
+        // 3. 仅允许合法路径格式
+        return path.startsWith("/") ||
+                path.startsWith("s3://") ||
+                path.matches("[a-zA-Z]:\\\\"); // Windows 路径
+    }
+
+    // Equals 和 HashCode 方法
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ModelInfo modelInfo = (ModelInfo) o;
+        return Objects.equals(modelName, modelInfo.modelName) &&
+                Objects.equals(modelType, modelInfo.modelType) &&
+                Objects.equals(preprocessScript, modelInfo.preprocessScript) &&
+                Objects.equals(modelFilePath, modelInfo.modelFilePath);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(modelName, modelType, preprocessScript, modelFilePath);
+    }
+
+    // toString 方法
+    @Override
+    public String toString() {
+        return "ModelInfo{" +
+                "modelName='" + modelName + '\'' +
+                ", modelType='" + modelType + '\'' +
+                ", preprocessScript='" + preprocessScript + '\'' +
+                ", modelFilePath='" + modelFilePath + '\'' +
+                '}';
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/entity/GpuResource.java

@@ -1,96 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-@Setter
-@Data
-public class GpuResource {
-    @Getter
-    @TableField("GPUId")
-    private Long GPUId;
-
-    @Getter
-    @TableField("GPUModel")
-    private String GPUModel;
-
-    @Getter
-    @TableField("GPUMemorySize")
-    private Integer GPUMemorySize;
-
-    @TableField("is_deleted")
-    private Integer isDeleted = 0;
-
-    @TableField("Ip")
-    private String Ip;
-
-    @Getter
-    @TableField("CreatedTime")
-    private LocalDateTime CreateTime;
-
-    @Getter
-    @TableField("update_time")
-    private LocalDateTime UpdateTime;
-
-    @Getter
-    @TableField("GPUMaxMemory")
-    private Integer GPUMaxMemory;
-
-    public GpuResource(long l, String s, boolean b) {
-        this.GPUId = l;
-        this.GPUModel = s;
-        this.isDeleted = b ? 1 : 0;
-    }
-//    public @Pattern(regexp = "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$") String getIp() {
-//        return Ip;
-//    }
-
-    public Boolean getIsDeleted() {
-        return isDeleted != 0;
-    }
-
-
-
-    public GpuResource(Long Id, String Model, Integer MemorySize, String ip, LocalDateTime create_time) {
-        this.GPUId = Id;
-        this.GPUModel = Model;
-        this.GPUMemorySize = MemorySize;
-        this.Ip = ip;
-        this.CreateTime = create_time;
-    }
-
-    public GpuResource() {}
-
-//    public void setGPUId(Long GPUId) {
-//        this.GPUId = GPUId;
-//    }
-//
-//    public void setGPUModel(String GPUModel) {
-//        this.GPUModel = GPUModel;
-//    }
-//
-//    public void setGPUMemorySize(Integer GPUMemorySize) {
-//        this.GPUMemorySize = GPUMemorySize;
-//    }
-//
-//    public void setIsDeleted(Integer isDeleted) {
-//        this.isDeleted = isDeleted;
-//    }
-//
-//    public void setIp(String ip) {
-//        Ip = ip;
-//    }
-//
-//    public void setCreateTime(LocalDateTime createTime) {
-//        CreateTime = createTime;
-//    }
-//
-//    public void setUpdateTime(LocalDateTime updateTime) {
-//        UpdateTime = updateTime;
-//    }
-
-}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/ErrorCodeEnum.java

@@ -1,4 +1,4 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.enums;
+package com.bipt.intelligentapplicationorchestrationservice.enumeration;
 
 import lombok.Getter;
 
@@ -19,7 +19,8 @@ public enum ErrorCodeEnum {
     DB_CONNECTION_FAILED(701, "数据库连接错误"),
     VALIDATION_ERROR(801,"参数校验异常" ),
 
-    CACHE_INIT_ERROR(901, "缓存初始化失败");
+    CACHE_INIT_ERROR(901, "缓存初始化失败"),
+    INTERNAL_SERVER_ERROR(201,"内部服务出错" );
 
     public int getCode() {
         return code;

src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/DeployException.java

@@ -0,0 +1,27 @@
+package com.bipt.intelligentapplicationorchestrationservice.exception;
+
+public class DeployException extends RuntimeException{
+    // 错误代码
+    private int errorCode = 500;
+
+    public DeployException(String message) {
+        super(message);
+    }
+
+    public DeployException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public DeployException(Throwable cause) {
+        super(cause);
+    }
+
+    public DeployException(String message, int errorCode) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
+    public int getErrorCode() {
+        return errorCode;
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/EvaluationFailedException.java

@@ -0,0 +1,13 @@
+package com.bipt.intelligentapplicationorchestrationservice.exception;
+
+public class EvaluationFailedException extends DeployException{
+    public EvaluationFailedException(String message) {
+        super(message);
+    }
+    public EvaluationFailedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+    public EvaluationFailedException() {
+        super("模型评估未通过，无法部署");
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/GpuGlobalException.java

@@ -1,7 +1,7 @@
 package com.bipt.intelligentapplicationorchestrationservice.exception;
 
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
+import com.bipt.intelligentapplicationorchestrationservice.enumeration.ErrorCodeEnum;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.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.exception;
 
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
+import com.bipt.intelligentapplicationorchestrationservice.enumeration.ErrorCodeEnum;
 import lombok.Getter;
 
 @Getter

src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/EvaluationMapper.java

@@ -5,14 +5,14 @@ import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO;
 public interface EvaluationMapper {
     /*
     * 查询模型评估日志详情
-    * @param id 模型评估日志id
+    * @param id 模型版本id
     * @return 模型评估日志详情
      */
     ModelLogVO selectLogDetail(Long id);
 
     /*
     * 更新模型评估日志状态(评估通过则上线）
-    * @param id 模型评估日志id
+    * @param id 模型版本id
     * @param status 模型评估日志状态
      */
     void update(Long id, Integer status);

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

@@ -1,16 +0,0 @@
-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/mapper/GpuResourceDao.java

@@ -1,6 +1,6 @@
 package com.bipt.intelligentapplicationorchestrationservice.mapper;
 
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
 import org.apache.ibatis.annotations.*;
 import org.apache.ibatis.jdbc.SQL;
 
@@ -12,7 +12,7 @@ import java.util.Map;
 public interface GpuResourceDao {
     //---------------------- 基础CRUD ------------------------
     @Insert("INSERT INTO Ipz.public.gpu_resource (GPUModel, GPUMemorySize, Ip) " +
-            "VALUES (#{model}, #{memory}, #{ip})")
+            "VALUES (#{GPUModel}, #{GPUMemorySize}, #{Ip})")
     @Options(useGeneratedKeys = true, keyProperty = "GPUId")
     Integer insert(GpuResource entity);
 
@@ -27,7 +27,7 @@ public interface GpuResourceDao {
     Integer isDeleted(@Param("gpuId") Long gpuId);
 
     @Update("UPDATE Ipz.public.gpu_resource " +
-            "SET GPUModel = #{model}, GPUMemorySize = #{memory}, Ip = #{ip} " +
+            "SET GPUModel = #{GPUModel}, GPUMemorySize = #{GPUMemorySize}, Ip = #{Ip} " +
             "WHERE GPUId = #{GPUId}")
     Integer updateById(GpuResource entity);
 

src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java

@@ -76,4 +76,11 @@ public interface ModelMapper {
      */
     @Select("select dataset_id,dataset_name from dataset")
     List<DatasetEntity> listDataset();
+
+    /**
+      * 获取模型训练信息
+      * @param id  模型版本表id
+      * 返回模型训练信息
+      */
+    ModelTrainInfoVO getModelTrainInfo(Long id);
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/PublishMapper.java

@@ -6,6 +6,8 @@ import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
 
+import java.util.List;
+
 @Mapper
 public interface PublishMapper {
 
@@ -15,5 +17,6 @@ public interface PublishMapper {
 
     Long getByApiUrl(String apiUrl);
 
-
+    @Select("SELECT model_id,api_url,ip FROM service_publish")
+    List<ServicePublishVO> listPublishedServices();
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/GpuCreateDTO.java

@@ -1,5 +1,6 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.dto;
+package com.bipt.intelligentapplicationorchestrationservice.pojo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
@@ -14,14 +15,17 @@ public class GpuCreateDTO {
     @NotBlank(message = "GPU型号不能为空")
     @Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
             message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU")
+    @JsonProperty("GPUModel") // 显示指定JSON映射名称
     private String GPUModel;
 
     @NotNull(message = "显存容量不能为空")
+    @JsonProperty("GPUMemorySize")
     private Integer GPUMemorySize;
 
     @NotBlank(message = "IP地址不能为空")
-    @Pattern(regexp = "^\\\\d{1,3}\\\\.\\\\d{1,3}\\\\.\\\\d{1,3}\\\\.\\\\d{1,3}$",
+    @Pattern(regexp = "^(\\d{1,3}\\.){3}\\d{1,3}$",
             message = "IP地址格式无效")
+    @JsonProperty("Ip") // 显示指定JSON映射名称
     private String Ip;
 
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/GpuResponseDTO.java

@@ -1,23 +1,30 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.dto;
+package com.bipt.intelligentapplicationorchestrationservice.pojo;
 
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
 public class GpuResponseDTO {
-    private Long id;
+    @JsonView
+    private Long GPUId;
     private String GPUModel;
     private Integer GPUMemorySize;
     private String Ip;
+
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     private LocalDateTime createTime;
+
     // Builder类
     public static class Builder {
         private Long id;
         private String model;
         private Integer memory;
         private String ip;
-        private LocalDateTime createdTime;
+        private LocalDateTime createTime = LocalDateTime.now(); // 统一命名为createTime
 
         public Builder id(Long id) {
             this.id = id;
@@ -39,19 +46,29 @@ public class GpuResponseDTO {
             return this;
         }
 
-        public Builder createdTime(LocalDateTime createdTime) {
+        public Builder createTime(LocalDateTime createTime) {
-            this.createdTime = createdTime;
+            this.createTime = createTime;
             return this;
         }
+
         public GpuResponseDTO build() {
-            // 必填字段校验（如网页2的推荐）
+            // 必填字段校验
             if (id == null) {
                 throw new IllegalArgumentException("GPU ID必须填写");
             }
-            return new GpuResponseDTO();
+
+            GpuResponseDTO dto = new GpuResponseDTO();
+            dto.setGPUId(id);
+            dto.setGPUModel(model);
+            dto.setGPUMemorySize(memory);
+            dto.setIp(ip);
+            dto.setCreateTime(createTime); // 正确赋值createTime
+
+            return dto;
         }
     }
-    public String getCreateTimeStr(){
+
-        return "GPU创建时间：" + createTime.toString();
+    public String getCreateTimeStr() {
+        return "GPU创建时间：" + (createTime != null ? createTime.toString() : "未设置");
     }
-}
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/GpuUpdateDTO.java

@@ -1,5 +1,6 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.dto;
+package com.bipt.intelligentapplicationorchestrationservice.pojo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.*;
@@ -7,14 +8,36 @@ import lombok.*;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-//@Setter
+@Setter
-//@Getter
+@Getter
 public class GpuUpdateDTO {
-    public @NotNull(message = "GPU ID cannot be null") Long getGPUId() {
+
-        return GPUId;
+    private Long GPUId;
+
+    public @Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
+            message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU") String getGPUModel() {
+        return GPUModel;
     }
 
-    public void setGPUId(@NotNull(message = "GPU ID cannot be null") Long GPUId) {
+    public @Pattern(regexp = "^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$",
+            message = "IP地址格式无效") String getIp() {
+        return Ip;
+    }
+
+    @Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
+            message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU")
+    @JsonProperty("GPUModel") // 显示指定JSON映射名称
+    private String GPUModel;
+
+    @JsonProperty("GPUMemorySize") // 显示指定JSON映射名称
+    private Integer GPUMemorySize;
+
+    @Pattern(regexp = "^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$",
+            message = "IP地址格式无效")
+    @JsonProperty("Ip") // 显示指定JSON映射名称
+    private String Ip;
+
+    public void setGPUId(Long GPUId) {
         this.GPUId = GPUId;
     }
 
@@ -27,18 +50,15 @@ public class GpuUpdateDTO {
             message = "IP地址格式无效") String ip) {
         Ip = ip;
     }
+    public Long getGPUId() {
+        return GPUId;
+    }
 
-    @NotNull(message = "GPU ID cannot be null")
+    public Integer getGPUMemorySize() {
-    private Long GPUId;
+        return GPUMemorySize;
+    }
 
-    @Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
+    public void setGPUMemorySize(Integer GPUMemorySize) {
-            message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU")
+        this.GPUMemorySize = GPUMemorySize;
-    private String GPUModel;
+    }
-
-    @Setter
-    private Integer GPUMemorySize;
-
-    @Pattern(regexp = "^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$",
-            message = "IP地址格式无效")
-    private String Ip;
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelEvaluation.java

@@ -17,7 +17,7 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 public class ModelEvaluation implements Serializable {
     private Long id;                // 评估记录id
-    private Long modelId;           // 关联模型id
+    private Long modelVersionId;           // 关联模型id,后续修改成了模型版本id
     private LocalDateTime evaluationTime; // 评估时间
     private String evaluationResult; // 评估结果
     private String operator;        // 评估操作人员

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelTrainInfoVO.java

@@ -0,0 +1,18 @@
+package com.bipt.intelligentapplicationorchestrationservice.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ModelTrainInfoVO {
+    private Long id;
+    private Integer datasetId;      // 数据集id
+    private String modelConfig;     // 模型配置信息
+    private String dsPath;// 版本信息表id
+    private String dataPreHandleFile;      // 数据预处理文件存储路径
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersionDTO.java

@@ -11,7 +11,8 @@ import java.time.LocalDateTime;
 @NoArgsConstructor
 @AllArgsConstructor
 public class ModelVersionDTO {
-    private Long id;                // 模型id
+    private Long id;                // 模型版本id
+    private Long modelId;           // 模型id
     private String version;         // 模型版本
     private Integer datasetId;      // 数据集id
     private String modelConfig;     // 模型配置信息

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ResponseVO.java

@@ -1,6 +1,6 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.vo;
+package com.bipt.intelligentapplicationorchestrationservice.pojo;
 
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
+import com.bipt.intelligentapplicationorchestrationservice.enumeration.ErrorCodeEnum;
 
 
 import java.io.Serializable;
@@ -35,4 +35,28 @@ public class ResponseVO<T> implements Serializable {
     public static <T> ResponseVO<T> error(ErrorCodeEnum errorCode) {
        return new ResponseVO<>(errorCode.getCode(), errorCode.getMessage(), null);
     }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishVO.java

@@ -17,9 +17,9 @@ import java.time.LocalDateTime;
 @AllArgsConstructor
 public class ServicePublishVO implements Serializable {
     private Long modelId;
-    private String GPUModel;
+    /*private String GPUModel;*/
     private String ip;
-    private String GPUMemorySize;
+/*    private String GPUMemorySize;*/
     private String apiUrl;
 
 

src/main/java/com/bipt/intelligentapplicationorchestrationservice/properties/AliOssProperties.java

@@ -0,0 +1,16 @@
+package com.bipt.intelligentapplicationorchestrationservice.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Data
+@Component
+@ConfigurationProperties(prefix = "aliyun.oss") // 读取以 aliyun.oss 开头的配置
+public class AliOssProperties {
+    private String endpoint;
+    private String accessKeyId;
+    private String accessKeySecret;
+    private String bucketName;
+}
+

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java

@@ -2,9 +2,11 @@ package com.bipt.intelligentapplicationorchestrationservice.service;
 
 import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
 import com.bipt.intelligentapplicationorchestrationservice.exception.CacheInitException;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.annotation.PostConstruct;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.RedisConnectionFailureException;
@@ -18,7 +20,6 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
-@Transactional  // 添加类级别事务管理
 @Component
 public class CacheManager {
     @Autowired
@@ -27,6 +28,9 @@ public class CacheManager {
     @Autowired
     private GpuResourceDao gpuResourceDao;
 
+    @Autowired
+    private ObjectMapper objectMapper; // 注入ObjectMapper用于类型转换
+
     private final ReentrantLock lock = new ReentrantLock();
 
     @Value("${cache.redis-key-prefix:gpu:}")
@@ -38,9 +42,9 @@ public class CacheManager {
     @Value("${cache.init-batch-size:500}")
     private int initBatchSize;
 
-    private static final Logger log = org.slf4j.LoggerFactory.getLogger(CacheManager.class);
+    private static final Logger log = LoggerFactory.getLogger(CacheManager.class);
+
     // 全量加载（带分页和分布式锁）
-    @Transactional(propagation = Propagation.REQUIRED)  // 方法级别覆盖
     @PostConstruct
     public void loadFullCache() {
         if (tryLock()) {
@@ -82,16 +86,12 @@ public class CacheManager {
     // 带随机TTL的缓存设置
     private void setCacheWithTTL(GpuResource entity) {
         String key = buildKey(entity.getGPUId().toString());
-        GpuResource cached = (GpuResource) redisTemplate.opsForValue().get(key);
 
-        // 保留原有内存字段值
+        // 直接存储实体对象，确保类型一致性
-        if (cached != null && cached.getGPUMemorySize() != null) {
-            entity.setGPUMemorySize(cached.getGPUMemorySize());
-        }
         redisTemplate.opsForValue().set(
                 key,
                 entity,
-                ttlBase + (int)(Math.random() * 600), // 随机TTL防止雪崩
+                ttlBase + (int)(Math.random() * 600),
                 TimeUnit.SECONDS
         );
     }
@@ -114,6 +114,7 @@ public class CacheManager {
     private void unlock() {
         lock.unlock();
     }
+
     // 分页加载入口
     public void loadFullCache(int batchSize) {
         int page = 0;
@@ -121,12 +122,11 @@ public class CacheManager {
             List<GpuResource> batch = gpuResourceDao.findByPage(page * batchSize, batchSize);
             if (batch.isEmpty()) break;
 
-            batch.forEach(this::refreshWithRetry); // 带重试的刷新逻辑
+            batch.forEach(this::refreshWithRetry);
             page++;
         }
     }
 
-
     // 带重试机制的缓存刷新
     public void refreshWithRetry(GpuResource entity) {
         try {
@@ -135,7 +135,7 @@ public class CacheManager {
             // 3次重试逻辑
             for (int i = 0; i < 3; i++) {
                 try {
-                    log.info("重试第 {} 次", i + 1); // 添加日志
+                    log.info("重试第 {} 次", i + 1);
                     Thread.sleep(1000);
                     setCacheWithTTL(entity);
                     return;
@@ -148,7 +148,6 @@ public class CacheManager {
                     Thread.currentThread().interrupt();
                 }
             }
-
         }
     }
 
@@ -162,8 +161,35 @@ public class CacheManager {
         redisTemplate.delete(key);
     }
 
+    // 修改获取缓存的方法，增加类型安全处理
+    @SuppressWarnings("unchecked")
     public GpuResource getFromCache(String gpuId) {
-        return (GpuResource) redisTemplate.opsForValue().get("gpu:" + gpuId);
+        String key = buildKey(gpuId);
-    }
+        Object value = redisTemplate.opsForValue().get(key);
 
-}
+        // 处理可能的类型不匹配问题
+        if (value == null) {
+            return null;
+        }
+
+        try {
+            // 优先尝试直接转换
+            if (value instanceof GpuResource) {
+                return (GpuResource) value;
+            }
+            // 如果是LinkedHashMap，使用ObjectMapper转换
+            else if (value instanceof java.util.LinkedHashMap) {
+                return objectMapper.convertValue(value, GpuResource.class);
+            }
+            // 其他情况尝试序列化后反序列化（适用于JSON存储场景）
+            else {
+                // 先序列化为JSON字符串，再反序列化为对象
+                String json = objectMapper.writeValueAsString(value);
+                return objectMapper.readValue(json, GpuResource.class);
+            }
+        } catch (Exception e) {
+            log.error("获取缓存时类型转换失败，key: {}, valueType: {}", key, value.getClass().getName(), e);
+            return null;
+        }
+    }
+}

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

@@ -1,9 +1,10 @@
 package com.bipt.intelligentapplicationorchestrationservice.service;
 
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ResponseVO;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -12,4 +13,7 @@ public interface GpuManageService {
     public ResponseVO deleteGpuResource(Long gpuId);
     public void updateGpuResource(GpuUpdateDTO entity);
     public List<GpuResponseDTO> searchByCriteria(String model, Integer memorySize, String ip);
+
+    @Transactional
+    ResponseVO createGpuResourceWithTrace(GpuCreateDTO dto);
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuResourceService.java

@@ -0,0 +1,33 @@
+package com.bipt.intelligentapplicationorchestrationservice.service;
+
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResourceRepository;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class GpuResourceService {
+    @Autowired
+    private GpuResourceRepository repository;
+
+    @Cacheable(value = "availableGpus")
+    public List<GpuResource> getAvailableResources() {
+// 获取所有未删除的资源
+        return repository.findAll().stream()
+                .filter(gpu -> gpu.getIsDeleted() == null || !gpu.getIsDeleted())
+                .collect(Collectors.toList());    }
+
+    public void markAsAllocated(Long gpuId, int allocatedMemory) {
+        GpuResource gpu = repository.findById(gpuId);
+        if (gpu != null) {
+            // 更新已使用内存
+            int currentMemory = gpu.getGPUMemorySize() != null ? gpu.getGPUMemorySize() : 0;
+            gpu.setGPUMemorySize(currentMemory + allocatedMemory);
+            repository.save(gpu);
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.bipt.intelligentapplicationorchestrationservice.service;
+
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployRequest;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployResponse;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeploymentResource;
+import com.bipt.intelligentapplicationorchestrationservice.exception.EvaluationFailedException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
+public class GrayDeployService {
+    @Autowired
+    private ModelEvaluator modelEvaluator;
+
+    @Autowired
+    private ResourceAllocator resourceAllocator;
+
+    @Autowired
+    private GpuResourceService gpuService;
+
+//    @Autowired
+//    private MQSender mqSender;
+
+    public DeployResponse process(DeployRequest request) {
+        // 检查评估状态
+        if (!modelEvaluator.isEvaluationPassed(request.getModelId())) {
+            throw new EvaluationFailedException("模型评估未通过");
+        }
+
+        // 分配资源并获取URL
+        DeploymentResource resource = resourceAllocator.allocate(
+                gpuService.getAvailableResources(),
+                request.getRequiredMemory(),
+                request.getModelId(),
+                true
+        );
+
+//        // 发送MQ灰度通知
+//        mqSender.sendGrayDeployNotification(
+//                resource.getUrl(),
+//                request.getModelId(),
+//                resource.getGpu().getGPUId()
+//        );
+        // 标记资源已分配（更新内存使用量）
+        gpuService.markAsAllocated(
+                resource.getGpu().getGPUId(),
+                request.getRequiredMemory()
+        );
+        return DeployResponse.success(resource.getUrl());
+
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/AlgorithmInfoServiceImpl.java

@@ -97,6 +97,7 @@ public class AlgorithmInfoServiceImpl implements AlgorithmInfoService {
 
     @Override
     public String run(Long id, String param) {
+        //todo从分布式存储中拿到文件（以下是示例）
         String file = algorithmInfoMapper.getFileById(id);
         StringBuilder result = new StringBuilder(); // 用于存储结果
 

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java

@@ -42,7 +42,7 @@ public class ModelServiceImpl implements ModelService {
         modelVersion.setModelId(modelInfo.getId());
         modelVersion.setCreateTime(LocalDateTime.now());
         modelVersion.setUpdateTime(LocalDateTime.now());
-        modelVersion.setOperateUser("zs");
+        modelVersion.setOperateUser("zs");    //这里的写死的，后续需要修改，应该是当前登录用户的id
         modelMapper.insertModelVersion(modelVersion);
     }
 
@@ -72,6 +72,10 @@ public class ModelServiceImpl implements ModelService {
         return modelVOList;
     }
 
+    /**
+     * 查询模型详情
+     * @param id
+     */
     @Override
     public ModelVersion detail(Long id) {
         log.info("查询模型详情");
@@ -79,12 +83,23 @@ public class ModelServiceImpl implements ModelService {
         return modelVersion;
     }
 
+    /**
+     * 更新模型
+     * @param dto
+     */
     @Override
     public void updateModel(ModelVersionDTO dto) {
+        // TODO: 更新模型还需要更新操作人和时间
         log.info("更新模型");
+        dto.setCreateTime(LocalDateTime.now());
+        dto.setUpdateTime(LocalDateTime.now());
         modelMapper.update(dto);
     }
 
+    /**
+     * 删除模型版本
+     * @param id
+     */
     @Override
     public void deleteModelVersion(Long id) {
         log.info("删除模型版本");
@@ -110,14 +125,14 @@ public class ModelServiceImpl implements ModelService {
         ModelLifecycle currentLifeCycle;
         ModelLifecycle targetLifeCycle;
         try {
-            currentLifeCycle = ModelLifecycle.valueOf(currentLifeCycleStr.trim()); // 数据库中是英文
+            currentLifeCycle = ModelLifecycle.valueOf(currentLifeCycleStr.trim());  // 数据库中是英文
-            targetLifeCycle = ModelLifecycle.fromDescription((lifeCycleDescription).trim());      // 前端传中文
+            targetLifeCycle = ModelLifecycle.valueOf(lifeCycleDescription.trim());        // 前端传英文代码，直接转换
         } catch (IllegalArgumentException e) {
             log.error(MessageConstant.LifeCycle_Undefined + ":{}", e.getMessage());
             throw e;
         }
 
-        // 2. 业务逻辑校验
+        // 2. 业务逻辑校验（保持不变）
         switch (currentLifeCycle) {
             case DEPLOYED:
                 if (targetLifeCycle == ModelLifecycle.DESIGNING) {
@@ -142,12 +157,15 @@ public class ModelServiceImpl implements ModelService {
         int affectedRows = modelMapper.updateLifeCycleById(id, targetLifeCycle.getDbValue());
         if (affectedRows == 0) {
             log.error("更新模型生命周期失败");
-            throw new RuntimeException(MessageConstant.UPDATE_FAILURE);
+            throw new RuntimeException(MessageConstant.LIFECYCLE_UPDATE_FAILURE);
         }
 
         log.info("模型生命周期更新成功，新状态为: {}", targetLifeCycle);
     }
 
+    /**
+     * 获取模型生命周期列表
+     */
     @Override
     public List<Map<String, String>> listLifeCycle() {
         return Arrays.stream(ModelLifecycle.values())
@@ -158,6 +176,9 @@ public class ModelServiceImpl implements ModelService {
                 .collect(Collectors.toList());
     }
 
+    /**
+     * 获取模型数据集列表
+     */
     @Override
     public List<DatasetEntity> listDataset() {
         List<DatasetEntity> datasetEntityList = modelMapper.listDataset();
@@ -165,4 +186,41 @@ public class ModelServiceImpl implements ModelService {
 
     }
 
+    /**
+     * 获取模型训练信息
+     * @param id
+     */
+    @Override
+    public ModelTrainInfoVO getModelTrainInfo(Long id) {
+        ModelTrainInfoVO modelTrainInfoVO = modelMapper.getModelTrainInfo(id);
+        return modelTrainInfoVO;
+    }
+
+    /**
+     * 模型训练(把模型修改成训练中）
+     * @param id
+     */
+    @Override
+    public void updateModelTrain(Long id) {
+        // 更新当前模型的生命周期为训练中
+        modelMapper.updateLifeCycleById(id, ModelLifecycle.TRAINING.getDbValue());
+    }
+
+    /**
+     * 模型小版本更新
+     * @param dto
+     */
+    @Override
+    public void updateModelVersionMinor(ModelVersionDTO dto) {
+        // 更新模型小版本(其实是新增一个小版本）
+        ModelVersion modelVersion = new ModelVersion();
+        BeanUtils.copyProperties(dto, modelVersion, "id", "modelId");
+        modelVersion.setModelId(dto.getModelId());  // 把模型id设置成该模型版本关联的模型id
+        modelVersion.setCreateTime(LocalDateTime.now());
+        modelVersion.setUpdateTime(LocalDateTime.now());
+        modelVersion.setOperateUser("zs");
+        // TODO: 后续可能还需要更新操作人
+        modelMapper.insertModelVersion(modelVersion);
+    }
+
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/PublishServiceImpl.java

@@ -2,12 +2,15 @@ package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
 
 import com.bipt.intelligentapplicationorchestrationservice.mapper.PublishMapper;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;
 import com.bipt.intelligentapplicationorchestrationservice.service.PublishService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * @author hky
  */
@@ -35,6 +38,10 @@ public class PublishServiceImpl implements PublishService {
         publishMapper.insert(servicePublishDTO);
     }
 
+    @Override
+    public List<ServicePublishVO> listPublishedServices() {
+        return publishMapper.listPublishedServices();
+    }
 
 
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelDeployer.java

@@ -0,0 +1,97 @@
+package com.bipt.intelligentapplicationorchestrationservice.service;
+
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployRequest;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployResponse;
+import com.bipt.intelligentapplicationorchestrationservice.entity.ModelInfo;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.exception.DeployException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class ModelDeployer {
+
+    @Autowired
+    private ModelRepositoryClient modelRepositoryClient;
+
+    @Autowired
+    private ModelEvaluator modelEvaluationService;
+
+    @Autowired
+    private NormalDeployService normalDeployService;
+
+    @Autowired
+    private GrayDeployService grayDeployService;
+
+    @Autowired
+    private ResourceAllocator resourceAllocator;
+
+    @Autowired
+    private GpuResourceService gpuResourceService;
+
+    public DeployResponse deploy(DeployRequest request) {
+        try {
+            // 1. 获取完整模型信息
+            ModelInfo modelInfo = getModelInfo(request.getModelId());
+
+            // 2. 更新请求中的模型信息
+            request.setModelInfo(modelInfo);
+
+            // 3. 添加模型评估检查
+            if (!isEvaluationPassed(modelInfo)) {
+                return DeployResponse.fail(403,
+                        "模型[" + modelInfo.getModelName() + "]评估未通过，无法部署");
+            }
+            List<GpuResource> availableResources = gpuResourceService.getAvailableResources();
+            int requiredMemory = request.getRequiredMemory();
+            String modelId = request.getModelId();
+
+            if (!resourceAllocator.checkResourceQuota(availableResources, requiredMemory, modelId)){
+                return DeployResponse.fail(507, "资源配额不足。需要内存: " + requiredMemory + "MB\n");
+            }
+
+            // 4. 根据部署类型路由
+            if (request.getDeployType() == DeployRequest.DeployType.NORMAL) {
+                return normalDeployService.process(request);
+            } else {
+                return grayDeployService.process(request);
+            }
+        } catch (DeployException e) {
+            return DeployResponse.fail(404, "获取模型信息失败: " + e.getMessage());
+        } catch (Exception e) {
+            return DeployResponse.fail(500, "部署失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 从模型仓库获取模型详细信息
+     */
+    private ModelInfo getModelInfo(String modelId) {
+        // 添加缓存和重试机制
+        ModelInfo modelInfo = modelRepositoryClient.getModelInfo(modelId);
+
+        // 验证关键字段
+        if (modelInfo.getModelFilePath() == null) {
+            throw new DeployException("模型文件路径未定义");
+        }
+
+        // 获取额外信息
+        modelInfo.setStorageLocation(
+                modelRepositoryClient.getModelStorageLocation(modelId)
+        );
+
+        return modelInfo;
+    }
+
+    /**
+     * 检查模型评估状态
+     */
+    private boolean isEvaluationPassed(ModelInfo modelInfo) {
+        return modelEvaluationService.isEvaluationPassed(
+                modelInfo.getModelId()
+        );
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelEvaluator.java

@@ -0,0 +1,134 @@
+package com.bipt.intelligentapplicationorchestrationservice.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class ModelEvaluator {
+    @Value("${model.evaluation.service-url}")
+    private String evaluationServiceUrl;
+
+    @Value("${model.evaluation.api-timeout:3000}")
+    private int apiTimeout;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * 检查模型评估是否通过
+     * @param modelId 模型ID
+     * @return 评估是否通过
+     */
+    public boolean isEvaluationPassed(String modelId) {
+        return isEvaluationPassed(modelId, null);
+    }
+
+    /**
+     * 检查模型评估是否通过（带版本号）
+     * @param modelId 模型ID
+     * @param version 模型版本
+     * @return 评估是否通过
+     */
+    public boolean isEvaluationPassed(String modelId, String version) {
+        // 1. 构建API调用参数
+        Map<String, String> params = new HashMap<>();
+        params.put("modelId", modelId);
+        if (version != null) {
+            params.put("version", version);
+        }
+
+        try {
+            // 2. 设置请求头和超时
+            HttpHeaders headers = new HttpHeaders();
+            headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
+            headers.setContentType(MediaType.APPLICATION_JSON);
+            headers.set("X-Request-ID", generateRequestId(modelId));
+
+            // 3. 调用评估API
+            ResponseEntity<EvaluationResponse> response = restTemplate.exchange(
+                    buildEvaluationUrl(modelId, version),
+                    HttpMethod.GET,
+                    new HttpEntity<>(headers),
+                    EvaluationResponse.class
+            );
+
+            // 4. 处理响应
+            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
+                return response.getBody().isPassed();
+            } else if (response.getStatusCode() == HttpStatus.NOT_FOUND) {
+                logEvaluationWarning(modelId, "模型未找到");
+            } else {
+                logEvaluationError(modelId, "评估服务返回非200状态: " + response.getStatusCode());
+            }
+        } catch (Exception e) {
+            logEvaluationError(modelId, "评估服务调用失败: " + e.getMessage());
+        }
+
+        // 5. 默认返回失败
+        return false;
+    }
+
+    // ================= 辅助方法 =================
+
+    /**
+     * 构建评估API URL
+     */
+    private String buildEvaluationUrl(String modelId, String version) {
+        String baseUrl = evaluationServiceUrl + "/models/" + modelId + "/evaluation";
+        return version != null ? baseUrl + "?version=" + version : baseUrl;
+    }
+
+    /**
+     * 生成请求ID（用于日志追踪）
+     */
+    private String generateRequestId(String modelId) {
+        return "eval-" + modelId + "-" + System.currentTimeMillis();
+    }
+
+    /**
+     * 记录评估错误日志
+     */
+    private void logEvaluationError(String modelId, String message) {
+        // 实际实现应使用日志框架（如SLF4J）
+        System.err.println("[" + modelId + "] 评估错误: " + message);
+    }
+
+    /**
+     * 记录评估警告日志
+     */
+    private void logEvaluationWarning(String modelId, String message) {
+        // 实际实现应使用日志框架
+        System.out.println("[" + modelId + "] 评估警告: " + message);
+    }
+
+    /**
+     * 评估响应内部类
+     */
+    private static class EvaluationResponse {
+        private boolean passed;
+        private String reason;
+        private String evaluatedAt;
+
+        // 需要默认构造方法用于JSON反序列化
+        public EvaluationResponse() {}
+
+        public boolean isPassed() {
+            return passed;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+
+        public String getEvaluatedAt() {
+            return evaluatedAt;
+        }
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelRepositoryClient.java

@@ -0,0 +1,98 @@
+package com.bipt.intelligentapplicationorchestrationservice.service;
+
+import com.bipt.intelligentapplicationorchestrationservice.entity.ModelInfo;
+import com.bipt.intelligentapplicationorchestrationservice.exception.DeployException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Collections;
+
+
+@Component
+public class ModelRepositoryClient {
+
+    @Value("${model.repository.url}")
+    private String repositoryBaseUrl;
+
+    @Value("${model.repository.api-key}")
+    private String apiKey;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * 从模型仓库获取模型信息
+     *
+     * @param modelId 模型唯一标识
+     * @return 完整的模型信息对象
+     */
+    public ModelInfo getModelInfo(String modelId) {
+        // 1. 构建请求URL
+        String url = repositoryBaseUrl + "/models/" + modelId + "/info";
+
+        // 2. 设置认证头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("X-API-KEY", apiKey);
+        headers.set("Model-Id", modelId);
+
+        HttpEntity<?> entity = new HttpEntity<>(headers);
+
+        try {
+            // 3. 发送请求到模型仓库服务
+            ResponseEntity<ModelInfo> response = restTemplate.exchange(
+                    url,
+                    HttpMethod.GET,
+                    entity,
+                    ModelInfo.class
+            );
+
+            // 4. 处理响应
+            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
+                return response.getBody();
+            } else if (response.getStatusCode() == HttpStatus.NOT_FOUND) {
+                throw new DeployException("模型未找到: " + modelId);
+            } else {
+                throw new DeployException("获取模型信息失败，状态码: " + response.getStatusCode());
+            }
+        } catch (Exception e) {
+            throw new DeployException("访问模型仓库失败: " + e.getMessage(), e);
+        }
+    }
+    public String getModelStorageLocation(String modelId) {
+        // 1. 构建请求URL
+        String url = repositoryBaseUrl + "/models/" + modelId + "/storage-location";
+
+        // 2. 设置认证头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("X-API-KEY", apiKey);
+        headers.setAccept(Collections.singletonList(MediaType.TEXT_PLAIN));
+
+        HttpEntity<?> entity = new HttpEntity<>(headers);
+
+        try {
+            // 3. 发送请求到模型仓库服务
+            ResponseEntity<String> response = restTemplate.exchange(
+                    url,
+                    HttpMethod.GET,
+                    entity,
+                    String.class
+            );
+
+            // 4. 处理响应
+            if (response.getStatusCode() == HttpStatus.OK && response.getBody() != null) {
+                return response.getBody();
+            } else if (response.getStatusCode() == HttpStatus.NOT_FOUND) {
+                throw new DeployException("模型存储位置未找到: " + modelId);
+            } else {
+                throw new DeployException("获取存储位置失败，状态码: " + response.getStatusCode());
+            }
+        } catch (Exception e) {
+            throw new DeployException("访问模型仓库失败: " + e.getMessage(), e);
+        }
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java

@@ -23,4 +23,10 @@ public interface ModelService {
     List<Map<String, String>> listLifeCycle();
 
     List<DatasetEntity> listDataset();
+
+    ModelTrainInfoVO getModelTrainInfo(Long id);
+
+    void updateModelTrain(Long id);
+
+    void updateModelVersionMinor(ModelVersionDTO dto);
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/NormalDeployService.java

@@ -0,0 +1,118 @@
+package com.bipt.intelligentapplicationorchestrationservice.service;
+
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployRequest;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeployResponse;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeploymentResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.ModelInfo;
+import com.bipt.intelligentapplicationorchestrationservice.exception.EvaluationFailedException;
+import com.bipt.intelligentapplicationorchestrationservice.util.TemplateParser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+@Service
+public class NormalDeployService {
+        @Autowired
+        private ModelEvaluator modelEvaluator;
+
+        @Autowired
+        private ResourceAllocator resourceAllocator;
+
+        @Autowired
+        private GpuResourceService gpuService;
+
+        @Autowired
+        private TemplateParser templateParser;  // 使用模板解析器
+
+        @Value("${model.deploy.script-directory:/opt/deploy_scripts}")
+        private String scriptDirectory;
+
+        @Value("${model.deploy.script-timeout:300}")
+        private int scriptTimeout;
+
+        public DeployResponse process(DeployRequest request) {
+            try {
+                // 1. 检查模型评估状态（使用ModelInfo包含的模型ID）
+                ModelInfo modelInfo = request.getModelInfo();
+                if (!modelEvaluator.isEvaluationPassed(modelInfo != null ? modelInfo.getModelName() : "")) {
+                    throw new EvaluationFailedException("模型评估未通过");
+                }
+
+                // 2. 分配资源并获取URL
+                DeploymentResource resource = resourceAllocator.allocate(
+                        gpuService.getAvailableResources(),
+                        request.getRequiredMemory(),
+                        modelInfo != null ? modelInfo.getModelName() : "unknown",
+                        false
+                );
+
+                // 3. 使用ModelInfo生成部署脚本内容
+                String scriptContent = templateParser.generateDeploymentScript(
+                        request.getModelInfo(),
+                        resource.getUrl()
+                );
+
+                // 4. 执行部署脚本
+                executeDeploymentScript(scriptContent);
+
+                // 5. 标记资源已分配
+                gpuService.markAsAllocated(
+                        resource.getGpu().getGPUId(),
+                        request.getRequiredMemory()
+                );
+
+                return DeployResponse.success(resource.getUrl());
+
+            } catch (EvaluationFailedException e) {
+                return DeployResponse.fail(403, e.getMessage());
+            } catch (Exception e) {
+                return DeployResponse.fail(500, "部署失败: " + e.getMessage());
+            }
+        }
+
+        /**
+         * 执行部署脚本
+         */
+        private void executeDeploymentScript(String scriptContent) throws Exception {
+            // 创建脚本文件
+            Path scriptPath = Paths.get(scriptDirectory, "deploy_" + System.currentTimeMillis() + ".sh");
+            Files.write(scriptPath, scriptContent.getBytes());
+
+            // 设置执行权限 (754)
+            Set<PosixFilePermission> permissions = Set.of(
+                    PosixFilePermission.OWNER_READ,
+                    PosixFilePermission.OWNER_WRITE,
+                    PosixFilePermission.OWNER_EXECUTE,
+                    PosixFilePermission.GROUP_READ,
+                    PosixFilePermission.GROUP_EXECUTE,
+                    PosixFilePermission.OTHERS_READ
+            );
+            Files.setPosixFilePermissions(scriptPath, permissions);
+
+            // 执行脚本
+            Process process = new ProcessBuilder(scriptPath.toString())
+                    .directory(Paths.get(scriptDirectory).toFile())
+                    .start();
+
+            // 带超时等待
+            boolean completed = process.waitFor(scriptTimeout, TimeUnit.SECONDS);
+            if (!completed) {
+                process.destroyForcibly();
+                throw new RuntimeException("脚本执行超时（限制: " + scriptTimeout + "秒）");
+            }
+
+            // 检查退出码
+            if (process.exitValue() != 0) {
+                throw new RuntimeException("脚本执行失败，退出码: " + process.exitValue());
+            }
+
+            // 清理脚本文件
+            Files.deleteIfExists(scriptPath);
+        }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/PublishService.java

@@ -1,12 +1,14 @@
 package com.bipt.intelligentapplicationorchestrationservice.service;
 
 import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;
+
+import java.util.List;
 
 public interface PublishService {
 
     void save(ServicePublishDTO servicePublishDTO);
 
 
-
+    List<ServicePublishVO> listPublishedServices();
-
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/RedisCacheService.java

@@ -1,16 +1,19 @@
 package com.bipt.intelligentapplicationorchestrationservice.service;
 
 
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
+import org.apache.ibatis.cache.CacheException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.Cursor;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.stereotype.Service;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.*;
-import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -124,4 +127,26 @@ public class RedisCacheService {
             return false;
         }
     }
+    public Set<String> scanKeys(String pattern) {
+        try (RedisConnection connection = Objects.requireNonNull(
+                redisTemplate.getConnectionFactory()).getConnection()) {
+
+            ScanOptions options = ScanOptions.scanOptions()
+                    .match(pattern)
+                    .count(100) // 批量扫描数量
+                    .build();
+
+            Set<String> keys = new HashSet<>();
+            Cursor<byte[]> cursor = connection.scan(options);
+
+            while (cursor.hasNext()) {
+                keys.add(new String(cursor.next(), StandardCharsets.UTF_8));
+            }
+
+            return keys;
+        } catch (Exception e) {
+            throw new CacheException("Keys scan failed", e);
+        }
+    }
+
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ResourceAllocator.java

@@ -1,8 +1,8 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.deployment;
+package com.bipt.intelligentapplicationorchestrationservice.service;
 
-import com.bipt.intelligentapplicationorchestrationservice.deploy.entity.DeploymentResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.DeploymentResource;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
-import com.bipt.intelligentapplicationorchestrationservice.utils.ConfigConstants;
+import com.bipt.intelligentapplicationorchestrationservice.constant.ConfigConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.ResourceAccessException;
@@ -16,6 +16,54 @@ public class ResourceAllocator {
     @Autowired
     private ConfigConstants config;
 
+    // 检查资源配额
+    public boolean checkResourceQuota(List<GpuResource> resources, int requiredMemory, String modelId) {
+        // 1. 检查全局资源是否充足
+        long totalFreeMemory = resources.stream()
+                .mapToInt(this::getRemainingMemory)
+                .sum();
+
+        // 全局内存不足
+        if (totalFreeMemory < requiredMemory) {
+            return false;
+        }
+
+        // 2. 检查单个GPU是否能满足需求
+        boolean canAllocate = resources.stream()
+                .anyMatch(gpu -> getRemainingMemory(gpu) >= requiredMemory);
+
+        if (!canAllocate) {
+            // 检查碎片化分配
+            return checkFragmentationAllocation(resources, requiredMemory);
+        }
+
+        return true;
+    }
+
+    // 检查碎片化分配可能性
+    private boolean checkFragmentationAllocation(List<GpuResource> resources, int requiredMemory) {
+        // 按碎片率排序（碎片小的优先）
+        resources.sort(Comparator.comparingDouble(
+                r -> (double)getRemainingMemory(r) / r.getGPUMaxMemory()
+        ));
+
+        // 检查碎片整合后是否可能满足需求
+        int accumulatedMemory = 0;
+        for (GpuResource gpu : resources) {
+            int fragment = getRemainingMemory(gpu);
+            // 如果单个碎片就足够，直接返回成功
+            if (fragment >= requiredMemory) return true;
+
+            // 累积碎片
+            accumulatedMemory += fragment;
+            if (accumulatedMemory >= requiredMemory) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     //获取剩余内存
     private int getRemainingMemory(GpuResource resource){
         return resource.getGPUMaxMemory()-resource.getGPUMemorySize();

src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java

@@ -1,14 +1,16 @@
-package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
+package com.bipt.intelligentapplicationorchestrationservice.service.impl;
 
 import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuMapper;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuMapper;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource;
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
+import com.bipt.intelligentapplicationorchestrationservice.enumeration.ErrorCodeEnum;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ResponseVO;
 import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -20,53 +22,128 @@ import java.util.stream.Collectors;
 
 @Service
 public class GpuManageServiceImpl implements GpuManageService {
+    private static final Logger logger = LoggerFactory.getLogger(GpuManageServiceImpl.class);
+
     @Autowired
     private GpuResourceDao gpuDao;
 
     @Autowired
     private GpuMapper gpuMapper;
-    @Autowired
-    private GpuResourceDao gpuResourceDao;
 
     @Transactional
-    //创建GPU资源
+    @Override
     public ResponseVO createGpuResource(GpuCreateDTO dto) {
-        GpuResource entity = gpuMapper.toEntity(dto);
+        try {
-        gpuDao.insert(entity);
+            logger.info("创建GPU资源请求: {}", dto);
-        return ResponseVO.success(entity);
-    }
 
-    @Transactional
+            GpuResource entity = gpuMapper.toEntity(dto);
-    //删除GPU资源（逻辑删除）
+            gpuDao.insert(entity);
-    public ResponseVO deleteGpuResource(Long gpuId) {
+
-        GpuResource entity = gpuDao.selectById(gpuId);
+            logger.info("创建GPU资源成功, ID: {}", entity.getGPUId());
-        if (entity == null) {
+            return ResponseVO.success(entity);
-            return ResponseVO.error(ErrorCodeEnum.GPU_NOT_FOUND);
+
+        } catch (Exception e) {
+            logger.error("创建GPU资源失败: {}, 参数: {}", e.getMessage(), dto, e);
+            return ResponseVO.error(ErrorCodeEnum.INTERNAL_SERVER_ERROR);
         }
-        gpuDao.isDeleted(gpuId);
-        return ResponseVO.success();
     }
 
     @Transactional
-    //更新GPU资源
+    @Override
+    public ResponseVO deleteGpuResource(Long gpuId) {
+        logger.info("删除GPU资源请求, ID: {}", gpuId);
+
+        try {
+            GpuResource entity = gpuDao.selectById(gpuId);
+            if (entity == null) {
+                logger.warn("GPU资源不存在, ID: {}", gpuId);
+                return ResponseVO.error(ErrorCodeEnum.GPU_NOT_FOUND);
+            }
+
+            gpuDao.isDeleted(gpuId);
+            logger.info("逻辑删除GPU资源成功, ID: {}", gpuId);
+            return ResponseVO.success();
+
+        } catch (Exception e) {
+            logger.error("删除GPU资源失败, ID: {}, 错误: {}", gpuId, e.getMessage(), e);
+            return ResponseVO.error(ErrorCodeEnum.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    @Transactional
+    @Override
     public void updateGpuResource(GpuUpdateDTO dto) {
-        GpuResource entity = gpuMapper.toEntity(dto);
+        logger.info("更新GPU资源请求: {}", dto);
-        gpuDao.updateById(entity);
+
+        try {
+            GpuResource entity = gpuMapper.toEntity(dto);
+            gpuDao.updateById(entity);
+            logger.info("更新GPU资源成功, ID: {}", entity.getGPUId());
+
+        } catch (Exception e) {
+            logger.error("更新GPU资源失败: {}, 参数: {}", e.getMessage(), dto, e);
+            throw new RuntimeException("更新GPU资源失败", e);
+        }
     }
 
     @Override
-    //模糊匹配查询
     public List<GpuResponseDTO> searchByCriteria(String model, Integer memorySize, String ip) {
-        // PermissionCheckUtil.checkTenantAccess();
-
         Map<String, Object> params = new HashMap<>();
-        if(model != null) params.put("model","%" + model + "%");
+        if(model != null) params.put("model", "%" + model + "%");
-        if(memorySize!=null) params.put("memorySize", memorySize);
+        if(memorySize != null) params.put("memorySize", memorySize);
-        if(ip!=null) params.put("ip", ip);
+        if(ip != null) params.put("ip", ip);
 
-        List<GpuResource> entities = gpuResourceDao.selectByFields(params);
+        logger.info("查询GPU资源条件: {}", params);
 
-        return entities.stream().map(gpuMapper::toDTO).collect(Collectors.toList());
+        try {
+            List<GpuResource> entities = gpuDao.selectByFields(params);
+            logger.info("查询到 {} 条GPU资源", entities.size());
 
+            return entities.stream()
+                    .map(gpuMapper::toDTO)
+                    .collect(Collectors.toList());
+
+        } catch (Exception e) {
+            logger.error("查询GPU资源失败, 条件: {}, 错误: {}", params, e.getMessage(), e);
+            throw new RuntimeException("查询GPU资源失败", e);
+        }
+    }
+
+    // ========== 新增的日志追踪方法 ==========
+
+    private void logOperation(String methodName, Object... details) {
+        if (logger.isDebugEnabled()) {
+            StringBuilder logBuilder = new StringBuilder(methodName);
+            for (Object detail : details) {
+                logBuilder.append(" | ").append(detail);
+            }
+            logger.debug(logBuilder.toString());
+        }
+    }
+
+    private void logDuration(String methodName, long startTime, boolean success) {
+        long duration = System.currentTimeMillis() - startTime;
+        String status = success ? "成功" : "失败";
+        logger.info("方法 {} 执行{} | 耗时: {}ms", methodName, status, duration);
+    }
+
+    // ========== 增强的日志版本 ==========
+
+    @Transactional
+    @Override
+    public ResponseVO createGpuResourceWithTrace(GpuCreateDTO dto) {
+        long start = System.currentTimeMillis();
+        try {
+            logOperation("createGpuResource", "请求参数", dto);
+
+            ResponseVO result = createGpuResource(dto);
+
+            logDuration("createGpuResource", start, true);
+            return result;
+
+        } catch (Exception e) {
+            logDuration("createGpuResource", start, false);
+            throw e;
+        }
     }
 }

src/main/java/com/bipt/intelligentapplicationorchestrationservice/util/AliOssUtil.java

@@ -0,0 +1,207 @@
+package com.bipt.intelligentapplicationorchestrationservice.util;
+
+import com.aliyun.oss.HttpMethod;
+import com.aliyun.oss.OSS;
+import com.aliyun.oss.OSSClientBuilder;
+import com.aliyun.oss.model.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.*;
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * 阿里云OSS文件操作工具类
+ */
+@Data
+@Slf4j
+@AllArgsConstructor
+public class AliOssUtil {
+
+    private final String endpoint;
+    private final String accessKeyId;
+    private final String accessKeySecret;
+    private final String bucketName;
+
+    /**
+     * 上传文件到OSS
+     * @param file 文件对象
+     * @param objectName 对象名称（OSS中的路径）
+     * @return 文件URL
+     */
+    public String upload(File file, String objectName) {
+        try (InputStream inputStream = new FileInputStream(file)) {
+            return upload(inputStream, objectName);
+        } catch (Exception e) {
+            log.error("上传文件失败: {}", e.getMessage(), e);
+            throw new RuntimeException("上传文件到OSS失败", e);
+        }
+    }
+
+    /**
+     * 上传文件流到OSS
+     * @param inputStream 文件流
+     * @param objectName 对象名称（OSS中的路径）
+     * @return 文件URL
+     */
+    public String upload(InputStream inputStream, String objectName) {
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+        try {
+            // 创建PutObject请求
+            PutObjectRequest request = new PutObjectRequest(bucketName, objectName, inputStream);
+
+            // 设置对象元数据
+            ObjectMetadata metadata = new ObjectMetadata();
+            metadata.setContentType(getContentType(objectName));
+            request.setMetadata(metadata);
+
+            // 上传文件
+            ossClient.putObject(request);
+            log.info("文件上传成功: {}", objectName);
+
+            // 构建文件URL
+            return "https://" + bucketName + "." + endpoint + "/" + objectName;
+        } catch (Exception e) {
+            log.error("上传文件失败: {}", e.getMessage(), e);
+            throw new RuntimeException("上传文件到OSS失败", e);
+        } finally {
+            // 关闭OSSClient
+            ossClient.shutdown();
+        }
+    }
+
+    /**
+     * 生成临时签名URL，用于访问私有Bucket中的文件
+     * @param objectName 对象名称
+     * @param expirationMinutes 过期时间（分钟）
+     * @return 签名URL
+     */
+    public String generatePresignedUrl(String objectName, int expirationMinutes) {
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+        try {
+            // 设置URL过期时间
+            Date expiration = new Date(System.currentTimeMillis() + expirationMinutes * 60 * 1000);
+
+            // 生成签名URL
+            GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucketName, objectName, HttpMethod.GET);
+            request.setExpiration(expiration);
+
+            URL url = ossClient.generatePresignedUrl(request);
+            log.info("生成临时签名URL: {}", url);
+            return url.toString();
+        } catch (Exception e) {
+            log.error("生成签名URL失败: {}", e.getMessage(), e);
+            throw new RuntimeException("生成签名URL失败", e);
+        } finally {
+            // 关闭OSSClient
+            ossClient.shutdown();
+        }
+    }
+
+    /**
+     * 下载文件到本地
+     * @param objectName 对象名称
+     * @param destinationFile 目标文件
+     */
+    public void download(String objectName, File destinationFile) {
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+        try {
+            // 下载OSS文件到本地文件
+            ossClient.getObject(new GetObjectRequest(bucketName, objectName), destinationFile);
+            log.info("文件下载成功: {}", objectName);
+        } catch (Exception e) {
+            log.error("下载文件失败: {}", e.getMessage(), e);
+            throw new RuntimeException("下载文件失败", e);
+        } finally {
+            // 关闭OSSClient
+            ossClient.shutdown();
+        }
+    }
+
+    /**
+     * 删除OSS中的文件
+     * @param objectName 对象名称
+     */
+    public void delete(String objectName) {
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+        try {
+            // 删除文件
+            ossClient.deleteObject(bucketName, objectName);
+            log.info("文件删除成功: {}", objectName);
+        } catch (Exception e) {
+            log.error("删除文件失败: {}", e.getMessage(), e);
+            throw new RuntimeException("删除文件失败", e);
+        } finally {
+            // 关闭OSSClient
+            ossClient.shutdown();
+        }
+    }
+
+    /**
+     * 检查文件是否存在
+     * @param objectName 对象名称
+     * @return 文件是否存在
+     */
+    public boolean doesObjectExist(String objectName) {
+        OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
+        try {
+            return ossClient.doesObjectExist(bucketName, objectName);
+        } catch (Exception e) {
+            log.error("检查文件存在失败: {}", e.getMessage(), e);
+            throw new RuntimeException("检查文件存在失败", e);
+        } finally {
+            // 关闭OSSClient
+            ossClient.shutdown();
+        }
+    }
+
+    /**
+     * 根据文件扩展名确定Content-Type
+     * @param fileName 文件名
+     * @return Content-Type
+     */
+    private String getContentType(String fileName) {
+        if (fileName == null) {
+            return "application/octet-stream";
+        }
+
+        if (fileName.endsWith(".jpg") || fileName.endsWith(".jpeg")) {
+            return "image/jpeg";
+        } else if (fileName.endsWith(".png")) {
+            return "image/png";
+        } else if (fileName.endsWith(".gif")) {
+            return "image/gif";
+        } else if (fileName.endsWith(".txt")) {
+            return "text/plain";
+        } else if (fileName.endsWith(".pdf")) {
+            return "application/pdf";
+        } else if (fileName.endsWith(".doc")) {
+            return "application/msword";
+        } else if (fileName.endsWith(".docx")) {
+            return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+        } else if (fileName.endsWith(".xls")) {
+            return "application/vnd.ms-excel";
+        } else if (fileName.endsWith(".xlsx")) {
+            return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+        } else if (fileName.endsWith(".html") || fileName.endsWith(".htm")) {
+            return "text/html";
+        } else if (fileName.endsWith(".css")) {
+            return "text/css";
+        } else if (fileName.endsWith(".js")) {
+            return "application/javascript";
+        } else if (fileName.endsWith(".json")) {
+            return "application/json";
+        } else if (fileName.endsWith(".xml")) {
+            return "application/xml";
+        } else if (fileName.endsWith(".mp4")) {
+            return "video/mp4";
+        } else if (fileName.endsWith(".mp3")) {
+            return "audio/mpeg";
+        } else {
+            return "application/octet-stream";
+        }
+    }
+}

src/main/java/com/bipt/intelligentapplicationorchestrationservice/util/TemplateParser.java

@@ -0,0 +1,78 @@
+package com.bipt.intelligentapplicationorchestrationservice.util;
+
+import com.bipt.intelligentapplicationorchestrationservice.entity.ModelInfo;
+import org.springframework.stereotype.Service;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class TemplateParser {
+    // 使用静态模板避免硬编码（可根据需要扩展为读取外部配置文件）
+    private static final Map<String, String> DEPLOYMENT_TEMPLATES = new HashMap<>() {{
+        put("tensorflow", "#!/bin/bash\n"
+                + "# TensorFlow Serving Deployment\n"
+                + "docker run -d --name {0}-service \\\n"
+                + "  -p {1} \\\n"
+                + "  -v {2}:/models/{0} \\\n"
+                + "  -e MODEL_NAME={0} \\\n"
+                + "  tensorflow/serving:latest\n"
+                + "# Preprocessing\n"
+                + "{3} $1");
+
+        put("pytorch", "#!/bin/bash\n"
+                + "# TorchServe Deployment\n"
+                + "torch-model-archiver --model-name {0} \\\n"
+                + "  --version 1.0 \\\n"
+                + "  --serialized-file {2} \\\n"
+                + "  --handler {3} \\\n"
+                + "  --export-path model_store\n"
+                + "torchserve --start \\\n"
+                + "  --model-store model_store \\\n"
+                + "  --models {0}.mar \\\n"
+                + "  --ncs \\\n"
+                + "  --ts-config config.properties");
+    }};
+
+    public String generateDeploymentScript(ModelInfo modelInfo, String endpointUrl) {
+        // 提取URL端口号 (假设URL格式为 http://host:port)
+        String port = extractPortFromUrl(endpointUrl);
+
+        // 获取基础模板
+        String template = DEPLOYMENT_TEMPLATES.getOrDefault(
+                modelInfo.getModelType().toLowerCase(),
+                getDefaultTemplate()
+        );
+
+        // 安全处理空值
+        String safeModelName = modelInfo.getModelName() != null ? modelInfo.getModelName() : "unnamed";
+        String safeFilePath = modelInfo.getModelFilePath() != null ? modelInfo.getModelFilePath() : "";
+        String safeScript = modelInfo.getPreprocessScript() != null ? modelInfo.getPreprocessScript() : "echo 'No preprocessing'";
+
+        // 填充模板参数
+        return MessageFormat.format(template,
+                safeModelName,
+                port,
+                safeFilePath,
+                safeScript
+        );
+    }
+    private String extractPortFromUrl(String url) {
+        if (url == null) return "8080";  // 默认端口
+        try {
+            return url.split(":")[2].replaceAll("[^0-9]", "");
+        } catch (Exception e) {
+            return "8080";
+        }
+    }
+
+    private String getDefaultTemplate() {
+        return "#!/bin/bash\n"
+                + "# Universal Deployment Template\n"
+                + "echo \"Deploying model: {0} at endpoint {1}\"\n"
+                + "echo \"Model path: {2}\"\n"
+                + "echo \"Running preprocessing: {3}\"\n"
+                + "# Add custom deployment logic here";
+    }
+}

src/main/resources/application-dev.properties

@@ -0,0 +1,5 @@
+# 阿里云OSS配置
+aliyun.oss.endpoint=oss-cn-beijing.aliyuncs.com
+aliyun.oss.bucketName=ipz-nh
+aliyun.oss.accessKeyId=LTAI5tBeto7V7BPWBcCjeP7A
+aliyun.oss.accessKeySecret=bjQGt2G4J5yetxuY5cT5ZnKnIOqe4O

src/main/resources/application.properties

@@ -32,9 +32,15 @@ spring.cloud.gateway.routes[0].uri=lb://intelligent-application-orchestration-se
 spring.cloud.gateway.routes[0].predicates[0]=Path=/request
 
 
-
 logging.level.org.springframework.web=DEBUG
 
+# ????????
+model.evaluation.service-url=http://evaluation-service:8080/api/v1
+model.evaluation.api-timeout=3000
+# ????????
+model.repository.url=https://model-repo.example.com/api/v1
+model.repository.api-key=SECURE_API_KEY_12345
+model.repository.timeout=5000
 
 #SQL ????????
 logging.level.com.bipt.intelligentapplicationorchestrationservice.mapper=DEBUG
@@ -42,8 +48,15 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl
 
 management.health.rabbit.enabled=false
 
-# 单个文件最大大小
+
-spring.servlet.multipart.max-file-size=10MB
+# 文件上传配置
-# 单次请求最大大小（可包含多个文件）
+spring.servlet.multipart.enabled=true
-spring.servlet.multipart.max-request-size=15MB
+spring.servlet.multipart.max-file-size=100MB
+spring.servlet.multipart.max-request-size=100MB
+
+# 激活开发环境！告诉 Spring：加载 application-dev.properties 里的配置
+spring.profiles.active=dev
+
+#配置IP列表（后续根据需求修改ip数据，以下仅为测试用例）
+available.ips=192.168.1.100,192.168.1.101,192.168.1.102
 

src/main/resources/mapper/EvaluationMapper.xml

@@ -9,7 +9,7 @@
         from model_log m1,
              model_info m2,
              model_version m3
-        where m1.model_id=m2.id and m3.model_id=m2.id and m1.model_id = #{id}
+        where m1.model_version_id=m3.id and m3.model_id=m2.id and m1.model_version_id = #{id}
     </select>
 
     <!--更新模型信息（目前只更新模型是否上线，后续如果更多需求可优化>-->
@@ -18,6 +18,6 @@
             <if test="status != null">
                 status=#{status}
             </if>
-            where model_id=#{id}
+            where id=#{id}
     </update>
 </mapper>

src/main/resources/mapper/GpuResourceMapper.xml

@@ -2,10 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao">
-
+    <resultMap id="gpuResourceMap" type="com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource">
+        <id property="GPUId" column="GPUId" /> <!-- 强制映射 -->
+        <result property="createTime" column="created_time"/>
+        <result property="UpdateTime" column="update_time"/>
+        <result property="GPUModel" column="GPUModel"/>
+        <result property="GPUMemorySize" column="GPUMemorySize"/>
+        <result property="Ip" column="Ip"/>
+        <result property="isDeleted" column="is_deleted"/>
+        <result property="GPUMaxMemory" column="GPUMaxMemory"/>
+    </resultMap>
     <!-- 动态条件查询 -->
     <select id="selectByFields"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
+            resultMap="gpuResourceMap">
         SELECT *
         FROM Ipz.public.gpu_resource
         <where>
@@ -28,7 +37,7 @@
 
     <!-- 分页查询 -->
     <select id="findByPage"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource">
         SELECT *
         FROM gpu_resource
         WHERE is_deleted = 0
@@ -38,7 +47,7 @@
 
     <!-- 增量同步查询 -->
     <select id="findModifiedSince"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource">
         SELECT *, is_deleted
         FROM gpu_resource
         WHERE update_time &gt; #{since}
@@ -47,7 +56,7 @@
 
     <!-- 带锁查询 -->
     <select id="selectByIdWithLock"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.GpuResource">
         SELECT *
         FROM gpu_resource
         WHERE GPUId = #{gpuId}

src/main/resources/mapper/ModelMapper.xml

@@ -31,8 +31,8 @@
     <!--查询模型详细信息-->
     <select id="selectById" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion">
         SELECT
-            t1.model_name,
+            t1.model_name, t1.id modelId,
-            t2.version, t2.dataset_id, t2.model_config,
+            t2.version, t2.dataset_id, t2.model_config, t2.id,
             t2.model_path, t2.status, t2.create_time, t2.update_time, t2.model_size,
             t2.data_pre_handle_file, t2.model_super_args, t2.model_args_size, t2.model_source_code_url, t2.model_file,
             t2.model_design_document, t2.life_cycle, t2.operate_user
@@ -44,16 +44,33 @@
     <update id="update">
         UPDATE model_version
         <set>
-            <if test="modelSize != null">
+            <if test="datasetId != null">dataset_id = #{datasetId},</if>
-                model_size = #{modelSize},
+            <if test="modelConfig != null">model_config = #{modelConfig},</if>
-            </if>
+            <if test="modelPath != null">model_path = #{modelPath},</if>
-            <if test="modelSuperArgs != null">
+            <if test="status != null">status = #{status},</if>
-                model_super_args = #{modelSuperArgs},
+            <if test="createTime != null">create_time = #{createTime},</if>
-            </if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="modelArgsSize != null">
+            <if test="modelSize != null">model_size = #{modelSize},</if>
-                model_args_size = #{modelArgsSize},
+            <if test="dataPreHandleFile != null">data_pre_handle_file = #{dataPreHandleFile},</if>
-            </if>
+            <if test="modelSuperArgs != null">model_super_args = #{modelSuperArgs},</if>
+            <if test="modelArgsSize != null">model_args_size = #{modelArgsSize},</if>
+            <if test="modelSourceCodeUrl != null">model_source_code_url = #{modelSourceCodeUrl},</if>
+            <if test="modelFile != null">model_file = #{modelFile},</if>
+            <if test="modelDesignDocument != null">model_design_document = #{modelDesignDocument},</if>
+            <if test="lifeCycle != null">life_cycle = #{lifeCycle},</if>
+            <if test="operateUser != null">operate_user = #{operateUser},</if>
         </set>
-        WHERE id = #{id
+        WHERE id = #{id}
     </update>
+
+    <!--获取模型训练信息-->
+    <select id="getModelTrainInfo" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelTrainInfoVO">
+        select m1.dataset_id,
+               m1.id,
+               m1.model_config,
+               d2.ds_path,
+               m1.data_pre_handle_file
+        from model_version m1,dataset d2
+        where m1.dataset_id=d2.dataset_id and m1.id=#{id}
+    </select>
 </mapper>

src/main/resources/mapper/PublishMapper.xml

@@ -3,8 +3,8 @@
 <mapper namespace="com.bipt.intelligentapplicationorchestrationservice.mapper.PublishMapper">
     <insert id="insert">
         INSERT INTO service_publish
-        (id,model_id,api_url,create_time)
+        (id,model_id,api_url,create_time,ip)
-        values (#{id}, #{modelId}, #{apiUrl}, #{createTime})
+        values (#{id}, #{modelId}, #{apiUrl}, #{createTime},#{ip})
     </insert>
 
     <select id="getByApiUrl" resultType="java.lang.Long">