Merge branch 'nh'

# Conflicts:
#	src/main/resources/application.properties

pom.xml

@@ -165,6 +165,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>

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

@@ -3,23 +3,31 @@ 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);
@@ -63,15 +71,51 @@ public class AlgorithmInfoController {
             ResponseEntity.badRequest().body("Delete failed");
     }
 
-    /**
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-     * 算法创建
-     */
-    @PostMapping
     @Operation(summary ="算法创建")
-    public OptResult save(@RequestBody AlgorithmInfo algorithmInfo){
+    public OptResult save(@RequestParam("algorithm") String algorithmJson,
-        log.info("新增算法",algorithmInfo);
+                          @RequestPart(value = "algorithmFile") MultipartFile file) {
-        algorithmInfoService.save(algorithmInfo);
+        try {
-        return OptResult.success("算法创建成功");
+            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();
     }
 
 } 

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

@@ -6,28 +6,44 @@ 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 ="新增数据集")
+    @Operation(summary = "新增数据集")
-    @PostMapping
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public OptResult save(@RequestBody DatasetDTO datasetDTO) {
+    public OptResult save(
-        log.info("新增数据集:{}", datasetDTO);
+            @ModelAttribute("dataset") DatasetDTO datasetDTO,
-        datasetService.save(datasetDTO);
+            @RequestPart(value = "file", required = false) MultipartFile file) {
-        return OptResult.success();
+        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());
+        }
     }
 
     /**
@@ -43,17 +59,17 @@ public class DatasetController {
         return OptResult.success(pageResult);
     }
 
-
     /**
      * 修改数据集
      * @param datasetDTO
      * @return
      */
     @Operation(summary ="修改数据集")
-    @PutMapping
+    @PutMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public OptResult update(@RequestBody DatasetDTO datasetDTO){
+    public OptResult update(@ModelAttribute("dataset") DatasetDTO datasetDTO,
-        log.info("修改数据集",datasetDTO);
+                            @RequestPart(value = "file", required = false) MultipartFile file){
-        datasetService.update(datasetDTO);
+        log.info("修改数据集{}, 文件: {}", datasetDTO, (file != null ? file.getOriginalFilename() : "无文件"));
+        datasetService.update(datasetDTO,file);
         return OptResult.success();
     }
 
@@ -72,4 +88,34 @@ 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,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/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 = "查询生命周期列表")

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

@@ -29,4 +29,12 @@ 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/pojo/DatasetDTO.java

@@ -19,6 +19,7 @@ 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,6 +17,7 @@ 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/ModelVersionDTO.java

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

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

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

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

@@ -3,18 +3,22 @@ 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);
+    void save(DatasetDTO datasetDTO, MultipartFile file);
 
-    void update(DatasetDTO datasetDTO);
+    void update(DatasetDTO datasetDTO, MultipartFile file);
 
     PageResult pageQuery(DatasetPageQueryDTO dataSetPageQueryDTO);
 
     void deleteBatch(List<Long> datasetIds);
+
+    InputStream downloadDataset(Long datasetId);
 }

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

@@ -3,19 +3,28 @@ 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);
@@ -61,22 +70,80 @@ public class AlgorithmInfoServiceImpl implements AlgorithmInfoService {
         return true;
     }
 
-    /**
-     * 算法创建
-     * @param algorithmInfo
-     */
     @Override
     @Transactional
-    public void save(AlgorithmInfo algorithmInfo) {
+    public void save(AlgorithmInfo algorithmInfo, MultipartFile file) {
         String algorithmName = algorithmInfo.getAlgorithmName();
-        //查找表里是否有重复的算法，如果有则报错
+        // 检查同名算法
         AlgorithmInfo duplicateName = algorithmInfoMapper.selectByName(algorithmName);
-        if (duplicateName != null){
+        if (duplicateName != null) {
-            throw new RuntimeException("算法已存在");
+            throw new RuntimeException("算法已存在，请去修改算法");
         }
-        //todo 算法文件分布式存入分布式存储中
 
+        // 只接收文件但不进行保存操作
+        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) {
+        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
+     */
+    @Override
+    public List<AlgorithmInfo> getByNameLike(String keyword) {
+        return algorithmInfoMapper.selectByNameLike(keyword);
+    }
 } 

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

@@ -12,12 +12,17 @@ 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
@@ -25,63 +30,65 @@ public class DatasetServiceImpl implements DatasetService {
     @Autowired
     private DatasetMapper datasetMapper;
 
-    /**
-     * 新增数据集
-     * @param datasetDTO
-     */
     @Override
     @Transactional
-    public void save(DatasetDTO datasetDTO) {
+    public void save(DatasetDTO datasetDTO, MultipartFile file) {
-        //判断数据集类型，如果是本地上传则保存，若用调用数据仓库进入下一步
-        // 获取数据集类型
         DatasetType datasetType = DatasetType.fromCode(datasetDTO.getDatasetType());
-        // 根据类型处理数据
+        if (datasetType == UPLOAD && file != null && !file.isEmpty()) {
-        switch (datasetType) {
+            try {
-            case UPLOAD:
+                //todo存入分布式文件系统
-                //TODO 保存到分布式文件系统
-                break;
-            case FROM_DATABASE:
-                String args = datasetDTO.getArgs();
-                //TODO 根据筛选条件调用数据仓库中的数据
 
-                //TODO 调用数据仓库保存到分布式文件系统
+                // 生成文件名（建议使用 UUID 避免重复）
-                break;
+                String fileName = UUID.randomUUID() + "-" + file.getOriginalFilename();
-            default:
+                // 假设使用本地存储（实际需对接分布式文件系统，如 MinIO、OSS 等）
-                throw new IllegalArgumentException("不支持的数据集类型: " + datasetType);
+                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 从数据仓库中查询 并选择筛选条件
         }
 
+        // 保存数据集实体
         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) {
+    public void update(DatasetDTO datasetDTO, MultipartFile file) {
-        /*DatasetEntity datasetEntity = new DatasetEntity();
-        BeanUtils.copyProperties(datasetDTO,datasetEntity);*/
         DatasetType datasetType = DatasetType.fromCode(datasetDTO.getDatasetType());
-        // 根据类型处理数据
+        if (datasetType == UPLOAD && file != null && !file.isEmpty()) {
-        switch (datasetType) {
+            try {
-            case UPLOAD:
+                // 生成文件名（建议使用 UUID 避免重复）
-                //TODO 覆盖保存到分布式文件系统中
+                String fileName = UUID.randomUUID() + "-" + file.getOriginalFilename();
-                break;
+                // 假设使用本地存储（实际需对接分布式文件系统，如 MinIO、OSS 等）
-            case FROM_DATABASE:
+                String filePath = "/your/storage/path/" + fileName;
-                //TODO 覆盖数据文件
+                // 保存文件到磁盘（示例代码，需处理 IO 异常）
-
+                file.transferTo(new File(filePath));
-                break;
+                // 更新数据集路径
-            default:
+                datasetDTO.setDsPath(filePath); // 取消注释，并确保 datasetDTO 有 setDsPath 方法
-                throw new IllegalArgumentException("不支持的数据集类型: " + datasetType);
+            } catch (IOException e) {
+                throw new RuntimeException("文件上传失败: " + e.getMessage());
+            }
+        } else if (datasetType == FROM_DATABASE){
+            //todo 从数据仓库中查询 并选择筛选条件
         }
+
         DatasetEntity datasetEntity = new DatasetEntity();
         BeanUtils.copyProperties(datasetDTO,datasetEntity);
         datasetEntity.setUpdateTime(LocalDateTime.now());
@@ -112,4 +119,14 @@ 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");
+        modelVersion.setOperateUser("zs");    //这里的写死的，后续需要修改，应该是当前登录用户的id
         modelMapper.insertModelVersion(modelVersion);
     }
 
@@ -81,6 +81,7 @@ public class ModelServiceImpl implements ModelService {
 
     @Override
     public void updateModel(ModelVersionDTO dto) {
+        // 更新模型还需要更新操作人和时间
         log.info("更新模型");
         modelMapper.update(dto);
     }
@@ -110,14 +111,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,7 +143,7 @@ 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);

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/resources/application.properties

@@ -41,3 +41,14 @@ 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
+
+

src/main/resources/mapper/AlgorithmInfoMapper.xml

@@ -0,0 +1,8 @@
+<?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,24 +44,6 @@
             <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

@@ -18,6 +18,6 @@
             <if test="status != null">
                 status=#{status}
             </if>
-            where model_id=#{id}
+            where id=#{id}
     </update>
 </mapper>

src/main/resources/mapper/ModelMapper.xml

@@ -44,16 +44,22 @@
     <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>
 </mapper>