前端添加、查询修改

doc/WorkReport/2025-05-nh.md

@@ -105,74 +105,4 @@
 
 ### 📅 明日计划
 
-- 模型信息管理前端页面开发
-
-## 2025年5月26日
-
-### ✅ 今日完成
-
-- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
-- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
-- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月27日
-
-### ✅ 今日完成
-
-- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
-- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
-- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月28日
-
-### ✅ 今日完成
-
-- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
-- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
-- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月29日
-
-### ✅ 今日完成
-
-- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
-- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
-- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月30日
-
-### ✅ 今日完成
-
-- 增加了查询数据集列表和生命周期列表接口
-
-### 🚧 进行中
-
-- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
-- 模型信息管理前端页面开发与后端联调
+- 模型信息管理前端页面开发

doc/WorkReport/2025-06-nh .md

@@ -1,60 +0,0 @@
-# 工作日报 - 2025年5月
-## 2025年6月3日
-### ✅ 今日完成
--  优化模型构建表单
-
-### 🚧 进行中
-- 优化模型构建表单
-
-### 📅 明日计划
-- 优化模型构建表单
-
-## 2025年6月4日
-
-### ✅ 今日完成
-
-* 阿里云OSS文件上传后端接口开发
-
-### 🚧 进行中
-
-* 阿里云OSS文件上传后端接口开发（存在问题）
-* 模型管理前端页面开发
-
-### ⚠️ 问题/障碍
-
-- Spring MVC依赖被注释，和gateway冲突了，已经发现了问题
-
-### 📅 明日计划
-
-* 继续完善阿里云OSS文件上传后端接口开发，保证接口测试成功
-* 模型管理前端页面开发
-
-## 2025年6月5日
-
-### ✅ 今日完成
-
-- 阿里云OSS文件上传后端接口开发调试成功
-- 基本完成了创建模型和修改模型的前后端联调
-
-### 🚧 进行中
-
-- 模型管理前端页面开发
-
-### 📅 明日计划
-
-- 模型管理前端页面开发
-
-## 2025年6月6日
-
-### ✅ 今日完成
-
-- 基本完成了版本构建、修改生命周期、上下线、模型评估和详情功能
-- 修改了模型评估和生命周期更新的一些细节，便于和前端接口协调
-
-### 🚧 进行中
-
-- 模型管理页面前端细节优化
-
-### 📅 明日计划
-
-- 模型管理页面前端细节优化

pom.xml

@@ -92,6 +92,7 @@
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
 			<version>2.3.0</version>
 		</dependency>
+
 		<!-- Nacos 配置依赖（移除手动版本，由上方依赖管理控制） -->
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
@@ -102,6 +103,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>2.15.3</version>
+		</dependency>
 		<!-- 测试依赖 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -135,6 +141,8 @@
 			<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>
@@ -161,30 +169,6 @@
 			<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>
@@ -215,6 +199,18 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<excludes>
+						<exclude>
+							<groupId>org.projectlombok</groupId>
+							<artifactId>lombok</artifactId>
+						</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>

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

@@ -1,12 +1,10 @@
 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;
 
@@ -14,7 +12,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableDiscoveryClient
-@EnableConfigurationProperties(IpConfig.class)
 //@Slf4j
 public class IntelligentApplicationOrchestrationServiceApplication {
 	private static final Logger log = org.slf4j.LoggerFactory.getLogger(IntelligentApplicationOrchestrationServiceApplication.class);

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

@@ -1,21 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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

@@ -63,41 +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(){
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.registerModule(new JavaTimeModule());
+        objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
         RedisTemplate<String, Object> template = new RedisTemplate<>();
         Logger log = (Logger) LoggerFactory.getLogger(RedisConfig.class);
         log.info("开始创建redis模板对象...");
         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(jsonSerializer);
-        template.setHashKeySerializer(new StringRedisSerializer());
-        template.setHashValueSerializer(jsonSerializer);
-
-        template.afterPropertiesSet();
+        template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
         return template;
     }
-}
+}

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

@@ -10,10 +10,5 @@ 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 LIFECYCLE_UPDATE_FAILURE = "更新模型生命周期失败";
-    public static final String LIFECYCLE_UPDATE_SUCCESS = "生命周期更新成功";
-
-    //文件上传常量
-    public static final String UPLOAD_FAILURE = "上传文件失败";
-    public static final String  FILE_EMPTY= "文件为空";
+    public static final String UPDATE_FAILURE = "更新模型生命周期失败";
 }

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

@@ -3,31 +3,23 @@ package com.bipt.intelligentapplicationorchestrationservice.controller;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.AlgorithmInfo;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.OptResult;
 import com.bipt.intelligentapplicationorchestrationservice.service.AlgorithmInfoService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 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.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
 import java.util.List;
 @Tag(name ="算法创建相关接口")
 @RestController
 @RequestMapping("/api/algorithm")
 @Slf4j
-@CrossOrigin(origins = "http://localhost:3000")
 public class AlgorithmInfoController {
 
     @Autowired
     private AlgorithmInfoService algorithmInfoService;
 
-    @Autowired
-    private ObjectMapper objectMapper;
-
     @GetMapping("/{id}")
     public ResponseEntity<AlgorithmInfo> getById(@PathVariable Long id) {
         AlgorithmInfo algorithmInfo = algorithmInfoService.getById(id);
@@ -71,51 +63,15 @@ public class AlgorithmInfoController {
             ResponseEntity.badRequest().body("Delete failed");
     }
 
-    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    /**
+     * 算法创建
+     */
+    @PostMapping
     @Operation(summary ="算法创建")
-    public OptResult save(@RequestParam("algorithm") String algorithmJson,
-                          @RequestPart(value = "algorithmFile") MultipartFile file) {
-        try {
-            AlgorithmInfo algorithmInfo = objectMapper.readValue(algorithmJson, AlgorithmInfo.class);
-            log.info("新增算法: {}, 文件: {}", algorithmInfo, (file != null ? file.getOriginalFilename() : "无文件"));
-            algorithmInfoService.save(algorithmInfo, file);
-            return OptResult.success("算法创建成功");
-        } catch (IOException e) {
-            log.error("JSON转换失败", e);
-            return OptResult.error("新增算法失败: " + e.getMessage());
-        } catch (Exception e) {
-            log.error("新增算法失败", e);
-            return OptResult.error("新增算法失败: " + e.getMessage());
-        }
-    }
-
-    /**
-     * 根据算法名称模糊查询算法信息
-     * @param keyword 模糊查询关键词
-     * @return 符合条件的算法信息列表
-     */
-    @GetMapping("/search")
-    public ResponseEntity<List<AlgorithmInfo>> searchByName(@RequestParam String keyword) {
-        List<AlgorithmInfo> algorithmInfos = algorithmInfoService.getByNameLike(keyword);
-        return ResponseEntity.ok(algorithmInfos);
-    }
-    /**
-     * 算法运行
-     */
-    @PostMapping("/run/{id}")
-    @Operation(summary = "运行")
-    public OptResult run(@PathVariable Long id,@RequestBody String param){
-        log.info("运行",id);
-        String result = algorithmInfoService.run(id,param);
-        return OptResult.success("运行成功"+result);
-    }
-    /**
-     * 前端列表返回算法名称
-     */
-    @GetMapping("/names")
-    @Operation(summary = "列表返回算法名称")
-    public List<String> getNames(){
-        return algorithmInfoService.getAllNames();
+    public OptResult save(@RequestBody AlgorithmInfo algorithmInfo){
+        log.info("新增算法",algorithmInfo);
+        algorithmInfoService.save(algorithmInfo);
+        return OptResult.success("算法创建成功");
     }
 
 } 

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

@@ -1,59 +0,0 @@
-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/DatasetController.java

@@ -6,44 +6,28 @@ 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.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.List;
 @Tag(name ="数据集相关接口")
 @RestController
 @RequestMapping("/dataset")
 @Slf4j
-@CrossOrigin(origins = "http://localhost:3000")
 public class DatasetController {
     @Autowired
     private DatasetService datasetService;
 
     /**
-     * 新增数据集（整合文件上传）
+     * 新增数据集
      * @param datasetDTO
-     * @param file
      * @return
      */
-    @Operation(summary = "新增数据集")
-    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public OptResult save(
-            @ModelAttribute("dataset") DatasetDTO datasetDTO,
-            @RequestPart(value = "file", required = false) MultipartFile file) {
-        log.info("新增数据集: {}, 文件: {}", datasetDTO, (file != null ? file.getOriginalFilename() : "无文件"));
-        try {
-            datasetService.save(datasetDTO, file);
-            return OptResult.success();
-        } catch (Exception e) {
-            log.error("新增数据集失败", e);
-            return OptResult.error("新增数据集失败: " + e.getMessage());
-        }
+    @Operation(summary ="新增数据集")
+    @PostMapping
+    public OptResult save(@RequestBody DatasetDTO datasetDTO) {
+        log.info("新增数据集:{}", datasetDTO);
+        datasetService.save(datasetDTO);
+        return OptResult.success();
     }
 
     /**
@@ -59,17 +43,17 @@ public class DatasetController {
         return OptResult.success(pageResult);
     }
 
+
     /**
      * 修改数据集
      * @param datasetDTO
      * @return
      */
     @Operation(summary ="修改数据集")
-    @PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public OptResult update(@ModelAttribute("dataset") DatasetDTO datasetDTO,
-                            @RequestPart(value = "file", required = false) MultipartFile file){
-        log.info("修改数据集{}, 文件: {}", datasetDTO, (file != null ? file.getOriginalFilename() : "无文件"));
-        datasetService.update(datasetDTO,file);
+    @PutMapping
+    public OptResult update(@RequestBody DatasetDTO datasetDTO){
+        log.info("修改数据集",datasetDTO);
+        datasetService.update(datasetDTO);
         return OptResult.success();
     }
 
@@ -88,34 +72,4 @@ public class DatasetController {
         return OptResult.success("批量删除成功");
     }
 
-    /**
-     * 下载数据集
-     * @param datasetId 数据集ID
-     * @return 数据集文件
-     */
-    @Operation(summary = "下载数据集")
-    @GetMapping("/download/{datasetId}")
-    public ResponseEntity<byte[]> downloadDataset(@PathVariable Long datasetId) {
-        log.info("下载数据集，ID：{}", datasetId);
-        try {
-            // TODO: 调用分布式存储系统的接口获取数据集文件的输入流
-            InputStream inputStream = datasetService.downloadDataset(datasetId);
-            if (inputStream == null) {
-                return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-            }
-            byte[] fileBytes = inputStream.readAllBytes();
-            inputStream.close();
-
-            // 设置响应头
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_OCTET_STREAM);
-            headers.setContentDispositionFormData("attachment", "dataset_" + datasetId + ".zip");
-
-            return new ResponseEntity<>(fileBytes, headers, HttpStatus.OK);
-        } catch (IOException e) {
-            log.error("下载数据集失败", e);
-            return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
-
 }

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

@@ -7,10 +7,12 @@ 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.bind.annotation.GetMapping;
+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

@@ -9,8 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 @RestController
-@RequestMapping("/gpu")
-@CrossOrigin(origins = "http://localhost:3000")
+@RequestMapping
 public class GpuResourceController {
     @Autowired
     private GpuManageService gpuManageService;
@@ -22,10 +21,13 @@ public class GpuResourceController {
     public ResponseVO removeGpu(@PathVariable("gpuId") Long gpuId){
         return gpuManageService.deleteGpuResource(gpuId);
     }
-    @PutMapping("/{gpuId}")
+    @PutMapping(value = "/update/{gpuId}", produces = "application/json")
     public void updateGpuResource(
-            @PathVariable Long gpuId,
+            @PathVariable("gpuId") Long gpuId,
             @Valid @RequestBody GpuUpdateDTO dto){
+        if (gpuId == null) {
+            throw new IllegalArgumentException("GPU ID cannot be null");
+        }
         dto.setGPUId(gpuId);
         gpuManageService.updateGpuResource(dto);
     }

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

@@ -1,6 +1,5 @@
 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;
@@ -53,16 +52,14 @@ public class ModelController {
     }
 
     @Operation(summary = "模型更新")
-    @PutMapping("/updateModel/{id}")
-    public OptResult updateModel(@PathVariable("id") Long id, @RequestBody ModelVersionDTO dto) {
-        log.info("模型更新，id: {}", id);
-        dto.setId(id);
+    @PutMapping("/updateModel")
+    public OptResult updateModel(@RequestBody ModelVersionDTO dto){
+        log.info("模型更新");
         modelService.updateModel(dto);
         return OptResult.success();
     }
 
 
-
     @Operation(summary = "模型版本删除")
     @DeleteMapping("/deleteModelVersion")
     public OptResult deleteModelVersion(Long id){
@@ -73,18 +70,10 @@ public class ModelController {
 
     @Operation(summary = "更新生命周期")
     @PutMapping("/updateLifeCycle")
-    public OptResult updateLifeCycle(@RequestParam Long id, @RequestParam String lifeCycle){
+    public OptResult updateLifeCycle(Long id,String lifeCycle){
         log.info("更新生命周期");
-        try {
-            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);
-        }
+        modelService.updateLifeCycle(id,lifeCycle);
+        return OptResult.success();
     }
 
     @Operation(summary = "查询生命周期列表")
@@ -102,31 +91,5 @@ 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,16 +1,11 @@
 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;
@@ -22,8 +17,6 @@ import java.util.List;
 @RestController
 @RequestMapping("/publish")
 @Slf4j
-@CrossOrigin(origins = "http://localhost:3000")   // 生产环境指定具体域名
-
 public class PublishController {
     @Autowired
     private PublishService publishService;
@@ -31,35 +24,21 @@ 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);
-        //调用模型部署
-        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);
+        //todo 调用模型部署
+
         // 获取前端传来的IP字符串
         String ipListStr = servicePublishDTO.getIp();
         if (ipListStr == null || ipListStr.trim().isEmpty()) {
             log.warn("IP列表为空，不进行Nacos注册");
             return OptResult.success();
         }
+
         try {
             // 使用逗号分割IP字符串
             String[] ipArray = ipListStr.split(",");
@@ -80,31 +59,15 @@ 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/entity/GpuEntityTransfer.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Mapper(componentModel = "spring")
-public interface GpuMapper {
+public interface GpuEntityTransfer {
     GpuResource toEntity(GpuCreateDTO dto);
     GpuResource toEntity(GpuUpdateDTO dto);
     GpuResource toEntity(GpuResponseDTO dto);

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

@@ -1,14 +1,13 @@
 package com.bipt.intelligentapplicationorchestrationservice.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.*;
+import lombok.Data;
+import lombok.Setter;
 
 import java.time.LocalDateTime;
 
-@Data
-@AllArgsConstructor
 @Setter
-@Getter
+@Data
 public class GpuResource {
     @TableField("GPUId")
     private Long GPUId;
@@ -49,10 +48,10 @@ public class GpuResource {
 
 
 
-    public GpuResource(Long Id, String GPUModel, Integer GPUMemorySize, String ip, LocalDateTime create_time) {
+    public GpuResource(Long Id, String Model, Integer MemorySize, String ip, LocalDateTime create_time) {
         this.GPUId = Id;
-        this.GPUModel = GPUModel;
-        this.GPUMemorySize = GPUMemorySize;
+        this.GPUModel = Model;
+        this.GPUMemorySize = MemorySize;
         this.Ip = ip;
         this.createTime = create_time;
     }

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

@@ -29,12 +29,4 @@ public interface AlgorithmInfoMapper {
     
     @Delete("DELETE FROM algorithm_info WHERE id = #{id}")
     int deleteById(Long id);
-    @Select("select description from algorithm_info where id = #{id}")
-    String getDescriptionById(Long id);
-    @Select("select algorithm_file from algorithm_info where id = #{id}")
-    String getFileById(Long id);
-    @Select("select algorithm_name from algorithm_info")
-    List<String> getAllNames();
-
-    List<AlgorithmInfo> selectByNameLike(String keyword);
-}
+} 

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/GpuResourceDao.java

@@ -11,8 +11,8 @@ import java.util.Map;
 @Mapper
 public interface GpuResourceDao {
     //---------------------- 基础CRUD ------------------------
-    @Insert("INSERT INTO Ipz.public.gpu_resource (GPUModel, GPUMemorySize, Ip) " +
-            "VALUES (#{GPUModel}, #{GPUMemorySize}, #{Ip})")
+    @Insert("INSERT INTO Ipz.public.gpu_resource (GPUModel, GPUMemorySize, Ip, created_time) " +
+            "VALUES (#{GPUModel}, #{GPUMemorySize}, #{Ip}, NOW())")
     @Options(useGeneratedKeys = true, keyProperty = "GPUId")
     Integer insert(GpuResource entity);
 

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

@@ -76,11 +76,4 @@ 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,8 +6,6 @@ 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 {
 
@@ -17,6 +15,5 @@ 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/DatasetDTO.java

@@ -19,7 +19,6 @@ public class DatasetDTO implements Serializable {
     private Long datasetId;
     private String datasetName;
     private int datasetType;
-    private int datasetStatus;
     private String dsPath;
 //    private Map<String,String> args;
     private String args;

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

@@ -20,11 +20,11 @@ public class DatasetPageQueryDTO implements Serializable{
         private int page;
         private int pageSize;
         private String datasetName;
-/*        private int datasetType;
+        private int datasetType;
         private int datasetStatus;
         private String dsPath;
         private String args;
         private LocalDateTime createTime;
-        private LocalDateTime updateTime;*/
+        private LocalDateTime updateTime;
 
 }

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

@@ -17,7 +17,6 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DatasetVO implements Serializable {
-    private Long datasetId;
     private String datasetName;
     private Integer datasetType;
     private Integer datasetStatus;

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

@@ -1,6 +1,5 @@
 package com.bipt.intelligentapplicationorchestrationservice.pojo;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 import lombok.*;
@@ -8,8 +7,8 @@ import lombok.*;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@Setter
-@Getter
+//@Setter
+//@Getter
 public class GpuUpdateDTO {
 
     private Long GPUId;
@@ -26,15 +25,12 @@ public class GpuUpdateDTO {
 
     @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) {

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 modelVersionId;           // 关联模型id,后续修改成了模型版本id
+    private Long modelId;           // 关联模型id
     private LocalDateTime evaluationTime; // 评估时间
     private String evaluationResult; // 评估结果
     private String operator;        // 评估操作人员

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

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

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

@@ -33,7 +33,7 @@ public class ResponseVO<T> implements Serializable {
     }
     //失败响应（基于预定义错误枚举）
     public static <T> ResponseVO<T> error(ErrorCodeEnum errorCode) {
-       return new ResponseVO<>(errorCode.getCode(), errorCode.getMessage(), null);
+        return new ResponseVO<>(errorCode.getCode(), errorCode.getMessage(), null);
     }
 
     public Integer getCode() {
@@ -59,4 +59,4 @@ public class ResponseVO<T> implements Serializable {
     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

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

@@ -1,7 +1,6 @@
 package com.bipt.intelligentapplicationorchestrationservice.service;
 
 import com.bipt.intelligentapplicationorchestrationservice.pojo.AlgorithmInfo;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -13,11 +12,6 @@ public interface AlgorithmInfoService {
     boolean delete(Long id);
     boolean validateAlgorithmInfo(AlgorithmInfo algorithmInfo);
 
-    void save(AlgorithmInfo algorithmInfo, MultipartFile file);
+    void save(AlgorithmInfo algorithmInfo);
 
-    String run(Long id, String param);
-
-    List<String> getAllNames();
-
-    List<AlgorithmInfo> getByNameLike(String keyword);
 }

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

@@ -3,10 +3,8 @@ package com.bipt.intelligentapplicationorchestrationservice.service;
 import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
 import com.bipt.intelligentapplicationorchestrationservice.exception.CacheInitException;
 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;
@@ -20,6 +18,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 
+@Transactional  // 添加类级别事务管理
 @Component
 public class CacheManager {
     @Autowired
@@ -28,9 +27,6 @@ public class CacheManager {
     @Autowired
     private GpuResourceDao gpuResourceDao;
 
-    @Autowired
-    private ObjectMapper objectMapper; // 注入ObjectMapper用于类型转换
-
     private final ReentrantLock lock = new ReentrantLock();
 
     @Value("${cache.redis-key-prefix:gpu:}")
@@ -42,9 +38,9 @@ public class CacheManager {
     @Value("${cache.init-batch-size:500}")
     private int initBatchSize;
 
-    private static final Logger log = LoggerFactory.getLogger(CacheManager.class);
-
+    private static final Logger log = org.slf4j.LoggerFactory.getLogger(CacheManager.class);
     // 全量加载（带分页和分布式锁）
+    @Transactional(propagation = Propagation.REQUIRED)  // 方法级别覆盖
     @PostConstruct
     public void loadFullCache() {
         if (tryLock()) {
@@ -86,12 +82,16 @@ 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),
+                ttlBase + (int)(Math.random() * 600), // 随机TTL防止雪崩
                 TimeUnit.SECONDS
         );
     }
@@ -114,7 +114,6 @@ public class CacheManager {
     private void unlock() {
         lock.unlock();
     }
-
     // 分页加载入口
     public void loadFullCache(int batchSize) {
         int page = 0;
@@ -122,11 +121,12 @@ 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,6 +148,7 @@ public class CacheManager {
                     Thread.currentThread().interrupt();
                 }
             }
+
         }
     }
 
@@ -161,35 +162,8 @@ public class CacheManager {
         redisTemplate.delete(key);
     }
 
-    // 修改获取缓存的方法，增加类型安全处理
-    @SuppressWarnings("unchecked")
     public GpuResource getFromCache(String 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;
-        }
+        return (GpuResource) redisTemplate.opsForValue().get("gpu:" + gpuId);
     }
-}
+
+}

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

@@ -3,22 +3,18 @@ package com.bipt.intelligentapplicationorchestrationservice.service;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.DatasetDTO;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.DatasetPageQueryDTO;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.PageResult;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.InputStream;
 import java.util.List;
 
 /**
  * @author hky
  */
 public interface DatasetService {
-    void save(DatasetDTO datasetDTO, MultipartFile file);
+    void save(DatasetDTO datasetDTO);
 
-    void update(DatasetDTO datasetDTO, MultipartFile file);
+    void update(DatasetDTO datasetDTO);
 
     PageResult pageQuery(DatasetPageQueryDTO dataSetPageQueryDTO);
 
     void deleteBatch(List<Long> datasetIds);
-
-    InputStream downloadDataset(Long datasetId);
 }

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

@@ -3,28 +3,19 @@ package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
 import com.bipt.intelligentapplicationorchestrationservice.mapper.AlgorithmInfoMapper;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.AlgorithmInfo;
 import com.bipt.intelligentapplicationorchestrationservice.service.AlgorithmInfoService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
-@Slf4j
 public class AlgorithmInfoServiceImpl implements AlgorithmInfoService {
 
     @Autowired
     private AlgorithmInfoMapper algorithmInfoMapper;
 
-    @Value("${algorithm.upload.dir:/tmp/algorithm-files/}") // 默认上传目录
-    private String uploadDir;
     @Override
     public AlgorithmInfo getById(Long id) {
         return algorithmInfoMapper.selectById(id);
@@ -70,81 +61,22 @@ public class AlgorithmInfoServiceImpl implements AlgorithmInfoService {
         return true;
     }
 
-    @Override
-    @Transactional
-    public void save(AlgorithmInfo algorithmInfo, MultipartFile file) {
-        String algorithmName = algorithmInfo.getAlgorithmName();
-        // 检查同名算法
-        AlgorithmInfo duplicateName = algorithmInfoMapper.selectByName(algorithmName);
-        if (duplicateName != null) {
-            throw new RuntimeException("算法已存在，请去修改算法");
-        }
-
-        // 只接收文件但不进行保存操作
-        if (file != null && !file.isEmpty()) {
-            log.info("已接收文件: {}", file.getOriginalFilename());
-            log.info("文件大小: {} 字节", file.getSize());
-            log.info("文件类型: {}", file.getContentType());
-            // 临时设置一个空路径（避免数据库保存空值）
-            //todo 保存到分布式存储
-            algorithmInfo.setAlgorithmFile("");
-        }
-
-        algorithmInfo.setCreateTime(LocalDateTime.now());
-        // 保存算法信息到数据库（注意：此时algorithmFile字段为空）
-        algorithmInfoMapper.insert(algorithmInfo);
-    }
-
-    @Override
-    public String run(Long id, String param) {
-        //todo从分布式存储中拿到文件（以下是示例）
-        String file = algorithmInfoMapper.getFileById(id);
-        StringBuilder result = new StringBuilder(); // 用于存储结果
-
-        try {
-            // 构建命令，将 param 作为参数传递给 Python 脚本
-            ProcessBuilder pb = new ProcessBuilder("python", file, param);
-            Process process = pb.start();
-
-            // 读取标准输出（脚本执行结果）
-            BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(process.getInputStream()));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                result.append(line).append("\n");
-            }
-
-            // 读取错误输出
-            BufferedReader errorReader = new BufferedReader(
-                    new InputStreamReader(process.getErrorStream()));
-            String errorLine;
-            while ((errorLine = errorReader.readLine()) != null) {
-                result.append("Error: ").append(errorLine).append("\n");
-            }
-
-            int exitCode = process.waitFor();
-            result.append("Exit Code: ").append(exitCode);
-
-        } catch (Exception e) {
-            result.append("执行异常: ").append(e.getMessage());
-            e.printStackTrace();
-        }
-
-        return result.toString(); // 返回完整结果
-    }
-
-    @Override
-    public List<String> getAllNames() {
-        return algorithmInfoMapper.getAllNames();
-    }
-
     /**
-     * 模糊查询
-     * @param keyword
-     * @return
+     * 算法创建
+     * @param algorithmInfo
      */
     @Override
-    public List<AlgorithmInfo> getByNameLike(String keyword) {
-        return algorithmInfoMapper.selectByNameLike(keyword);
+    @Transactional
+    public void save(AlgorithmInfo algorithmInfo) {
+        String algorithmName = algorithmInfo.getAlgorithmName();
+        //查找表里是否有重复的算法，如果有则报错
+        AlgorithmInfo duplicateName = algorithmInfoMapper.selectByName(algorithmName);
+        if (duplicateName != null){
+            throw new RuntimeException("算法已存在");
+        }
+        //todo 算法文件分布式存入分布式存储中
+
+
+        algorithmInfoMapper.insert(algorithmInfo);
     }
 } 

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

@@ -12,17 +12,12 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.time.LocalDateTime;
+import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 
 import static com.bipt.intelligentapplicationorchestrationservice.enumeration.DatasetType.FROM_DATABASE;
-import static com.bipt.intelligentapplicationorchestrationservice.enumeration.DatasetType.UPLOAD;
 
 @Service
 @Slf4j
@@ -30,65 +25,63 @@ public class DatasetServiceImpl implements DatasetService {
     @Autowired
     private DatasetMapper datasetMapper;
 
+    /**
+     * 新增数据集
+     * @param datasetDTO
+     */
     @Override
     @Transactional
-    public void save(DatasetDTO datasetDTO, MultipartFile file) {
+    public void save(DatasetDTO datasetDTO) {
+        //判断数据集类型，如果是本地上传则保存，若用调用数据仓库进入下一步
+        // 获取数据集类型
         DatasetType datasetType = DatasetType.fromCode(datasetDTO.getDatasetType());
-        if (datasetType == UPLOAD && file != null && !file.isEmpty()) {
-            try {
-                //todo存入分布式文件系统
+        // 根据类型处理数据
+        switch (datasetType) {
+            case UPLOAD:
+                //TODO 保存到分布式文件系统
+                break;
+            case FROM_DATABASE:
+                String args = datasetDTO.getArgs();
+                //TODO 根据筛选条件调用数据仓库中的数据
 
-                // 生成文件名（建议使用 UUID 避免重复）
-                String fileName = UUID.randomUUID() + "-" + file.getOriginalFilename();
-                // 假设使用本地存储（实际需对接分布式文件系统，如 MinIO、OSS 等）
-                String filePath = "/your/storage/path/" + fileName;
-                // 保存文件到磁盘（示例代码，需处理 IO 异常）
-                file.transferTo(new File(filePath));
-                // 更新数据集路径
-                datasetDTO.setDsPath(filePath); // 取消注释，并确保 datasetDTO 有 setDsPath 方法
-            } catch (IOException e) {
-                throw new RuntimeException("文件上传失败: " + e.getMessage());
-            }
-        } else if (datasetType == FROM_DATABASE){
-            //todo 从数据仓库中查询 并选择筛选条件
+                //TODO 调用数据仓库保存到分布式文件系统
+                break;
+            default:
+                throw new IllegalArgumentException("不支持的数据集类型: " + datasetType);
         }
 
-        // 保存数据集实体
         DatasetEntity datasetEntity = new DatasetEntity();
-        BeanUtils.copyProperties(datasetDTO, datasetEntity);
+        BeanUtils.copyProperties(datasetDTO,datasetEntity);
+        datasetEntity.setDatasetStatus(StatusConstant.ENABLE);
         datasetEntity.setCreateTime(LocalDateTime.now());
         datasetEntity.setUpdateTime(LocalDateTime.now());
         datasetMapper.insert(datasetEntity);
-    }
 
+    }
 
     /**
      * 修改数据集
      *
      * @param datasetDTO
-     * @param file
      */
     @Override
     @Transactional
-    public void update(DatasetDTO datasetDTO, MultipartFile file) {
+    public void update(DatasetDTO datasetDTO) {
+        /*DatasetEntity datasetEntity = new DatasetEntity();
+        BeanUtils.copyProperties(datasetDTO,datasetEntity);*/
         DatasetType datasetType = DatasetType.fromCode(datasetDTO.getDatasetType());
-        if (datasetType == UPLOAD && file != null && !file.isEmpty()) {
-            try {
-                // 生成文件名（建议使用 UUID 避免重复）
-                String fileName = UUID.randomUUID() + "-" + file.getOriginalFilename();
-                // 假设使用本地存储（实际需对接分布式文件系统，如 MinIO、OSS 等）
-                String filePath = "/your/storage/path/" + fileName;
-                // 保存文件到磁盘（示例代码，需处理 IO 异常）
-                file.transferTo(new File(filePath));
-                // 更新数据集路径
-                datasetDTO.setDsPath(filePath); // 取消注释，并确保 datasetDTO 有 setDsPath 方法
-            } catch (IOException e) {
-                throw new RuntimeException("文件上传失败: " + e.getMessage());
-            }
-        } else if (datasetType == FROM_DATABASE){
-            //todo 从数据仓库中查询 并选择筛选条件
-        }
+        // 根据类型处理数据
+        switch (datasetType) {
+            case UPLOAD:
+                //TODO 覆盖保存到分布式文件系统中
+                break;
+            case FROM_DATABASE:
+                //TODO 覆盖数据文件
 
+                break;
+            default:
+                throw new IllegalArgumentException("不支持的数据集类型: " + datasetType);
+        }
         DatasetEntity datasetEntity = new DatasetEntity();
         BeanUtils.copyProperties(datasetDTO,datasetEntity);
         datasetEntity.setUpdateTime(LocalDateTime.now());
@@ -119,14 +112,4 @@ public class DatasetServiceImpl implements DatasetService {
         datasetMapper.deleteBatch(datasetIds);
     }
 
-    /**
-     * 下载
-     * @param datasetId
-     * @return
-     */
-    @Override
-    public InputStream downloadDataset(Long datasetId) {
-        // TODO: 调用分布式存储系统的接口获取数据集文件的输入流
-        return null;
-    }
 }

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");    //这里的写死的，后续需要修改，应该是当前登录用户的id
+        modelVersion.setOperateUser("zs");
         modelMapper.insertModelVersion(modelVersion);
     }
 
@@ -72,10 +72,6 @@ public class ModelServiceImpl implements ModelService {
         return modelVOList;
     }
 
-    /**
-     * 查询模型详情
-     * @param id
-     */
     @Override
     public ModelVersion detail(Long id) {
         log.info("查询模型详情");
@@ -83,23 +79,12 @@ 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("删除模型版本");
@@ -125,14 +110,14 @@ public class ModelServiceImpl implements ModelService {
         ModelLifecycle currentLifeCycle;
         ModelLifecycle targetLifeCycle;
         try {
-            currentLifeCycle = ModelLifecycle.valueOf(currentLifeCycleStr.trim());  // 数据库中是英文
-            targetLifeCycle = ModelLifecycle.valueOf(lifeCycleDescription.trim());        // 前端传英文代码，直接转换
+            currentLifeCycle = ModelLifecycle.valueOf(currentLifeCycleStr.trim()); // 数据库中是英文
+            targetLifeCycle = ModelLifecycle.fromDescription((lifeCycleDescription).trim());      // 前端传中文
         } catch (IllegalArgumentException e) {
             log.error(MessageConstant.LifeCycle_Undefined + ":{}", e.getMessage());
             throw e;
         }
 
-        // 2. 业务逻辑校验（保持不变）
+        // 2. 业务逻辑校验
         switch (currentLifeCycle) {
             case DEPLOYED:
                 if (targetLifeCycle == ModelLifecycle.DESIGNING) {
@@ -157,15 +142,12 @@ public class ModelServiceImpl implements ModelService {
         int affectedRows = modelMapper.updateLifeCycleById(id, targetLifeCycle.getDbValue());
         if (affectedRows == 0) {
             log.error("更新模型生命周期失败");
-            throw new RuntimeException(MessageConstant.LIFECYCLE_UPDATE_FAILURE);
+            throw new RuntimeException(MessageConstant.UPDATE_FAILURE);
         }
 
         log.info("模型生命周期更新成功，新状态为: {}", targetLifeCycle);
     }
 
-    /**
-     * 获取模型生命周期列表
-     */
     @Override
     public List<Map<String, String>> listLifeCycle() {
         return Arrays.stream(ModelLifecycle.values())
@@ -176,9 +158,6 @@ public class ModelServiceImpl implements ModelService {
                 .collect(Collectors.toList());
     }
 
-    /**
-     * 获取模型数据集列表
-     */
     @Override
     public List<DatasetEntity> listDataset() {
         List<DatasetEntity> datasetEntityList = modelMapper.listDataset();
@@ -186,41 +165,4 @@ 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,15 +2,12 @@ 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
  */
@@ -38,10 +35,6 @@ public class PublishServiceImpl implements PublishService {
         publishMapper.insert(servicePublishDTO);
     }
 
-    @Override
-    public List<ServicePublishVO> listPublishedServices() {
-        return publishMapper.listPublishedServices();
-    }
 
 
 }

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

@@ -23,10 +23,4 @@ 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/PublishService.java

@@ -1,14 +1,12 @@
 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/impl/GpuManageServiceImpl.java

@@ -1,7 +1,7 @@
 package com.bipt.intelligentapplicationorchestrationservice.service.impl;
 
 import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.entity.GpuMapper;
+import com.bipt.intelligentapplicationorchestrationservice.entity.GpuEntityTransfer;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuCreateDTO;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuResponseDTO;
 import com.bipt.intelligentapplicationorchestrationservice.pojo.GpuUpdateDTO;
@@ -28,7 +28,7 @@ public class GpuManageServiceImpl implements GpuManageService {
     private GpuResourceDao gpuDao;
 
     @Autowired
-    private GpuMapper gpuMapper;
+    private GpuEntityTransfer gpuEntityTransfer;
 
     @Transactional
     @Override
@@ -36,7 +36,7 @@ public class GpuManageServiceImpl implements GpuManageService {
         try {
             logger.info("创建GPU资源请求: {}", dto);
 
-            GpuResource entity = gpuMapper.toEntity(dto);
+            GpuResource entity = gpuEntityTransfer.toEntity(dto);
             gpuDao.insert(entity);
 
             logger.info("创建GPU资源成功, ID: {}", entity.getGPUId());
@@ -76,7 +76,7 @@ public class GpuManageServiceImpl implements GpuManageService {
         logger.info("更新GPU资源请求: {}", dto);
 
         try {
-            GpuResource entity = gpuMapper.toEntity(dto);
+            GpuResource entity = gpuEntityTransfer.toEntity(dto);
             gpuDao.updateById(entity);
             logger.info("更新GPU资源成功, ID: {}", entity.getGPUId());
 
@@ -100,7 +100,7 @@ public class GpuManageServiceImpl implements GpuManageService {
             logger.info("查询到 {} 条GPU资源", entities.size());
 
             return entities.stream()
-                    .map(gpuMapper::toDTO)
+                    .map(gpuEntityTransfer::toDTO)
                     .collect(Collectors.toList());
 
         } catch (Exception e) {

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

@@ -1,207 +0,0 @@
-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/resources/application-dev.properties

@@ -1,5 +0,0 @@
-# 阿里云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

@@ -9,6 +9,7 @@ spring.datasource.driver-class-name=com.kingbase8.Driver
 spring.datasource.hikari.maximum-pool-size=10
 spring.datasource.hikari.minimum-idle=5
 spring.datasource.hikari.connection-timeout=30000
+spring.mvc.contentnegotiation.default-content-type=application/json
 
 # MyBatis??
 mybatis.mapper-locations=classpath:mapper/*.xml
@@ -44,19 +45,4 @@ model.repository.timeout=5000
 
 #SQL ????????
 logging.level.com.bipt.intelligentapplicationorchestrationservice.mapper=DEBUG
-mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl
-
-management.health.rabbit.enabled=false
-
-
-# 文件上传配置
-spring.servlet.multipart.enabled=true
-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
-
+mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl

src/main/resources/mapper/AlgorithmInfoMapper.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.bipt.intelligentapplicationorchestrationservice.mapper.AlgorithmInfoMapper">
-
-        <select id="selectByNameLike" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.AlgorithmInfo">
-            SELECT * FROM algorithm_info WHERE algorithm_name LIKE CONCAT('%', #{keyword}, '%')
-        </select>
-</mapper>

src/main/resources/mapper/DatasetMapper.xml

@@ -44,6 +44,24 @@
             <if test="datasetName != null and datasetName!=''">
                 dataset_name LIKE CONCAT('%', #{datasetName}, '%')
             </if>
+            <if test="datasetType != null">
+                and dataset_type=#{datasetType}
+            </if>
+            <if test="datasetStatus != null">
+                and dataset_status=#{datasetStatus}
+            </if>
+            <if test="dsPath != null">
+                and ds_path=#{dsPath}
+            </if>
+            <if test="args != null">
+                and args=#{args}
+            </if>
+            <if test="createTime != null">
+                and create_time=#{createTime}
+            </if>
+            <if test="updateTime != null">
+                and update_time=#{updateTime}
+            </if>
         </where>
     </select>
 </mapper>

src/main/resources/mapper/EvaluationMapper.xml

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

src/main/resources/mapper/ModelMapper.xml

@@ -31,8 +31,8 @@
     <!--查询模型详细信息-->
     <select id="selectById" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion">
         SELECT
-            t1.model_name, t1.id modelId,
-            t2.version, t2.dataset_id, t2.model_config, t2.id,
+            t1.model_name,
+            t2.version, t2.dataset_id, t2.model_config,
             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,33 +44,16 @@
     <update id="update">
         UPDATE model_version
         <set>
-            <if test="datasetId != null">dataset_id = #{datasetId},</if>
-            <if test="modelConfig != null">model_config = #{modelConfig},</if>
-            <if test="modelPath != null">model_path = #{modelPath},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="modelSize != null">model_size = #{modelSize},</if>
-            <if test="dataPreHandleFile != null">data_pre_handle_file = #{dataPreHandleFile},</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>
+            <if test="modelSize != null">
+                model_size = #{modelSize},
+            </if>
+            <if test="modelSuperArgs != null">
+                model_super_args = #{modelSuperArgs},
+            </if>
+            <if test="modelArgsSize != null">
+                model_args_size = #{modelArgsSize},
+            </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,ip)
-        values (#{id}, #{modelId}, #{apiUrl}, #{createTime},#{ip})
+        (id,model_id,api_url,create_time)
+        values (#{id}, #{modelId}, #{apiUrl}, #{createTime})
     </insert>
 
     <select id="getByApiUrl" resultType="java.lang.Long">