服务发布（无redis版）

日志提交
2025-05-20 16:36:54 +08:00 · 2025-05-20 16:33:07 +08:00 · 2025-05-20 12:07:53 +08:00 · 2025-05-20 12:05:58 +08:00
84 changed files with 226 additions and 3518 deletions
--- a/doc/WorkReport/2025-05-15-杜冲.md
+++ b/doc/WorkReport/2025-05-15-杜冲.md
@ -1,13 +0,0 @@
-# 工作日报 - 2025年5月
-## 2025年5月15日
-### ✅ 今日完成
- 完成删除和查询功能
-
-_### 🚧 进行中
- 设计触发服务API请求调度缓存更新类
-
-### ⚠️ 问题/障碍
- KingBase8数据库方言配置出错
-
-### 📅 明日计划
- 完成触发API请求调度缓存更新类
--- a/doc/WorkReport/2025-05-hky.md
+++ b/doc/WorkReport/2025-05-hky.md
@ -62,45 +62,4 @@ redis设计
 暂无

 ### 📅 明日计划
-完成redis设计，做完服务发布的逻辑开发
-
-## 2025年5月21日
-### ✅ 今日完成
-redis的服务器配置
-
-### 🚧 进行中
-开发服务发布的redis内容
-
-### ⚠️ 问题/障碍
-如何把model_version表中的配置中相关GPU资源的内容提取出来。
-
-### 📅 明日计划
-完成服务发布的开发
-
-## 2025年5月23日
-### ✅ 今日完成
-服务发布，拦截器部分功能
-
-### 🚧 进行中
-拦截器等待队列算法
-
-### ⚠️ 问题/障碍
-不知道怎么优先分配等待队列中任务
-
-### 📅 明日计划
-完成拦截器功能
-
-## 2025年5月25日
-### ✅ 今日完成
-服务发布可注册到nacos上
-
-### 🚧 进行中
-拦截器开发
-
-### ⚠️ 问题/障碍
-模型api请求不知道是什么
-
-### 📅 明日计划
-开发拦截器功能
-
-
+完成redis设计，做完服务发布的逻辑开发
--- a/doc/WorkReport/2025-05-nh.md
+++ b/doc/WorkReport/2025-05-nh.md
@ -15,7 +15,7 @@
 - 继续开发模型评估部分
 - 尽量解决lombok存在的问题

-## 2025年5月15日
+## 2025年5月14日

 ### ✅ 今日完成

@ -30,6 +30,21 @@

 * 继续优化模型评估部分

+## 2025年5月15日
+
+### ✅ 今日完成
+
+- 基本完成模型评估部分的功能开发
+- 加入SpringDoc OpenAPI相关依赖和配置文件（自动生成 REST API 文档和 Swagger UI）
+
+### 🚧 进行中
+
+- 模型评估部分优化
+
+### 📅 明日计划
+
+- 模型评估部分优化
+
 ## 2025年5月19日

 ### ✅ 今日完成
@ -43,136 +58,4 @@

 ### 📅 明日计划

- 基本完成创建模型部分后端开发
-
-## 2025年5月20日
-
-### ✅ 今日完成
-
- 数据库表字段新增
- 实体类定义与修改
- 基本完成创建模型部分后端开发
-
-### 🚧 进行中
-
- 创建模型部分后端优化
-
-### 📅 明日计划
-
- 模型信息管理部分后端开发
-
-## 2025年5月23日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面基础搭建
-
-### 🚧 进行中
-
- 模型信息管理前端页面搭建
-
-### 📅 明日计划
-
- 模型信息管理前端页面搭建
-
-## 2025年5月24日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面部分数据与后端联调
- 模型信息管理后端开发20%
-
-### 🚧 进行中
-
- 模型信息管理后端开发
- 模型信息管理前端页面部分数据与后端联调
-
-### 📅 明日计划
-
- 模型信息管理后端开发
- 模型信息管理前端页面部分数据与后端联调
-
-## 2025年5月25日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面开发
- 模型信息管理后端开发90%（后续可能还需要根据需求优化）
-
-### 🚧 进行中
-
- 模型信息管理前端页面开发
-
-### 📅 明日计划
-
- 模型信息管理前端页面开发
-
-## 2025年5月26日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月27日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月28日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月29日
-
-### ✅ 今日完成
-
- 模型信息管理前端页面开发与后端联调
-
-### 🚧 进行中
-
- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
- 模型信息管理前端页面开发与后端联调
-
-## 2025年5月30日
-
-### ✅ 今日完成
-
- 增加了查询数据集列表和生命周期列表接口
-
-### 🚧 进行中
-
- 模型信息管理前端页面开发与后端联调
-
-### 📅 明日计划
-
- 模型信息管理前端页面开发与后端联调
+- 基本完成创建模型部分后端开发
--- a/doc/WorkReport/2025-05-孙一城.md
+++ b/doc/WorkReport/2025-05-孙一城.md
@ -5,4 +5,14 @@


 ### 📅 明日计划
- 实现需求文档功能
+- 实现需求文档功能
+
+
+## 2025年5月15日
+### ✅ 今日完成
+- 完成算法生命周期后端开发
+
+
+## 2025年5月19日
+### ✅ 今日完成
+- 完成算法创建后端开发
--- a/doc/WorkReport/2025-05-杜冲.md
+++ b/doc/WorkReport/2025-05-杜冲.md
@ -25,30 +25,4 @@ _### 🚧 进行中
 - KingBase8数据库方言配置出错

 ### 📅 明日计划
- 完成触发API请求调度缓存更新类
- ## 2025年5月19日
-### ✅ 今日完成
- 完成缓存层设计与配置
-
-_### 🚧 进行中
- 实现缓存更新逻辑
-
-### ⚠️ 问题/障碍
- 暂无
-
-### 📅 明日计划
- 完成缓存更新逻辑
- 设计模型部署类
- ## 2025年5月20日
-### ✅ 今日完成
- 完成缓存更新逻辑
-
-_### 🚧 进行中
- 设计模型部署类
-
-### ⚠️ 问题/障碍
- 暂无
-
-### 📅 明日计划
- 完成模型部署类的设计
- 完成数据结构和基本配置
+- 完成触发API请求调度缓存更新类
--- a/doc/WorkReport/2025-06-nh
+++ b/doc/WorkReport/2025-06-nh
@ -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日
-
-### ✅ 今日完成
-
- 基本完成了版本构建、修改生命周期、上下线、模型评估和详情功能
- 修改了模型评估和生命周期更新的一些细节，便于和前端接口协调
-
-### 🚧 进行中
-
- 模型管理页面前端细节优化
-
-### 📅 明日计划
-
- 模型管理页面前端细节优化
--- a/pom.xml
+++ b/pom.xml
@ -2,51 +2,34 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.2.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-
 	<groupId>com.bipt</groupId>
 	<artifactId>intelligent-application-orchestration-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>intelligent-application-orchestration-service</name>
 	<description>intelligent-application-orchestration-service</description>
 	<url/>
-
+	<licenses>
+		<license/>
+	</licenses>
+	<developers>
+		<developer/>
+	</developers>
+	<scm>
+		<connection/>
+		<developerConnection/>
+		<tag/>
+		<url/>
+	</scm>
 	<properties>
 		<java.version>21</java.version>
-		<!-- 添加 Spring Cloud 版本控制 -->
-		<spring-cloud.version>2022.0.4</spring-cloud.version>
 	</properties>
-
-	<!-- 依赖管理：统一控制 Spring Cloud 和 Alibaba 版本 -->
-	<dependencyManagement>
-		<dependencies>
-			<!-- Spring Cloud 依赖 -->
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>${spring-cloud.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<!-- Spring Cloud Alibaba 依赖 -->
-			<dependency>
-				<groupId>com.alibaba.cloud</groupId>
-				<artifactId>spring-cloud-alibaba-dependencies</artifactId>
-				<version>2022.0.0.0-RC2</version> <!-- 适配 Spring Boot 3.1.x 的正确版本 -->
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
-		<!-- Spring Boot 基础依赖 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jdbc</artifactId>
@ -55,56 +38,42 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-redis</artifactId>
 		</dependency>
-
-		<!-- 数据库驱动 -->
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.kingbase8</groupId>
-			<artifactId>kingbase8</artifactId>
-			<version>9.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
-		</dependency>
-		<!-- 工具类依赖 -->
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<version>1.18.38</version>
 			<optional>true</optional>
 		</dependency>
+
+		<!--分页查询-->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.4.7</version>
 		</dependency>
+		<!--swagger相关依赖，生成接口文档-->
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.3.0</version>
+			<version>2.3.0</version> <!-- 最新稳定版 -->
 		</dependency>

-		<!-- Nacos 配置依赖（移除手动版本，由上方依赖管理控制） -->
+		<!--KingbaseES V8/V9 数据库 JDBC 驱动-->
 		<dependency>
-			<groupId>com.alibaba.cloud</groupId>
-			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+			<groupId>com.kingbase8</groupId>
+			<artifactId>kingbase8</artifactId>
+			<version>9.0.0</version>
 		</dependency>
-		<!-- Spring Boot 3.x 必须的 Bootstrap 依赖（无需版本号） -->
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-bootstrap</artifactId>
-		</dependency>
-
-		<!-- 测试依赖 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@ -121,74 +90,6 @@
 			<version>3.0.4</version>
 			<scope>test</scope>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.17.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mapstruct</groupId>
-			<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>
-			<exclusions>
-				<!-- 排除 RabbitMQ 自动配置 -->
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-amqp</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-generator</artifactId>
-			<version>3.5.6</version>
-		</dependency>
-		<dependency>
-			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-boot-starter</artifactId>
-			<version>3.5.6</version>
-		</dependency>
-		<dependency>
-			<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>
@ -197,9 +98,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<!-- 显式指定 Java 21 编译 -->
-					<source>${java.version}</source>
-					<target>${java.version}</target>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>org.projectlombok</groupId>
@ -223,4 +121,5 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+
+</project>
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
@ -4,13 +4,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.transaction.annotation.EnableTransactionManagement;

@MapperScan("com.bipt.intelligentapplicationorchestrationservice.mapper")//指定扫描Mapper接口的包
@SpringBootApplication
@EnableTransactionManagement
-@EnableDiscoveryClient
@Slf4j
 public class IntelligentApplicationOrchestrationServiceApplication {

--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheInitTask.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheInitTask.java
@ -1,37 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.cache;
-
-import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CacheInitTask {
-
-    private final CacheManager cacheManager;
-
-    @Value("${cache.init-batch-size:500}")
-    private int batchSize;
-
-    @Autowired
-    public CacheInitTask(CacheManager cacheManager) {
-        this.cacheManager = cacheManager;
-    }
-
-    /**
-     * 应用启动后执行全量缓存加载
-     * 使用@EventListener替代@PostConstruct确保数据库连接就绪
-     */
-    @EventListener(ApplicationReadyEvent.class)
-    public void initCacheOnStartup() {
-        try {
-            cacheManager.loadFullCache(batchSize);
-            System.out.println("✅ 缓存全量初始化完成 | Total loaded: " + cacheManager.getCacheCount());
-        } catch (Exception e) {
-            System.err.println("❌ 缓存初始化失败: " + e.getMessage());
-            e.printStackTrace();
-        }
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java
@ -1,63 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.cache;
-
-import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager;
-import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import java.time.LocalDateTime;
-import java.util.List;
-
-//@Slf4j
-@Component
-public class CacheSyncTask {
-    private final GpuResourceDao gpuResourceDao;
-    private final CacheManager cacheManager;
-    private LocalDateTime lastSyncTime = LocalDateTime.MIN;
-    private static final Logger log = LoggerFactory.getLogger(CacheSyncTask.class);
-
-    @Autowired
-    public CacheSyncTask(GpuResourceDao gpuResourceDao, CacheManager cacheManager) {
-        this.gpuResourceDao = gpuResourceDao;
-        this.cacheManager = cacheManager;
-    }
-
-    /**
-     * 定时同步缓存（默认每10分钟）
-     */
-    @Scheduled(fixedDelayString = "${cache.sync-interval:600000}")
-    public void syncCache() {
-        try {
-            LocalDateTime currentSyncTime = LocalDateTime.now();
-            log.info("🔄 开始缓存同步 | 时间范围: {} - {}", lastSyncTime, currentSyncTime);
-
-            // 1. 查询增量数据
-            List<GpuResource> modifiedGpus = gpuResourceDao.findModifiedSince(lastSyncTime);
-            if (modifiedGpus.isEmpty()) {
-                log.info("✅ 无数据变更，跳过本次同步");
-                return;
-            }
-
-            // 2. 处理数据变更
-            modifiedGpus.forEach(gpu -> {
-                if (gpu.getIsDeleted()) {
-                    cacheManager.evictCache(gpu.getGPUId());
-                    log.debug("🗑️ 删除缓存 | GPU ID: {}", gpu.getGPUId());
-                } else {
-                    cacheManager.refreshCache(gpu.getGPUId());
-                    log.debug("🔄 更新缓存 | GPU ID: {}", gpu.getGPUId());
-                }
-            });
-
-            // 3. 更新同步时间戳
-            lastSyncTime = currentSyncTime;
-            log.info("✅ 缓存同步完成 | 共处理 {} 条记录", modifiedGpus.size());
-
-        } catch (Exception e) {
-            log.error("❌ 缓存同步失败: {}", e.getMessage(), e);
-        }
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/CacheAopConfig.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/CacheAopConfig.java
@ -1,48 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.config;
-
-
-import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
-
-@Aspect
-@Component
-public class CacheAopConfig {
-    private final CacheManager cacheManager;
-
-    public CacheAopConfig(CacheManager cacheManager) {
-        this.cacheManager = cacheManager;
-    }
-
-    // 定义写操作切点
-    @Pointcut("@annotation(org.springframework.transaction.annotation.Transactional) && " +
-            "execution(* com.bipt.intelligentapplicationorchestrationservice.service..*.*(..))")
-    public void writeOperation() {}
-
-    // 事务提交后操作
-    @AfterReturning(pointcut = "writeOperation()", returning = "result")
-    public void afterWriteCommit(JoinPoint joinPoint, Object result) {
-        TransactionSynchronizationManager.registerSynchronization(
-                new TransactionSynchronization() {
-                    @Override
-                    public void afterCommit() {
-                        processCacheUpdate(result);
-                    }
-                });
-    }
-
-    private void processCacheUpdate(Object result) {
-        if (result instanceof GpuResource) {
-            GpuResource gpu = (GpuResource) result;
-            cacheManager.refreshCache(gpu.getGPUId());
-        } else if (result instanceof Long) { // 处理删除操作返回ID的情况
-            cacheManager.evictCache((Long) result);
-        }
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/OssConfiguration.java
+++ b/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());
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfig.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfig.java
@ -1,97 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.config;
-
-import ch.qos.logback.classic.Logger;
-import io.lettuce.core.ClientOptions;
-import io.lettuce.core.SocketOptions;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.RedisPassword;
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-import java.time.Duration;
-
-@Configuration
-public class RedisConfig {
-    @Value("${spring.data.redis.host}")
-    private String redisHost;
-
-    @Value("${spring.data.redis.port}")
-    private int redisPort;
-
-    @Value("${spring.data.redis.username}")
-    private String redisUsername;
-
-    @Value("${spring.data.redis.password}")
-    private String redisPassword;
-
-    @Value("${spring.data.redis.ssl:false}")
-    private boolean useSsl;
-
-    @Bean
-    public RedisConnectionFactory redisConnectionFactory() {
-        // 1. 创建 SocketOptions
-        SocketOptions socketOptions = SocketOptions.builder()
-                .connectTimeout(Duration.ofSeconds(15))  // 连接超时
-                .keepAlive(true)                        // 启用 TCP Keep-Alive
-                .build();
-
-        // 2. 构建 ClientOptions
-        ClientOptions clientOptions = ClientOptions.builder()
-                .socketOptions(socketOptions)
-                .autoReconnect(true)                    // 启用自动重连
-                .build();
-
-        // 3. 集成到 Lettuce 配置
-        LettuceClientConfiguration clientConfig = LettuceClientConfiguration.builder()
-                .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(){
-        RedisTemplate<String, Object> template = new RedisTemplate<>();
-        Logger log = (Logger) LoggerFactory.getLogger(RedisConfig.class);
-        log.info("开始创建redis模板对象...");
-        //RedisTemplate redisTemplate = new RedisTemplate();
-        //设置redis的连接工厂对象
-        //redisTemplate.setConnectionFactory(redisConnectionFactory);
-        //设置redis key的序列化器
-        //redisTemplate.setKeySerializer(new StringRedisSerializer());
-        //RedisTemplate<String, GpuResource> template = new RedisTemplate<>();
-        template.setConnectionFactory(redisConnectionFactory());
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
-        return template;
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfiguration.java.bak
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/RedisConfiguration.java.bak
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/WebMvcConfiguration.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/config/WebMvcConfiguration.java
@ -4,18 +4,20 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.servers.Server;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;

 import java.util.ArrayList;
 import java.util.List;

+/**
+ * 配置类，注册web层相关组件
+ */
@Configuration
@Slf4j
-public class WebMvcConfiguration implements WebMvcConfigurer {
+public class WebMvcConfiguration{

    /**
     * 配置OpenAPI信息
@ -34,4 +36,12 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
                .servers(servers);
    }

+//    /**
+//     * 设置静态资源映射（Springdoc不需要特殊配置，保留可能的其他资源映射）
+//     */
+//    @Override
+//    protected void addResourceHandlers(ResourceHandlerRegistry registry) {
+//        // 保留其他静态资源映射（如果有）
+//        // registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+//    }
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/constant/MessageConstant.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/constant/MessageConstant.java
@ -3,17 +3,4 @@ package com.bipt.intelligentapplicationorchestrationservice.constant;
 public class MessageConstant {
    public static final String UNKNOWN_ERROR = "未知错误";
    public static final String ALREADY_EXISTS = "已存在";
-
-    //生命周期相关常量
-    public static final String LifeCycle_No_Exist = "生命周期不存在";
-    public static final String LifeCycle_Undefined = "生命周期未定义";
-    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= "文件为空";
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/AlgorithmInfoController.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/AlgorithmInfoController.java
@ -1,33 +1,20 @@
 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);
@ -70,52 +57,4 @@ public class AlgorithmInfoController {
            ResponseEntity.ok("Delete successful") : 
            ResponseEntity.badRequest().body("Delete failed");
    }
-
-    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @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();
-    }
-
 } 
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/CommonController.java
+++ b/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);
-        }
-
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/DatasetController.java
+++ b/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);
-        }
-    }
-
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/EvaluationController.java
+++ b/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
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/GpuResourceController.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/GpuResourceController.java
@ -1,48 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.controller;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
-import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService;
-import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@RestController
-@RequestMapping
-public class GpuResourceController {
-    @Autowired
-    private GpuManageService gpuManageService;
-
-    @PostMapping
-    public ResponseVO addGpu(@Valid @RequestBody GpuCreateDTO dto){
-        return gpuManageService.createGpuResource(dto);
-    }
-
-    @DeleteMapping("/{gpuId}")
-    public ResponseVO removeGpu(@PathVariable("gpuId") Long gpuId){
-        return gpuManageService.deleteGpuResource(gpuId);
-    }
-
-    @PutMapping("/{gpuId}")
-    public void updateGpuResource(
-            @PathVariable Long gpuId,
-            @Valid @RequestBody GpuUpdateDTO dto){
-        dto.setGPUId(gpuId);
-        gpuManageService.updateGpuResource(dto);
-    }
-
-    @GetMapping("/search")
-    public ResponseVO<List<GpuResponseDTO>> searchGpuResources(
-            @RequestParam(required = false) String model,
-            @RequestParam(required = false) Integer memorySize,
-            @RequestParam(required = false) String ip){
-
-        List<GpuResponseDTO> resources = gpuManageService.searchByCriteria(model, memorySize,ip);
-
-        return ResponseVO.success(resources);
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ModelController.java
@ -1,106 +0,0 @@
-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;
-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 java.util.List;
-import java.util.Map;
-
-@Slf4j
-@RestController
-@RequestMapping("/model")
-@Tag(name = "模型部分相关接口")
-@CrossOrigin(origins = "http://localhost:3000")   // 生产环境指定具体域名
-public class ModelController {
-    @Autowired
-    private ModelService modelService;
-    @Operation(summary = "创建模型")
-    @PostMapping("/createModel")
-    public OptResult creatModel(@RequestBody ModelDTO dto){
-        log.info("创建模型");
-        modelService.createModel(dto);
-        return OptResult.success();
-    }
-
-    @Operation(summary = "新增模型版本")
-    @PostMapping("/createModelVersion")
-    public OptResult createModelVersion(@RequestBody ModelDTO dto){
-        log.info("新增模型版本");
-        modelService.createModelVersion(dto);
-        return OptResult.success();
-    }
-
-    @Operation(summary = "查询模型列表")
-    @GetMapping("list")
-    public OptResult list(){
-        log.info("查询模型列表");
-        List<ModelVO> modelVOList = modelService.list();
-        return OptResult.success(modelVOList);
-    }
-
-    @Operation(summary = "查询模型详情")
-    @GetMapping("detail")
-    public OptResult detail(Long id){
-        log.info("查询模型详情");
-        ModelVersion  modelVersion = modelService.detail(id);
-        return OptResult.success(modelVersion);
-    }
-
-    @Operation(summary = "模型更新")
-    @PutMapping("/updateModel/{id}")
-    public OptResult updateModel(@PathVariable("id") Long id, @RequestBody ModelVersionDTO dto) {
-        log.info("模型更新，id: {}", id);
-        dto.setId(id);
-        modelService.updateModel(dto);
-        return OptResult.success();
-    }
-
-
-
-    @Operation(summary = "模型版本删除")
-    @DeleteMapping("/deleteModelVersion")
-    public OptResult deleteModelVersion(Long id){
-        log.info("模型版本删除");
-        modelService.deleteModelVersion(id);
-        return OptResult.success();
-    }
-
-    @Operation(summary = "更新生命周期")
-    @PutMapping("/updateLifeCycle")
-    public OptResult updateLifeCycle(@RequestParam Long id, @RequestParam 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);
-        }
-    }
-
-    @Operation(summary = "查询生命周期列表")
-    @GetMapping("/listLifeCycle")
-    public OptResult listLifeCycle(){
-        log.info("查询生命周期列表");
-        List<Map<String, String>> lifeCycleList = modelService.listLifeCycle();
-        return OptResult.success(lifeCycleList);
-    }
-
-    @Operation(summary = "查询数据集列表")
-    @GetMapping("/listDataset")
-    public OptResult listDataset(){
-        List<DatasetEntity> datasetList = modelService.listDataset();
-        return OptResult.success(datasetList);
-    }
-
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/PublishController.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/PublishController.java
@ -1,73 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.controller;
-
-import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
-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.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Tag(name ="服务发布相关接口")
-@RestController
-@RequestMapping("/publish")
-@Slf4j
-public class PublishController {
-    @Autowired
-    private PublishService publishService;
-
-    @Autowired
-    private NacosServiceUtil nacosServiceUtil;
-
-    @PostMapping
-    @Operation(summary ="新增发布请求")
-    @Transactional
-    public OptResult<List<ServicePublishVO>> save(@RequestBody ServicePublishDTO servicePublishDTO) {
-        log.info("模型发布请求:{}", servicePublishDTO);
-        publishService.save(servicePublishDTO);
-        //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(",");
-            // 循环注册每个IP到Nacos
-            for (String ip : ipArray) {
-                String trimmedIp = ip.trim();
-                if (!trimmedIp.isEmpty()) {
-                    nacosServiceUtil.registerService(
-                            servicePublishDTO.getModelId().toString(),
-                            trimmedIp,
-                            8080,
-                            servicePublishDTO.getApiUrl()
-                    );
-                    log.info("Nacos服务注册成功: {}", trimmedIp);
-                }
-            }
-        } catch (Exception e) {
-            log.error("Nacos服务注册失败", e);
-            return OptResult.error("Nacos服务注册失败"); // 根据业务需求返回错误
-        }
-
-
-        return OptResult.success();
-    }
-
-
-
-
-
-
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ServiceAPIController.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/ServiceAPIController.java
@ -1,181 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.controller;
-
-
-import com.bipt.intelligentapplicationorchestrationservice.pojo.OptResult;
-import com.bipt.intelligentapplicationorchestrationservice.service.ServiceAPIService;
-import com.bipt.intelligentapplicationorchestrationservice.util.NacosServiceUtil;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.models.security.SecurityScheme;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-@Tag(name ="服务API相关接口")
-@RestController
-@RequestMapping("/API")
-@Slf4j
-public class ServiceAPIController {
-
-    @Autowired
-    private ServiceAPIService serviceAPIService;
-
-    @Autowired
-    private NacosServiceUtil nacosServiceUtil;
-
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-    @PostMapping("/release")
-    @Operation(summary = "结束访问")
-    @Transactional
-    public OptResult releaseResource(@PathVariable Long modelId) {
-        String key = "modelId:" + modelId;
-        String modelConfig = (String) redisTemplate.opsForValue().get(key);
-        int userMemorySize = parseGpuMemorySize(modelConfig);
-        List<String> instanceIps;
-        try {
-            instanceIps = nacosServiceUtil.getServiceInstances(modelId.toString());
-        } catch (Exception e) {
-            log.error("获取Nacos实例失败", e);
-            return OptResult.error("获取实例失败");
-        }
-        int memorySize;
-        for (String ip : instanceIps) {
-            String ipKey = "ip:" + ip;
-            Integer nowMemorySizeOBJ = (Integer) redisTemplate.opsForValue().get(ipKey);
-            int nowMemorySize = nowMemorySizeOBJ;
-            memorySize = nowMemorySize + userMemorySize;
-            // 更新IP对应的资源值
-            redisTemplate.opsForValue().set(ipKey, memorySize);
-            // 设置缓存过期时间（3600秒）
-            redisTemplate.expire(ipKey, 3600, TimeUnit.SECONDS);
-        }
-    
-        // 处理等待队列（先来先服务）
-        String waitQueueKey = "waitQueue:" + modelId;
-        // 取出队列头部的任务（最早加入的）
-        Long waitModelId = (Long) redisTemplate.opsForList().leftPop(waitQueueKey);
-        if (waitModelId != null) {
-            log.info("检测到等待队列任务，尝试调度模型ID: {}", waitModelId);
-            return schedule(waitModelId); // 重新调度最早的任务
-        } else {
-            log.info("等待队列为空，无任务需要处理");
-        }
-
-        return OptResult.success("资源释放成功");
-    }
-
-    @PostMapping("/request/{modelId}")
-    @Operation(summary = "请求调度")
-    @Transactional
-    public OptResult schedule(@PathVariable Long modelId) {
-        // 1. 存储modelConfig到缓存
-        String modelConfig = serviceAPIService.getByModelId(modelId);
-        int requestMemorySize = parseGpuMemorySize(modelConfig);
-        if (requestMemorySize == -1){
-            return OptResult.error("解析配置失败，请检查模型:" + modelId +"是否存在");
-        }
-        String modelConfigKey = "modelConfig:" + modelId;
-        redisTemplate.opsForValue().set(modelConfigKey, modelConfig);
-        // 2. 获取Nacos实例IP列表
-        List<String> instanceIps;
-        try {
-            instanceIps = nacosServiceUtil.getServiceInstances(modelId.toString());
-        } catch (Exception e) {
-            log.error("获取Nacos实例失败", e);
-            return OptResult.error("获取实例失败");
-        }
-        Set<String> gpuKeys = redisTemplate.keys("gpu:*");
-        //根据IP列表查找资源
-        for (String instanceIp : instanceIps) {
-            for (String gpuKey : gpuKeys) {
-                String GPUConfig = (String) redisTemplate.opsForValue().get(gpuKey);
-                if (GPUConfig != null) {
-                    // 分割键值对
-                    String[] pairs = GPUConfig.split(",");
-                    String ip = null;
-                    int memorySize = 0;
-                    for (String pair : pairs) {
-                        String[] keyValue = pair.split(":", 2);
-                        if (keyValue.length == 2) {
-                            String key = keyValue[0].trim();
-                            String value = keyValue[1].trim();
-                            if ("IP".equalsIgnoreCase(key)) {
-                                ip = value;
-                            } else if ("GPUMemorySize".equalsIgnoreCase(key)) {
-                                memorySize = Integer.parseInt(value);
-                            }
-                        }
-                    }
-                    // 检查解析出的 IP 是否在 Nacos 实例列表中
-                    if (instanceIp.equals(ip)) {
-                        log.info("找到 IP {} 对应的 GPU 内存: {} ", ip, memorySize);
-                        if (memorySize>=requestMemorySize){
-                            int newMemorySize = memorySize - requestMemorySize;
-                            String ipKey = "ip:" + ip;
-                            redisTemplate.opsForValue().set(ipKey,newMemorySize);
-                            //访问请求最大时间为3600s
-                            redisTemplate.expire(ipKey, 3600, TimeUnit.SECONDS);
-                        }
-                        return OptResult.success("资源分配成功，使用ip:" + ip);
-                    }else {
-                        log.info("资源不足");
-                    }
-                }
-            }
-        }
-        // 所有实例检查完毕未找到足够资源
-        String waitQueueKey = "waitQueue:" + modelId;
-        // 改为右插入，保证队列顺序为FIFO（最早的任务在列表头部）
-        redisTemplate.opsForList().rightPush(waitQueueKey, modelId); 
-        log.info("未找到足够资源，任务 {} 加入等待队列", modelId);
-        return OptResult.error("资源不足，等待中");
-    }
-    /**
-     * 从模型配置字符串中解析GPU内存需求
-     * @param modelConfig 模型配置字符串，格式如 "GPUMemorySize:8000,version:1"
-     * @return 解析到的GPU内存大小（MB），若解析失败返回-1
-     */
-    private int parseGpuMemorySize(String modelConfig) {
-        if (modelConfig == null || modelConfig.isEmpty()) {
-            log.error("模型配置为空，无法解析GPU内存需求");
-            return -1;
-        }
-        int requestMemorySize = 0;
-        String[] config = modelConfig.split(",");
-        for (String pair : config) {
-            // 按冒号分割键值对
-            String[] keyValue = pair.split(":", 2);
-            if (keyValue.length == 2) {
-                String key = keyValue[0].trim();
-                String value = keyValue[1].trim();
-                // 匹配 GPUMemorySize 字段（忽略大小写）
-                if ("GPUMemorySize".equalsIgnoreCase(key)) {
-                    try {
-                        requestMemorySize = Integer.parseInt(value);
-                        log.info("模型GPU内存: {} MB", requestMemorySize);
-                        break; // 找到后即可退出循环
-                    } catch (NumberFormatException e) {
-                        log.error("解析GPUMemorySize失败，值: {}", value, e);
-                        return -1;
-                    }
-                }
-            }
-        }
-        if (requestMemorySize <= 0) {
-            log.error("模型需求GPU内存未配置或无效");
-            return -1;
-        }
-        return requestMemorySize;
-    }
-    
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/publishController.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/controller/publishController.java
@ -0,0 +1,41 @@
+package com.bipt.intelligentapplicationorchestrationservice.controller;
+
+import com.bipt.intelligentapplicationorchestrationservice.pojo.OptResult;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;
+import com.bipt.intelligentapplicationorchestrationservice.service.PublishService;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Tag(name ="服务发布相关接口")
+@RestController
+@RequestMapping("/publish")
+@Slf4j
+public class publishController {
+    @Autowired
+    private PublishService publishService;
+
+    /**
+     * 新增请求发布
+     * @param servicePublishDTO
+     * @return
+     */
+    @PostMapping
+    @Operation(summary ="新增发布请求")
+    public OptResult<ServicePublishVO> save(@RequestBody ServicePublishDTO servicePublishDTO){
+        log.info("模型发布请求:{}", servicePublishDTO);
+        publishService.save(servicePublishDTO);
+        ServicePublishVO servicePublishVO = publishService.getByModelId(servicePublishDTO);
+        return OptResult.success(servicePublishVO);
+    }
+
+
+
+
+}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/deployment/ResourceAllocator.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/deployment/ResourceAllocator.java
@ -1,73 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.deployment;
-
-import com.bipt.intelligentapplicationorchestrationservice.deploy.entity.DeploymentResource;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import com.bipt.intelligentapplicationorchestrationservice.utils.ConfigConstants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.ResourceAccessException;
-
-import java.util.Comparator;
-import java.util.List;
-
-@Component
-public class ResourceAllocator {
-
-    @Autowired
-    private ConfigConstants config;
-
-    //获取剩余内存
-    private int getRemainingMemory(GpuResource resource){
-        return resource.getGPUMaxMemory()-resource.getGPUMemorySize();
-    }
-
-    public DeploymentResource allocate(
-            List<GpuResource> resources,
-            int requiredMemory,
-            String modelId,
-            boolean isGray
-    ){
-        resources.sort(Comparator.comparingInt(GpuResource::getGPUMemorySize));
-
-        //第一轮分配
-        for(GpuResource resource:resources){
-            if(getRemainingMemory(resource) >= requiredMemory) {
-                return createResource(resource, modelId, isGray);
-            }
-        }
-
-        //第二轮分配
-        return defragmentation(resources,requiredMemory, modelId, isGray);
-    }
-
-
-    private DeploymentResource defragmentation(
-            List<GpuResource> resources,
-            int requiredMemory,
-            String modelId,
-            boolean isGray
-    ){
-        //按内存碎片大小排序（最小碎片优先）
-        resources.sort(Comparator.comparingDouble(
-                r -> (double)getRemainingMemory(r) / r.getGPUMaxMemory()));
-
-        for(GpuResource resource:resources){
-            if(getRemainingMemory(resource) >= requiredMemory){
-                return createResource(resource, modelId, isGray);
-            }
-        }
-        throw new ResourceAccessException("GPU资源不足");
-    }
-
-    private DeploymentResource createResource(GpuResource gpu, String modelId, boolean isGray){
-        String urlType = isGray ? "gray":"prod";
-        String url = String.format(
-                config.URL_TEMPLATE,
-                gpu.getIp(),
-                config.MODEL_PORT,
-                modelId,
-                urlType
-        );
-        return new DeploymentResource(gpu, url);
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeployRequest.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeployRequest.java
@ -1,4 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.entity;
-
-public class DeployRequest {
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeployResponse.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeployResponse.java
@ -1,25 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.entity;
-
-public class DeployResponse<T> {
-    private boolean isSuccess;
-    private String errorInfo;
-    private int status;
-    private T data;
-
-    public DeployResponse(boolean b, String s, int i, T data) {
-        isSuccess = b;
-        errorInfo = s;
-        status = i;
-        this.data = data;
-    }
-
-    // 成功响应
-    public static <T> DeployResponse<T> success(T data) {
-        return new DeployResponse<>(true, "", 200, data);
-    }
-
-    // 失败响应
-    public static <T> DeployResponse<T> fail(int status, String error) {
-        return new DeployResponse<>(false, error, status, null);
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/deploy/entity/DeploymentResource.java
@ -1,12 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.deploy.entity;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-@Getter
-@AllArgsConstructor
-public class DeploymentResource {
-    private final GpuResource gpu;
-    private final String url;
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuCreateDTO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuCreateDTO.java
@ -1,27 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.dto;
-
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.*;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Setter
-@Getter
-public class GpuCreateDTO {
-    @NotBlank(message = "GPU型号不能为空")
-    @Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
-            message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU")
-    private String GPUModel;
-
-    @NotNull(message = "显存容量不能为空")
-    private Integer GPUMemorySize;
-
-    @NotBlank(message = "IP地址不能为空")
-    @Pattern(regexp = "^\\\\d{1,3}\\\\.\\\\d{1,3}\\\\.\\\\d{1,3}\\\\.\\\\d{1,3}$",
-            message = "IP地址格式无效")
-    private String Ip;
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuResponseDTO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuResponseDTO.java
@ -1,57 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.dto;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class GpuResponseDTO {
-    private Long id;
-    private String GPUModel;
-    private Integer GPUMemorySize;
-    private String Ip;
-    private LocalDateTime createTime;
-    // Builder类
-    public static class Builder {
-        private Long id;
-        private String model;
-        private Integer memory;
-        private String ip;
-        private LocalDateTime createdTime;
-
-        public Builder id(Long id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder model(String model) {
-            this.model = model;
-            return this;
-        }
-
-        public Builder memory(Integer memory) {
-            this.memory = memory;
-            return this;
-        }
-
-        public Builder ip(String ip) {
-            this.ip = ip;
-            return this;
-        }
-
-        public Builder createdTime(LocalDateTime createdTime) {
-            this.createdTime = createdTime;
-            return this;
-        }
-        public GpuResponseDTO build() {
-            // 必填字段校验（如网页2的推荐）
-            if (id == null) {
-                throw new IllegalArgumentException("GPU ID必须填写");
-            }
-            return new GpuResponseDTO();
-        }
-    }
-    public String getCreateTimeStr(){
-        return "GPU创建时间：" + createTime.toString();
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuUpdateDTO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/dto/GpuUpdateDTO.java
@ -1,44 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.dto;
-
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import lombok.*;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-//@Setter
-//@Getter
-public class GpuUpdateDTO {
-    public @NotNull(message = "GPU ID cannot be null") Long getGPUId() {
-        return GPUId;
-    }
-
-    public void setGPUId(@NotNull(message = "GPU ID cannot be null") Long GPUId) {
-        this.GPUId = GPUId;
-    }
-
-    public void setGPUModel(@Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
-            message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU") String GPUModel) {
-        this.GPUModel = GPUModel;
-    }
-
-    public void setIp(@Pattern(regexp = "^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$",
-            message = "IP地址格式无效") String ip) {
-        Ip = ip;
-    }
-
-    @NotNull(message = "GPU ID cannot be null")
-    private Long GPUId;
-
-    @Pattern(regexp = "^([A-Z][A-Z0-9-]+)-\\w+",
-            message = "型号格式应为 [厂商（大写字母开头）]-[型号]，如 Intel-Xe_GPU")
-    private String GPUModel;
-
-    @Setter
-    private Integer GPUMemorySize;
-
-    @Pattern(regexp = "^\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}$",
-            message = "IP地址格式无效")
-    private String Ip;
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/entity/GpuResource.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/entity/GpuResource.java
@ -1,96 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.time.LocalDateTime;
-
-@Setter
-@Data
-public class GpuResource {
-    @Getter
-    @TableField("GPUId")
-    private Long GPUId;
-
-    @Getter
-    @TableField("GPUModel")
-    private String GPUModel;
-
-    @Getter
-    @TableField("GPUMemorySize")
-    private Integer GPUMemorySize;
-
-    @TableField("is_deleted")
-    private Integer isDeleted = 0;
-
-    @TableField("Ip")
-    private String Ip;
-
-    @Getter
-    @TableField("CreatedTime")
-    private LocalDateTime CreateTime;
-
-    @Getter
-    @TableField("update_time")
-    private LocalDateTime UpdateTime;
-
-    @Getter
-    @TableField("GPUMaxMemory")
-    private Integer GPUMaxMemory;
-
-    public GpuResource(long l, String s, boolean b) {
-        this.GPUId = l;
-        this.GPUModel = s;
-        this.isDeleted = b ? 1 : 0;
-    }
-//    public @Pattern(regexp = "^((25[0-5]|2[0-4]\\d|[01]?\\d\\d?)\\.){3}(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)$") String getIp() {
-//        return Ip;
-//    }
-
-    public Boolean getIsDeleted() {
-        return isDeleted != 0;
-    }
-
-
-
-    public GpuResource(Long Id, String Model, Integer MemorySize, String ip, LocalDateTime create_time) {
-        this.GPUId = Id;
-        this.GPUModel = Model;
-        this.GPUMemorySize = MemorySize;
-        this.Ip = ip;
-        this.CreateTime = create_time;
-    }
-
-    public GpuResource() {}
-
-//    public void setGPUId(Long GPUId) {
-//        this.GPUId = GPUId;
-//    }
-//
-//    public void setGPUModel(String GPUModel) {
-//        this.GPUModel = GPUModel;
-//    }
-//
-//    public void setGPUMemorySize(Integer GPUMemorySize) {
-//        this.GPUMemorySize = GPUMemorySize;
-//    }
-//
-//    public void setIsDeleted(Integer isDeleted) {
-//        this.isDeleted = isDeleted;
-//    }
-//
-//    public void setIp(String ip) {
-//        Ip = ip;
-//    }
-//
-//    public void setCreateTime(LocalDateTime createTime) {
-//        CreateTime = createTime;
-//    }
-//
-//    public void setUpdateTime(LocalDateTime updateTime) {
-//        UpdateTime = updateTime;
-//    }
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/enums/ErrorCodeEnum.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/enums/ErrorCodeEnum.java
@ -1,45 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.enums;
-
-import lombok.Getter;
-
-@Getter
-public enum ErrorCodeEnum {
-    SUCCESS(200, "操作成功"),
-    SYSTEM_ERROR(500, "系统错误"),
-
-    PARAM_INVALID(400, "参数无效"),
-    PARAM_MISSING(401, "缺少参数"),
-    IP_FORMAT_ERROR(402, "IP地址格式错误"),
-    GPU_MODEL_ERROR(403, "GPU型号格式应为[厂商]-[型号]"),
-
-    PERMISSION_DENIED(501, "无操作权限"),
-
-    GPU_NOT_FOUND(601, "GPU资源不存在"),
-
-    DB_CONNECTION_FAILED(701, "数据库连接错误"),
-    VALIDATION_ERROR(801,"参数校验异常" ),
-
-    CACHE_INIT_ERROR(901, "缓存初始化失败");
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    private final int code;
-    private final String message;
-    ErrorCodeEnum(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public String toString() {
-        return "ErrorCodeEnum{" +
-                "code=" + code +
-                ", message='" + message + '\''+
-                '}';
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/vo/ResponseVO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/entity/vo/ResponseVO.java
@ -1,38 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.entity.vo;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
-
-
-import java.io.Serializable;
-
-public class ResponseVO<T> implements Serializable {
-    private Integer code;   //状态码
-    private String message; //描述信息
-    private T data;         //业务数据
-
-
-    //私有构造方法
-    private ResponseVO(Integer code, String message, T data) {
-        this.code = code;
-        this.message = message;
-        this.data = data;
-    }
-
-    //静态工厂方法
-    //成功响应（无数据）
-    public static <T> ResponseVO<T> success() {
-        return new ResponseVO<>(200, "OK", null);
-    }
-    //成功响应（有数据）
-    public static <T> ResponseVO<T> success(T data) {
-        return new ResponseVO<>(200, "OK", data);
-    }
-    //失败响应(自定义错误码和消息)
-    public static <T> ResponseVO<T> error(Integer code, String message) {
-        return new ResponseVO<>(code, message, null);
-    }
-    //失败响应（基于预定义错误枚举）
-    public static <T> ResponseVO<T> error(ErrorCodeEnum errorCode) {
-       return new ResponseVO<>(errorCode.getCode(), errorCode.getMessage(), null);
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/ModelLifecycle.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/enumeration/ModelLifecycle.java
@ -1,51 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.enumeration;
-
-import com.bipt.intelligentapplicationorchestrationservice.constant.MessageConstant;
-
-/**
- * 模型生命周期状态枚举
- */
-public enum ModelLifecycle {
-    DESIGNING("设计中"),
-    TRAINING("训练中"),
-    EVALUATING("评估中"),
-    DEPLOYED("已部署"),
-    OFFLINE("已下线"),
-    ABANDONED("已废弃");
-
-    private final String description;
-
-    private ModelLifecycle(String description) {
-        this.description = description;
-    }
-
-
-    public String getDescription() {
-        return description;
-    }
-
-    // 将枚举名称转换成数据库存储的字符串
-    public String getDbValue() {
-        return name();
-    }
-
-    // 将数据库存储的字符串转换为枚举实例
-    public static ModelLifecycle getDbValueFromDb(String dbValue) {
-        if(dbValue == null) return null;
-        try  {
-            return ModelLifecycle.valueOf(dbValue);
-        } catch (IllegalArgumentException e) {
-            throw new IllegalArgumentException(MessageConstant.LifeCycle_No_Exist + ":" + dbValue);
-        }
-    }
-
-    // 从前端传的中文描述 -> 转换为枚举
-    public static ModelLifecycle fromDescription(String description) {
-        for (ModelLifecycle lifecycle : ModelLifecycle.values()) {
-            if (lifecycle.getDescription().equals(description)) {
-                return lifecycle;
-            }
-        }
-        throw new IllegalArgumentException("生命周期描述非法: " + description);
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/CacheInitException.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/CacheInitException.java
@ -1,10 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.exception;
-
-public class CacheInitException extends RuntimeException{
-    public CacheInitException(String message) {
-        super(message);
-    }
-    public CacheInitException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/GpuGlobalException.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/GpuGlobalException.java
@ -1,34 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.exception;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
-import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.web.bind.MethodArgumentNotValidException;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RestControllerAdvice;
-
-@RestControllerAdvice
-public class GpuGlobalException {
-    @ExceptionHandler(DataAccessResourceFailureException.class)
-    public ResponseVO handleDBConnectionError() {
-        return ResponseVO.error(ErrorCodeEnum.DB_CONNECTION_FAILED);
-    }
-
-    @ExceptionHandler(MethodArgumentNotValidException.class)
-    public ResponseVO handleValidationError(MethodArgumentNotValidException e) {
-        return ResponseVO.error(ErrorCodeEnum.VALIDATION_ERROR);
-    }
-
-    @ExceptionHandler(PermissionDeniedException.class)
-    public ResponseVO handlePermissionDenied(PermissionDeniedException ex) {
-        return ResponseVO.error(ex.getCode(), ex.getMessage());
-    }
-
-    @ExceptionHandler(CacheInitException.class)
-    public ResponseVO<?> handleCacheInitException(CacheInitException ex) {
-        return ResponseVO.error(
-                ErrorCodeEnum.CACHE_INIT_ERROR.getCode(),
-                "缓存初始化失败: " + ex.getMessage()
-        );
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/PermissionDeniedException.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/exception/PermissionDeniedException.java
@ -1,32 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.exception;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
-import lombok.Getter;
-
-@Getter
-public class PermissionDeniedException extends RuntimeException {
-    private final Integer code;
-
-    public String getMessage() {
-        return message;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    private final String message;
-
-    public PermissionDeniedException(ErrorCodeEnum errorCode) {
-        super(errorCode.getMessage());
-        this.code = errorCode.getCode();
-        this.message = errorCode.getMessage();
-    }
-
-    public PermissionDeniedException(ErrorCodeEnum errorCode, String appendMessage) {
-        super(errorCode.getMessage()+": "+appendMessage);
-        this.code = errorCode.getCode();
-        this.message = errorCode.getMessage()+": "+appendMessage;
-    }
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/filter/ApiRequestGlobalFilter.java.bak
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/filter/ApiRequestGlobalFilter.java.bak
@ -1,32 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.filter;
-
-import org.springframework.cloud.gateway.filter.GatewayFilterChain;
-import org.springframework.cloud.gateway.filter.GlobalFilter;
-import org.springframework.core.Ordered;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.stereotype.Component;
-import org.springframework.web.server.ServerWebExchange;
-import reactor.core.publisher.Mono;
-
-@Component
-public class ApiRequestGlobalFilter implements GlobalFilter, Ordered {
-
-    @Override
-    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
-        ServerHttpRequest request = exchange.getRequest();
-        // 检查请求路径和方法
-        if (request.getURI().getPath().equals("/request/{id}") &&
-                request.getMethod() == HttpMethod.POST) {
-            // 在此处添加拦截逻辑
-            System.out.println("拦截到POST /request请求");
-        }
-        // 继续处理请求
-        return chain.filter(exchange);
-    }
-
-    @Override
-    public int getOrder() {
-        return 1; // 过滤器执行顺序，数值越小越先执行
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/AlgorithmInfoMapper.java
+++ b/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);
-}
+} 
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuMapper.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuMapper.java
@ -1,16 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.mapper;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import org.mapstruct.Mapper;
-import org.mapstruct.MappingConstants;
-
-@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
-public interface GpuMapper {
-    GpuResource toEntity(GpuCreateDTO dto);
-    GpuResource toEntity(GpuUpdateDTO dto);
-    GpuResource toEntity(GpuResponseDTO dto);
-    GpuResponseDTO toDTO(GpuResource entity);
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuResourceDao.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuResourceDao.java
@ -1,93 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.mapper;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.jdbc.SQL;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface GpuResourceDao {
-    //---------------------- 基础CRUD ------------------------
-    @Insert("INSERT INTO Ipz.public.gpu_resource (GPUModel, GPUMemorySize, Ip) " +
-            "VALUES (#{model}, #{memory}, #{ip})")
-    @Options(useGeneratedKeys = true, keyProperty = "GPUId")
-    Integer insert(GpuResource entity);
-
-    //物理删除
-    @Delete("DELETE FROM Ipz.public.gpu_resource WHERE GPUId = #{gpuId}")
-    Integer deleteById(@Param("gpuId") Long gpuId);
-
-    // 逻辑删除
-    @Update("UPDATE Ipz.public.gpu_resource" +
-            " SET is_deleted = 1, update_time = NOW() " +
-            " WHERE GPUId = #{gpuId}")
-    Integer isDeleted(@Param("gpuId") Long gpuId);
-
-    @Update("UPDATE Ipz.public.gpu_resource " +
-            "SET GPUModel = #{model}, GPUMemorySize = #{memory}, Ip = #{ip} " +
-            "WHERE GPUId = #{GPUId}")
-    Integer updateById(GpuResource entity);
-
-    @Select("SELECT * FROM Ipz.public.gpu_resource WHERE GPUId = #{gpuId} AND is_deleted = 0")
-    GpuResource selectById(@Param("gpuId") Long gpuId);
-
-    //---------------------- 缓存相关扩展 ------------------------
-
-    /**
-     * 分页全量查询（缓存初始化用）
-     * @param offset 起始位置
-     * @param limit 每页数量
-     */
-//    @Select("SELECT * FROM ipz.gpu_resource " +
-//            "ORDER BY GPUId ASC LIMIT #{limit} OFFSET #{offset}")
-    List<GpuResource> findByPage(@Param("offset") int offset,
-                                 @Param("limit") int limit);
-
-    /**
-     * 增量数据查询（缓存同步用）
-     * @param since 起始时间
-     */
-//    @Select("SELECT *, is_deleted FROM ipz.gpu_resource " +
-//            "WHERE update_time > #{since} " +
-//            "ORDER BY update_time ASC")
-    List<GpuResource> findModifiedSince(@Param("since") LocalDateTime since);
-
-    /**
-     * 带锁查询（防缓存击穿）
-     */
-//    @Select("SELECT * FROM ipz.gpu_resource " +
-//            "WHERE GPUId = #{gpuId} FOR UPDATE NOWAIT")
-    GpuResource selectByIdWithLock(@Param("gpuId") Long gpuId);
-
-    /**
-     * 动态条件查询（管理界面筛选用）
-     */
-    // @SelectProvider(type = GpuSqlBuilder.class, method = "buildDynamicQuery")
-    List<GpuResource> selectByFields(@Param("params") Map<String, Object> params);
-}
-
-// 动态SQL构造器
-class GpuSqlBuilder {
-    public static String buildDynamicQuery(Map<String, Object> params) {
-        return new SQL() {{
-            SELECT("*");
-            FROM("Ipz.public.gpu_resource");
-            if (params.containsKey("model")) {
-                WHERE("GPUModel LIKE #{params.model}");
-            }
-            if (params.containsKey("memoryMin")) {
-                WHERE("GPUMemorySize >= #{params.memoryMin}");
-            }
-            if (params.containsKey("ip")) {
-                WHERE("Ip = #{params.ip}");
-            }
-            if (params.containsKey("isDeleted")) {
-                WHERE("is_deleted = #{params.isDeleted}");
-            }
-        }}.toString();
-    }
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ModelMapper.java
@ -1,79 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.mapper;
-
-import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
-import org.apache.ibatis.annotations.*;
-
-import java.util.List;
-
-public interface ModelMapper {
-
-    /**
-     * 插入模型基本信息
-     * @param modelInfo
-     */
-    @Options(useGeneratedKeys = true, keyProperty = "id")   //能够拿到主键值，并设置给modelInfo对象
-    @Insert("insert into model_info(model_name) values(#{modelName})")
-    void insertModelInfo(ModelInfo modelInfo);
-
-    /**
-     * 插入模型版本信息
-     * @param modelVersion
-     */
-    void insertModelVersion(ModelVersion modelVersion);
-
-    /*
-     * 查询模型列表
-     */
-    List<ModelVO> list();
-
-    /**
-     * 根据id查询模型详情
-     * @param id  版本表id
-     * @return
-     */
-    ModelVersion selectById(Long id);
-
-    /**
-     * 更新模型信息
-     * @param dto
-     */
-    void update(ModelVersionDTO dto);
-
-    /**
-     * 删除模型版本
-     * @param id  版本表id
-     */
-    @Delete("delete from model_version where id=#{id}")
-    void deleteModelVersion(Long id);
-
-    /**
-     * 删除模型
-     * @param id  模型id
-     */
-    @Delete("delete from model_info where id= #{id}")
-    void deleteModel(Long id);
-
-    /**
-     * 查询模型生命周期
-     * @param id  模型版本表id
-     *            返回模型生命周期
-     */
-    @Select("select life_cycle from model_version where id=#{id}")
-    String selectLifeCycleById(Long id);
-
-    /**
-     * 更新模型生命周期
-     * @param id  模型版本表id
-     * @param dbValue  数据库中存储的生命周期
-     * @return
-     */
-    @Update("update model_version set life_cycle=#{dbValue} where id=#{id}")
-    int updateLifeCycleById(Long id, String dbValue);
-
-    /**
-     * 查询数据集列表
-     * @return
-     */
-    @Select("select dataset_id,dataset_name from dataset")
-    List<DatasetEntity> listDataset();
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/PublishMapper.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/PublishMapper.java
@ -14,6 +14,8 @@ public interface PublishMapper {
    void insert(ServicePublishDTO servicePublishDTO);

    Long getByApiUrl(String apiUrl);
+    @Select("select * from model_version where model_id=#{modelId} and status = 1")
+    ModelVersion getById(Long modelId);

-
+    ServicePublishVO getByModelId(Long modelId);
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ServiceAPIMapper.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/ServiceAPIMapper.java
@ -1,11 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.mapper;
-
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-@Mapper
-public interface ServiceAPIMapper {
-    @Select("select model_config from model_version where model_id=#{modelId} and status = 1")
-    String getById(Long modelId);
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/AlgorithmInfo.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/AlgorithmInfo.java
@ -1,16 +1,7 @@
 package com.bipt.intelligentapplicationorchestrationservice.pojo;

-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.LocalDateTime;

-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 public class AlgorithmInfo {
    private Long id;
    private String algorithmName;
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/DatasetDTO.java
+++ b/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;
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/DatasetPageQueryDTO.java
+++ b/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;

 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/DatasetVO.java
+++ b/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;
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/MachineInfo.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/MachineInfo.java
@ -1,39 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.pojo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Map;
-
-/**
- * 机器信息实体类
- * @author hky
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MachineInfo implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String id;             // 机器唯一标识
-    private String ip;             // IP 地址
-    private String hostname;       // 主机名
-    private Integer cpuCoreNum;    // CPU 核心数
-    private Long memoryTotal;      // 总内存 (MB)
-    private Long memoryUsed;       // 已用内存 (MB)
-    private String GPUModel;       // GPU 型号
-    private Integer GPUMemorySize; // GPU 显存大小 (GB)
-    private Integer GPUCount;      // GPU 数量
-    private Integer status;        // 机器状态 (0: 离线, 1: 在线, 2: 繁忙)
-    private String os;             // 操作系统
-    private String region;         // 所属区域
-    private String zone;           // 可用区
-    private Date createTime;       // 创建时间
-    private Date updateTime;       // 更新时间
-    private Map<String, String> labels; // 自定义标签
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelDTO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelDTO.java
@ -1,31 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.pojo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ModelDTO {
-    private Long id;                // 模型id
-    private String modelName;           // 模型名称
-    private String version;         // 模型版本
-    private Integer datasetId;      // 数据集id
-    private String modelConfig;     // 模型配置信息
-    private String modelPath;       // 模型存储路径
-    private Integer status;         // 模型状态（1代表上线，0代表不上线）D
-    private Integer modelSize;   // 模型大小
-    private String dataPreHandleFile;      // 数据预处理文件存储路径
-    private String modelSuperArgs;           // 模型超参数
-    private String modelArgsSize;            // 模型参数量
-    private String modelSourceCodeUrl;      // 模型源代码路径
-    private String modelFile;              // 模型文件存储路径
-    private String modelDesignDocument;    // 模型设计文档存储路径
-    private String lifeCycle;     // 模型生命周期
-    private String operateUser;          //  操作人
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVO.java
@ -1,24 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.pojo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ModelVO {
-    private Long id;   // 模型id
-    private Long versionId;   // 用于保证react的map中key的唯一性
-    private String modelName;  // 模型名称
-    private String version;   // 模型版本
-    private String dataPreHandleFile;      // 数据预处理文件存储路径
-    private String operateUser;          //  操作人
-    private LocalDateTime updateTime;    // 修改时间
-    private Integer status;         // 模型状态（1代表上线，0代表不上线）
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersion.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersion.java
@ -24,23 +24,5 @@ public class ModelVersion implements Serializable {
    private String modelPath;       // 模型存储路径
    private Integer status;         // 模型状态（1代表上线，0代表不上线）
    private LocalDateTime createTime; // 创建时间
-    //补充更新时间字段
-    private LocalDateTime  updateTime;  // 更新时间
-    //创建模型部分补充的字段
-    private Integer modelSize;   // 模型大小
-    private String dataPreHandleFile;      // 数据预处理文件存储路径
-    //模型信息管理部分补充的字段
-    private String modelSuperArgs;           // 模型超参数
-    private String modelArgsSize;            // 模型参数量
-    private String modelSourceCodeUrl;      // 模型源代码路径
-    private String modelFile;              // 模型文件存储路径
-    private String modelDesignDocument;    // 模型设计文档存储路径
-
-    private String lifeCycle;     // 模型生命周期
-
-    private String operateUser;          //  操作人
-
-    private String modelName;     //模型名称
-

 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersionDTO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ModelVersionDTO.java
@ -1,31 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.pojo;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDateTime;
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ModelVersionDTO {
-    private Long id;                // 模型版本id
-    private String version;         // 模型版本
-    private Integer datasetId;      // 数据集id
-    private String modelConfig;     // 模型配置信息
-    private String modelPath;       // 模型存储路径
-    private Integer status;         // 模型状态（1代表上线，0代表不上线）
-    private LocalDateTime createTime; // 创建时间
-    private LocalDateTime  updateTime;  // 更新时间
-    private Integer modelSize;   // 模型大小
-    private String dataPreHandleFile;      // 数据预处理文件存储路径
-    private String modelSuperArgs;           // 模型超参数
-    private String modelArgsSize;            // 模型参数量
-    private String modelSourceCodeUrl;      // 模型源代码路径
-    private String modelFile;              // 模型文件存储路径
-    private String modelDesignDocument;    // 模型设计文档存储路径
-    private String lifeCycle;     // 模型生命周期
-    private String operateUser;          //  操作人
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublish.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublish.java
@ -16,8 +16,8 @@ import java.time.LocalDateTime;
@NoArgsConstructor
@AllArgsConstructor
 public class ServicePublish implements Serializable {
+    private Long id;
    private Long modelId;
-    private String GPUModel;
-    private String ip;
-    private String GPUMemorySize;
+    private String apiUrl;
+    private LocalDateTime createTime;
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishDTO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishDTO.java
@ -1,6 +1,5 @@
 package com.bipt.intelligentapplicationorchestrationservice.pojo;

-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@ -19,7 +18,5 @@ public class ServicePublishDTO implements Serializable {
    private Long id;
    private Long modelId;
    private String apiUrl;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime createTime;
-    private String ip;
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishVO.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/pojo/ServicePublishVO.java
@ -17,10 +17,13 @@ import java.time.LocalDateTime;
@AllArgsConstructor
 public class ServicePublishVO implements Serializable {
    private Long modelId;
-    private String GPUModel;
-    private String ip;
-    private String GPUMemorySize;
    private String apiUrl;
+    private String version;
+    private Integer datasetId;
+    private String modelConfig;
+    private String modelPath;
+    private Integer status;
+    private LocalDateTime createTime;


 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/properties/AliOssProperties.java
+++ b/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;
-}
-
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/AlgorithmInfoService.java
+++ b/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;

@ -12,12 +11,4 @@ public interface AlgorithmInfoService {
    boolean update(AlgorithmInfo algorithmInfo);
    boolean delete(Long id);
    boolean validateAlgorithmInfo(AlgorithmInfo algorithmInfo);
-
-    void save(AlgorithmInfo algorithmInfo, MultipartFile file);
-
-    String run(Long id, String param);
-
-    List<String> getAllNames();
-
-    List<AlgorithmInfo> getByNameLike(String keyword);
-}
+} 
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java
@ -1,169 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service;
-
-import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.exception.CacheInitException;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import jakarta.annotation.PostConstruct;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.RedisConnectionFailureException;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
-@Transactional  // 添加类级别事务管理
-@Component
-public class CacheManager {
-    @Autowired
-    private RedisTemplate<String, Object> redisTemplate;
-
-    @Autowired
-    private GpuResourceDao gpuResourceDao;
-
-    private final ReentrantLock lock = new ReentrantLock();
-
-    @Value("${cache.redis-key-prefix:gpu:}")
-    private String keyPrefix;
-
-    @Value("${cache.ttl-base:7200}")
-    private int ttlBase;
-
-    @Value("${cache.init-batch-size:500}")
-    private int initBatchSize;
-
-    private static final Logger log = org.slf4j.LoggerFactory.getLogger(CacheManager.class);
-    // 全量加载（带分页和分布式锁）
-    @Transactional(propagation = Propagation.REQUIRED)  // 方法级别覆盖
-    @PostConstruct
-    public void loadFullCache() {
-        if (tryLock()) {
-            try {
-                int page = 0;
-                while (true) {
-                    List<GpuResource> batch = gpuResourceDao.findByPage(page * initBatchSize, initBatchSize);
-                    if (batch.isEmpty()) break;
-
-                    batch.forEach(this::setCacheWithTTL);
-                    page++;
-                }
-            } finally {
-                unlock();
-            }
-        }
-    }
-
-    // 单条缓存刷新（带版本控制）
-    public void refreshCache(Long gpuId) {
-        GpuResource latest = gpuResourceDao.selectByIdWithLock(gpuId);
-        if (latest != null) {
-            setCacheWithTTL(latest);
-        }
-    }
-
-    // 批量增量同步
-    public void syncCache(LocalDateTime lastSyncTime) {
-        List<GpuResource> updates = gpuResourceDao.findModifiedSince(lastSyncTime);
-        updates.forEach(entity -> {
-            if (entity.getIsDeleted()) {
-                redisTemplate.delete(buildKey(entity.getGPUId().toString()));
-            } else {
-                setCacheWithTTL(entity);
-            }
-        });
-    }
-
-    // 带随机TTL的缓存设置
-    private void setCacheWithTTL(GpuResource entity) {
-        String key = buildKey(entity.getGPUId().toString());
-        GpuResource cached = (GpuResource) redisTemplate.opsForValue().get(key);
-
-        // 保留原有内存字段值
-        if (cached != null && cached.getGPUMemorySize() != null) {
-            entity.setGPUMemorySize(cached.getGPUMemorySize());
-        }
-        redisTemplate.opsForValue().set(
-                key,
-                entity,
-                ttlBase + (int)(Math.random() * 600), // 随机TTL防止雪崩
-                TimeUnit.SECONDS
-        );
-    }
-
-    // 构建缓存键
-    private String buildKey(String gpuId) {
-        return keyPrefix + gpuId;
-    }
-
-    // 分布式锁操作
-    private boolean tryLock() {
-        try {
-            return lock.tryLock(30, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return false;
-        }
-    }
-
-    private void unlock() {
-        lock.unlock();
-    }
-    // 分页加载入口
-    public void loadFullCache(int batchSize) {
-        int page = 0;
-        while (true) {
-            List<GpuResource> batch = gpuResourceDao.findByPage(page * batchSize, batchSize);
-            if (batch.isEmpty()) break;
-
-            batch.forEach(this::refreshWithRetry); // 带重试的刷新逻辑
-            page++;
-        }
-    }
-
-
-    // 带重试机制的缓存刷新
-    public void refreshWithRetry(GpuResource entity) {
-        try {
-            setCacheWithTTL(entity);
-        } catch (RedisConnectionFailureException ex) {
-            // 3次重试逻辑
-            for (int i = 0; i < 3; i++) {
-                try {
-                    log.info("重试第 {} 次", i + 1); // 添加日志
-                    Thread.sleep(1000);
-                    setCacheWithTTL(entity);
-                    return;
-                } catch (InterruptedException e) {
-                    if (i == 2) {
-                        throw new CacheInitException("缓存刷新失败: " + entity.getGPUId().toString());
-                    }
-
-                    log.error("重试失败", e);
-                    Thread.currentThread().interrupt();
-                }
-            }
-
-        }
-    }
-
-    // 获取当前缓存数量（调试用）
-    public long getCacheCount() {
-        return redisTemplate.keys(keyPrefix + "*").size();
-    }
-
-    public void evictCache(Long gpuId) {
-        String key = buildKey(gpuId.toString());
-        redisTemplate.delete(key);
-    }
-
-    public GpuResource getFromCache(String gpuId) {
-        return (GpuResource) redisTemplate.opsForValue().get("gpu:" + gpuId);
-    }
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/DatasetService.java
+++ b/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);
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuManageService.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/GpuManageService.java
@ -1,15 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service;
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
-
-import java.util.List;
-
-public interface GpuManageService {
-    public ResponseVO createGpuResource(GpuCreateDTO dto);
-    public ResponseVO deleteGpuResource(Long gpuId);
-    public void updateGpuResource(GpuUpdateDTO entity);
-    public List<GpuResponseDTO> searchByCriteria(String model, Integer memorySize, String ip);
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/AlgorithmInfoServiceImpl.java
+++ b/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);
@ -69,81 +60,4 @@ 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) {
-        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);
-    }
 } 
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/DatasetServiceImpl.java
+++ b/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;
-    }
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ModelServiceImpl.java
@ -1,169 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
-
-import com.bipt.intelligentapplicationorchestrationservice.constant.MessageConstant;
-import com.bipt.intelligentapplicationorchestrationservice.enumeration.ModelLifecycle;
-import com.bipt.intelligentapplicationorchestrationservice.mapper.ModelMapper;
-import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
-import com.bipt.intelligentapplicationorchestrationservice.service.ModelService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class ModelServiceImpl implements ModelService {
-    @Autowired
-    private ModelMapper modelMapper;
-    /**
-     * 创建模型
-     * @param dto
-     */
-    @Transactional  //事务注解
-    @Override
-    public void createModel(ModelDTO dto) {
-        log.info("创建模型");
-        //1.插入模型基本信息
-        ModelInfo modelInfo = new ModelInfo();
-        BeanUtils.copyProperties(dto, modelInfo, "id");
-        modelMapper.insertModelInfo(modelInfo);
-        log.info("模型id: {}",  modelInfo.getId());
-        //2.插入模型版本信息
-        ModelVersion modelVersion = new ModelVersion();
-        //使用工具类将dto属性复制给modelVersion
-        BeanUtils.copyProperties(dto, modelVersion, "id");
-        modelVersion.setModelId(modelInfo.getId());
-        modelVersion.setCreateTime(LocalDateTime.now());
-        modelVersion.setUpdateTime(LocalDateTime.now());
-        modelVersion.setOperateUser("zs");    //这里的写死的，后续需要修改，应该是当前登录用户的id
-        modelMapper.insertModelVersion(modelVersion);
-    }
-
-    /**
-     * 新增模型版本
-     * @param dto
-     */
-    @Override
-    public void createModelVersion(ModelDTO dto) {
-        log.info("新增模型版本");
-        ModelVersion modelVersion = new ModelVersion();
-        BeanUtils.copyProperties(dto, modelVersion, "id");
-        modelVersion.setModelId(dto.getId());
-        modelVersion.setCreateTime(LocalDateTime.now());
-        modelVersion.setUpdateTime(LocalDateTime.now());
-        modelVersion.setOperateUser("zs");
-        modelMapper.insertModelVersion(modelVersion);
-    }
-
-    /**
-     * 查询模型列表
-     */
-    @Override
-    public List<ModelVO> list() {
-        log.info("查询模型列表");
-        List<ModelVO> modelVOList = modelMapper.list();
-        return modelVOList;
-    }
-
-    @Override
-    public ModelVersion detail(Long id) {
-        log.info("查询模型详情");
-        ModelVersion modelVersion = modelMapper.selectById(id);
-        return modelVersion;
-    }
-
-    @Override
-    public void updateModel(ModelVersionDTO dto) {
-        // 更新模型还需要更新操作人和时间
-        log.info("更新模型");
-        modelMapper.update(dto);
-    }
-
-    @Override
-    public void deleteModelVersion(Long id) {
-        log.info("删除模型版本");
-        modelMapper.deleteModelVersion(id);
-    }
-
-    /**
-     * 更新模型生命周期
-     * @param id   版本表id
-     * @param
-     */
-    @Override
-    public void updateLifeCycle(Long id, String lifeCycleDescription) {
-        log.info("更新模型生命周期");
-
-        // 1. 查询当前生命周期并转为枚举
-        String currentLifeCycleStr = modelMapper.selectLifeCycleById(id);
-        if (currentLifeCycleStr == null) {
-            log.error("未找到对应模型信息，无法更新生命周期");
-            throw new IllegalArgumentException(MessageConstant.LifeCycle_No_Exist);
-        }
-
-        ModelLifecycle currentLifeCycle;
-        ModelLifecycle targetLifeCycle;
-        try {
-            currentLifeCycle = ModelLifecycle.valueOf(currentLifeCycleStr.trim());  // 数据库中是英文
-            targetLifeCycle = ModelLifecycle.valueOf(lifeCycleDescription.trim());        // 前端传英文代码，直接转换
-        } catch (IllegalArgumentException e) {
-            log.error(MessageConstant.LifeCycle_Undefined + ":{}", e.getMessage());
-            throw e;
-        }
-
-        // 2. 业务逻辑校验（保持不变）
-        switch (currentLifeCycle) {
-            case DEPLOYED:
-                if (targetLifeCycle == ModelLifecycle.DESIGNING) {
-                    log.error("已部署的模型不能直接调整成设计，需先下线再设计");
-                    throw new IllegalArgumentException(MessageConstant.ERROR_DEPLOYED_TO_DESIGNING);
-                }
-                break;
-            case ABANDONED:
-                log.error("已废弃的模型只能查看信息，不能更新生命周期");
-                throw new IllegalArgumentException(MessageConstant.ERROR_ABANDONED_CANNOT_UPDATE);
-            case TRAINING:
-                if (targetLifeCycle != ModelLifecycle.DESIGNING && targetLifeCycle != ModelLifecycle.EVALUATING) {
-                    log.error("训练中的模型只能调整成设计和评估");
-                    throw new IllegalArgumentException(MessageConstant.ERROR_TRAINING_INVALID_TRANSITION);
-                }
-                break;
-            default:
-                break;
-        }
-
-        // 3. 执行更新
-        int affectedRows = modelMapper.updateLifeCycleById(id, targetLifeCycle.getDbValue());
-        if (affectedRows == 0) {
-            log.error("更新模型生命周期失败");
-            throw new RuntimeException(MessageConstant.LIFECYCLE_UPDATE_FAILURE);
-        }
-
-        log.info("模型生命周期更新成功，新状态为: {}", targetLifeCycle);
-    }
-
-    @Override
-    public List<Map<String, String>> listLifeCycle() {
-        return Arrays.stream(ModelLifecycle.values())
-                .map(lifecycle -> Map.of(
-                        "code", lifecycle.name(),           // 枚举名称（如 "DESIGNING"）
-                        "description", lifecycle.getDescription() // 中文描述（如 "设计中"）
-                ))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public List<DatasetEntity> listDataset() {
-        List<DatasetEntity> datasetEntityList = modelMapper.listDataset();
-        return datasetEntityList;
-
-    }
-
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/PublishServiceImpl.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/PublishServiceImpl.java
@ -1,7 +1,9 @@
 package com.bipt.intelligentapplicationorchestrationservice.service.Impl;

 import com.bipt.intelligentapplicationorchestrationservice.mapper.PublishMapper;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion;
 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;
@ -29,12 +31,20 @@ public class PublishServiceImpl implements PublishService {
        if (id != null){
            throw new IllegalArgumentException("请求已存在: " + apiUrl);
        }
+        Long modelId = servicePublishDTO.getModelId();
+        ModelVersion modelVersion = publishMapper.getById(modelId);
+        String modelConfig = modelVersion.getModelConfig();
+        //todo 调用GPU分配

-        //todo调用服务部署

        publishMapper.insert(servicePublishDTO);
    }

+    @Override
+    public ServicePublishVO getByModelId(ServicePublishDTO servicePublishDTO) {
+        Long modelId = servicePublishDTO.getModelId();
+        return publishMapper.getByModelId(modelId);
+    }


 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ServiceAPIImpl.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/Impl/ServiceAPIImpl.java
@ -1,23 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
-
-import com.bipt.intelligentapplicationorchestrationservice.mapper.ServiceAPIMapper;
-import com.bipt.intelligentapplicationorchestrationservice.service.ServiceAPIService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class ServiceAPIImpl implements ServiceAPIService {
-    @Autowired
-    private ServiceAPIMapper serviceAPIMapper;
-        /**
-         * 根据id查找配置信息
-         * @param modelId
-         * @return
-         */
-        @Override
-        public String getByModelId(Long modelId) {
-            return serviceAPIMapper.getById(modelId);
-        };
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ModelService.java
@ -1,26 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service;
-
-import com.bipt.intelligentapplicationorchestrationservice.pojo.*;
-
-import java.util.List;
-import java.util.Map;
-
-public interface ModelService {
-    void createModel(ModelDTO dto);
-
-    void createModelVersion(ModelDTO dto);
-
-    List<ModelVO> list();
-
-    ModelVersion detail(Long id);
-
-    void updateModel(ModelVersionDTO dto);
-
-    void deleteModelVersion(Long id);
-
-    void updateLifeCycle(Long id, String lifeCycle);
-
-    List<Map<String, String>> listLifeCycle();
-
-    List<DatasetEntity> listDataset();
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/PublishService.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/PublishService.java
@ -1,12 +1,10 @@
 package com.bipt.intelligentapplicationorchestrationservice.service;

 import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishDTO;
+import com.bipt.intelligentapplicationorchestrationservice.pojo.ServicePublishVO;

 public interface PublishService {
-
    void save(ServicePublishDTO servicePublishDTO);

-
-
-
+    ServicePublishVO getByModelId(ServicePublishDTO servicePublishDTO);
 }
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/RedisCacheService.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/RedisCacheService.java
@ -1,127 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service;
-
-
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.stereotype.Service;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-@Service
-public class RedisCacheService {
-
-    private final RedisTemplate<String, Object> redisTemplate;
-
-    @Value("${cache.redis-key-prefix:gpu:}")
-    private String keyPrefix;
-
-    @Value("${cache.ttl-base:7200}")
-    private int baseTTL;
-    private final RedisSerializer<Object> valueSerializer;
-
-//    @Autowired
-//    public RedisCacheService(RedisTemplate<String, Object> redisTemplate) {
-//        this.redisTemplate = redisTemplate;
-//    }
-
-    // 核心方法 ------------------------------------------------------------
-    @Autowired
-    public RedisCacheService(RedisTemplate<String, Object> redisTemplate) {
-        this.redisTemplate = redisTemplate;
-        this.valueSerializer = (RedisSerializer<Object>) redisTemplate.getValueSerializer();
-    }
-
-    /**
-     * 批量写入GPU资源数据（带管道优化）
-     * @param resources GPU资源列表
-     */
-    public void batchPut(List<GpuResource> resources) {
-        redisTemplate.executePipelined((RedisCallback<Object>) connection -> {
-            resources.forEach(resource -> {
-                String key = buildKey(resource.getGPUId().toString());
-                byte[] keyBytes = key.getBytes(StandardCharsets.UTF_8);
-                byte[] valueBytes = valueSerializer.serialize(resource);
-                connection.stringCommands().setEx(
-                        keyBytes,
-                        calculateTTL(),
-                        valueBytes
-                );
-            });
-            return null;
-        });
-    }
-
-    /**
-     * 设置单条缓存（含随机TTL防雪崩）
-     * @param gpuId 资源ID
-     * @param resource 资源对象
-     */
-    public void put(String gpuId, GpuResource resource) {
-        String key = buildKey(gpuId);
-        redisTemplate.opsForValue().set(
-                key,
-                resource,
-                calculateTTL(),
-                TimeUnit.SECONDS
-        );
-    }
-
-    /**
-     * 获取单个缓存项
-     * @param gpuId 资源ID
-     * @return 缓存对象或null
-     */
-    public GpuResource get(String gpuId) {
-        return (GpuResource) redisTemplate.opsForValue().get(buildKey(gpuId));
-    }
-
-    /**
-     * 删除指定缓存
-     * @param gpuId 资源ID
-     */
-    public void delete(Long gpuId) {
-        redisTemplate.delete(buildKey(gpuId.toString()));
-    }
-
-    // 辅助方法 ------------------------------------------------------------
-
-    private String buildKey(String gpuId) {
-        return keyPrefix + gpuId;
-    }
-
-    private long calculateTTL() {
-        return baseTTL + (long)(Math.random() * 600); // 7200-7800秒随机值
-    }
-
-    /**
-     * 批量删除缓存（事务处理）
-     * @param gpuIds 资源ID列表
-     */
-    public void batchDelete(List<String> gpuIds) {
-        redisTemplate.execute((RedisCallback<Object>) connection -> {
-            connection.multi();
-            gpuIds.forEach(id -> connection.del(buildKey(id).getBytes()));
-            connection.exec();
-            return null;
-        });
-    }
-
-    /**
-     * 缓存健康检查
-     * @return 是否连通
-     */
-    public boolean healthCheck() {
-        try {
-            return "PONG".equals(Objects.requireNonNull(redisTemplate.getConnectionFactory())
-                    .getConnection().ping());
-        } catch (Exception e) {
-            return false;
-        }
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ServiceAPIService.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/ServiceAPIService.java
@ -1,5 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service;
-
-public interface ServiceAPIService {
-    String getByModelId(Long modelId);
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java
@ -1,72 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.service.Impl;
-
-import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
-import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuMapper;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuCreateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuResponseDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.dto.GpuUpdateDTO;
-import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
-import com.bipt.intelligentapplicationorchestrationservice.entity.enums.ErrorCodeEnum;
-import com.bipt.intelligentapplicationorchestrationservice.entity.vo.ResponseVO;
-import com.bipt.intelligentapplicationorchestrationservice.service.GpuManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Service
-public class GpuManageServiceImpl implements GpuManageService {
-    @Autowired
-    private GpuResourceDao gpuDao;
-
-    @Autowired
-    private GpuMapper gpuMapper;
-    @Autowired
-    private GpuResourceDao gpuResourceDao;
-
-    @Transactional
-    //创建GPU资源
-    public ResponseVO createGpuResource(GpuCreateDTO dto) {
-        GpuResource entity = gpuMapper.toEntity(dto);
-        gpuDao.insert(entity);
-        return ResponseVO.success(entity);
-    }
-
-    @Transactional
-    //删除GPU资源（逻辑删除）
-    public ResponseVO deleteGpuResource(Long gpuId) {
-        GpuResource entity = gpuDao.selectById(gpuId);
-        if (entity == null) {
-            return ResponseVO.error(ErrorCodeEnum.GPU_NOT_FOUND);
-        }
-        gpuDao.isDeleted(gpuId);
-        return ResponseVO.success();
-    }
-
-    @Transactional
-    //更新GPU资源
-    public void updateGpuResource(GpuUpdateDTO dto) {
-        GpuResource entity = gpuMapper.toEntity(dto);
-        gpuDao.updateById(entity);
-    }
-
-    @Override
-    //模糊匹配查询
-    public List<GpuResponseDTO> searchByCriteria(String model, Integer memorySize, String ip) {
-        // PermissionCheckUtil.checkTenantAccess();
-
-        Map<String, Object> params = new HashMap<>();
-        if(model != null) params.put("model","%" + model + "%");
-        if(memorySize!=null) params.put("memorySize", memorySize);
-        if(ip!=null) params.put("ip", ip);
-
-        List<GpuResource> entities = gpuResourceDao.selectByFields(params);
-
-        return entities.stream().map(gpuMapper::toDTO).collect(Collectors.toList());
-
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/util/AliOssUtil.java
+++ b/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";
-        }
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/util/NacosServiceUtil.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/util/NacosServiceUtil.java
@ -1,42 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.util;
-
-import com.alibaba.nacos.api.naming.NamingFactory;
-import com.alibaba.nacos.api.naming.NamingService;
-import com.alibaba.nacos.api.naming.pojo.Instance;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Component
-public class NacosServiceUtil {
-
-    @Value("${spring.cloud.nacos.discovery.server-addr}")
-    private String nacosServerAddr;
-
-    public void registerService(String serviceName, String ip, int port, String url) throws Exception { // 新增url参数
-        NamingService naming = NamingFactory.createNamingService(nacosServerAddr);
-        Instance instance = new Instance();
-        instance.setIp(ip);
-        instance.setPort(port);
-        // 添加元数据存储URL
-        Map<String, String> metadata = new HashMap<>();
-        metadata.put("url", url); // 将URL存入元数据
-        instance.setMetadata(metadata);
-        naming.registerInstance(serviceName, instance);
-    }
-
-    /**
-     * 获取服务所有实例IP
-     */
-    public List<String> getServiceInstances(String serviceName) throws Exception {
-        NamingService naming = NamingFactory.createNamingService(nacosServerAddr);
-        List<Instance> instances = naming.getAllInstances(serviceName);
-        return instances.stream()
-                .map(Instance::getIp)
-                .collect(Collectors.toList());
-    }
-}
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/utils/ConfigConstants.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/utils/ConfigConstants.java
@ -1,16 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice.utils;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ConfigConstants {
-    @Value("${model.deploy.port:8080}")
-    public int MODEL_PORT;
-
-    @Value("${model.deploy.url-template:http://%s:%d/model/%s/%s}")
-    public String URL_TEMPLATE;
-
-    @Value("${model.deploy.script-timeout:300}")
-    public int SCRIPT_TIMEOUT_SECONDS;
-}
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@ -1,7 +1,7 @@
 spring.application.name=intelligent-application-orchestration-service


-# ?????
+# 数据库配置
 spring.datasource.url=jdbc:kingbase8://116.205.121.200:54321/Ipz
 spring.datasource.username=system
 spring.datasource.password=root
@ -10,45 +10,20 @@ spring.datasource.hikari.maximum-pool-size=10
 spring.datasource.hikari.minimum-idle=5
 spring.datasource.hikari.connection-timeout=30000

-# MyBatis??
+# SQL映射文件路径配置
 mybatis.mapper-locations=classpath:mapper/*.xml
+# 配置实体类别名所在包
 mybatis.type-aliases-package=com.bipt.intelligentapplicationorchestrationservice.pojo
+# 开启驼峰命名转换
 mybatis.configuration.map-underscore-to-camel-case=true

-# Redis??
-#spring.data.redis.host=127.0.0.1
-#spring.data.redis.port=6379
-spring.data.redis.host=116.205.121.200
+# Redis服务器地址
+spring.data.redis.host=localhost
+# Redis服务器端口
 spring.data.redis.port=6379
-spring.data.redis.username=default
-spring.data.redis.password=Jbjhhzstsl97@
-spring.data.redis.database=0
+# Redis密码（如果有）
+spring.data.redis.password=123456
+# Redis数据库索引（默认为0）
+spring.data.redis.database=2
+# 连接超时时间（毫秒）
 spring.data.redis.timeout=3000
-spring.data.redis.ssl.enabled=false
-
-# ??????
-spring.cloud.gateway.routes[0].id=request-service-route
-spring.cloud.gateway.routes[0].uri=lb://intelligent-application-orchestration-service
-spring.cloud.gateway.routes[0].predicates[0]=Path=/request
-
-
-
-logging.level.org.springframework.web=DEBUG
-
-
-#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
-
-
--- a/src/main/resources/bootstrap.properties
+++ b/src/main/resources/bootstrap.properties
@ -1,10 +0,0 @@
-# 应用名称（必须与Nacos配置的dataId前缀一致）
-spring.application.name=intelligent-application-orchestration-service
-
-# Nacos配置中心地址（引导阶段加载配置）
-spring.cloud.nacos.config.server-addr=113.44.217.169:8848
-spring.cloud.nacos.config.data-id=${spring.application.name}.properties
-spring.cloud.nacos.config.group=DEFAULT_GROUP
-
-# Nacos服务注册地址（引导阶段注册服务）
-spring.cloud.nacos.discovery.server-addr=113.44.217.169:8848
--- a/src/main/resources/mapper/AlgorithmInfoMapper.xml
+++ b/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>
--- a/src/main/resources/mapper/DatasetMapper.xml
+++ b/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>
--- a/src/main/resources/mapper/EvaluationMapper.xml
+++ b/src/main/resources/mapper/EvaluationMapper.xml
@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bipt.intelligentapplicationorchestrationservice.mapper.EvaluationMapper">
    <!--查询模型日志详细信息-->
-    <select id="selectLogDetail" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelLogVO">
+    <select id="selectLogDetail" resultType="modelLogVO">
        select m1.*,
               m2.model_name,
               m3.model_config, m3.version
@ -18,6 +18,6 @@
            <if test="status != null">
                status=#{status}
            </if>
-            where id=#{id}
+            where model_id=#{id}
    </update>
 </mapper>
--- a/src/main/resources/mapper/GpuResourceMapper.xml
+++ b/src/main/resources/mapper/GpuResourceMapper.xml
@ -1,57 +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.GpuResourceDao">
-
-    <!-- 动态条件查询 -->
-    <select id="selectByFields"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
-        SELECT *
-        FROM Ipz.public.gpu_resource
-        <where>
-            is_deleted = 0
-            <if test="params.model != null and params.model != ''">
-                AND GPUModel LIKE CONCAT('%', #{params.model}, '%')
-            </if>
-            <if test="params.memoryMin != null">
-                AND GPUMemorySize &gt;= #{params.memoryMin}
-            </if>
-            <if test="params.ip != null and params.ip != ''">
-                AND Ip = #{params.ip}
-            </if>
-            <if test="params.startTime != null and params.endTime != null">
-                AND update_time BETWEEN #{params.startTime} AND #{params.endTime}
-            </if>
-        </where>
-        ORDER BY GPUId DESC
-    </select>
-
-    <!-- 分页查询 -->
-    <select id="findByPage"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
-        SELECT *
-        FROM gpu_resource
-        WHERE is_deleted = 0
-        ORDER BY GPUId ASC
-        LIMIT #{limit} OFFSET #{offset}
-    </select>
-
-    <!-- 增量同步查询 -->
-    <select id="findModifiedSince"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
-        SELECT *, is_deleted
-        FROM gpu_resource
-        WHERE update_time &gt; #{since}
-        ORDER BY update_time ASC
-    </select>
-
-    <!-- 带锁查询 -->
-    <select id="selectByIdWithLock"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
-        SELECT *
-        FROM gpu_resource
-        WHERE GPUId = #{gpuId}
-            FOR UPDATE NOWAIT
-    </select>
-
-</mapper>
--- a/src/main/resources/mapper/ModelMapper.xml
+++ b/src/main/resources/mapper/ModelMapper.xml
@ -1,65 +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.ModelMapper">
-
-    <!--（新增新的模型）插入模型版本信息-->
-    <insert id="insertModelVersion">
-        insert into model_version (
-            model_id, version, dataset_id, model_config,
-            model_path, status, create_time, update_time, model_size,
-            data_pre_handle_file, model_super_args, model_args_size, model_source_code_url, model_file,
-            model_design_document, life_cycle, operate_user
-        )
-        values (
-                   #{modelId}, #{version}, #{datasetId}, #{modelConfig},
-                   #{modelPath}, #{status}, #{createTime}, #{updateTime}, #{modelSize},
-                   #{dataPreHandleFile}, #{modelSuperArgs}, #{modelArgsSize}, #{modelSourceCodeUrl}, #{modelFile},
-                   #{modelDesignDocument}, #{lifeCycle}, #{operateUser}
-               )
-    </insert>
-
-    <!--查询模型列表-->
-    <select id="list" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVO">
-        select t1.*,
-               t2.id as versionId,t2.version, t2.version, t2.data_pre_handle_file, t2.operate_user, t2.update_time,
-               t2.status
-        from model_info t1
-        left join model_version t2 on t1.id = t2.model_id
-        order by t2.update_time desc
-    </select>
-
-    <!--查询模型详细信息-->
-    <select id="selectById" resultType="com.bipt.intelligentapplicationorchestrationservice.pojo.ModelVersion">
-        SELECT
-            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
-        FROM model_info t1 JOIN model_version t2 ON t1.id = t2.model_id
-        where t2.id =  #{id}
-    </select>
-
-    <!--更新模型信息-->
-    <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>
-        </set>
-        WHERE id = #{id}
-    </update>
-</mapper>
--- a/src/test/java/com/bipt/intelligentapplicationorchestrationservice/RedisTest.java
+++ b/src/test/java/com/bipt/intelligentapplicationorchestrationservice/RedisTest.java
@ -1,53 +0,0 @@
-package com.bipt.intelligentapplicationorchestrationservice;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.*;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-@SpringBootTest
-public class RedisTest {
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    @Test
-    public void testRedisTemplate(){
-        System.out.println(redisTemplate);
-        ValueOperations valueOperations = redisTemplate.opsForValue();
-        HashOperations hashOperations = redisTemplate.opsForHash();
-        ListOperations listOperations = redisTemplate.opsForList();
-        SetOperations setOperations = redisTemplate.opsForSet();
-        ZSetOperations zSetOperations = redisTemplate.opsForZSet();
-    }
-    @Test
-    public void testString(){
-        //set get setex setnx
-        redisTemplate.opsForValue().set("name","小明");
-        String city =(String) redisTemplate.opsForValue().get("name");
-        System.out.println(city);
-        redisTemplate.opsForValue().set("code","1234",3, TimeUnit.MINUTES);
-        redisTemplate.opsForValue().setIfAbsent("lock","1");
-        redisTemplate.opsForValue().setIfAbsent("lock","2");
-    }
-    @Test
-    public void testHash(){
-//        hset hget hdel hkeys hvals
-        HashOperations hashOperations = redisTemplate.opsForHash();
-        hashOperations.put("100","name","tom");
-        hashOperations.put("100","age","20");
-
-        String name = (String) hashOperations.get("100", "name");
-        System.out.println(name);
-
-        Set keys = hashOperations.keys("100");
-        System.out.println(keys);
-        List values = hashOperations.values("100");
-        System.out.println(values);
-        hashOperations.delete("100","age");
-    }
-}
Author	SHA1	Message	Date
xiaohucoding	9694fbc95c	服务发布（无redis版）	2025-05-20 16:36:54 +08:00
xiaohucoding	6c838fbff1	服务发布（无redis版）	2025-05-20 16:33:07 +08:00
xiaohucoding	a794b46f9b	日志提交	2025-05-20 12:07:53 +08:00
xiaohucoding	62cae458c8	数据集生命周期版本2.0	2025-05-20 12:05:58 +08:00