From b21833555816b6488d667cdbbc0eb0b9aa0c41d4 Mon Sep 17 00:00:00 2001
From: dc <sanqing_dc@163.com>
Date: Tue, 3 Jun 2025 21:28:40 +0800
Subject: [PATCH] =?UTF-8?q?GPU=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 28 +++++++++++++++++--
 ...cationOrchestrationServiceApplication.java |  2 +-
 .../cache/CacheSyncTask.java                  |  2 +-
 .../{dao => mapper}/GpuResourceDao.java       |  2 +-
 .../service/CacheManager.java                 |  2 +-
 .../service/impl/GpuManageServiceImpl.java    |  2 +-
 src/main/resources/application.properties     |  2 +-
 .../resources/mapper/GpuResourceMapper.xml    | 10 +++----
 8 files changed, 36 insertions(+), 14 deletions(-)
 rename src/main/java/com/bipt/intelligentapplicationorchestrationservice/{dao => mapper}/GpuResourceDao.java (97%)

diff --git a/pom.xml b/pom.xml
index b6eb38c..a0e576e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>5.6.15.Final</version>  <!-- 推荐稳定版本:ml-citation{ref="5,8" data="citationList"} -->
+			<version>6.4.5.Final</version>  <!-- 推荐稳定版本:ml-citation{ref="5,8" data="citationList"} -->
 			<exclusions>
 				<exclusion>
 					<groupId>org.jboss.logging</groupId>  <!-- 常见冲突源:ml-citation{ref="7" data="citationList"} -->
@@ -90,7 +90,7 @@
 		<dependency>
 			<groupId>org.mybatis.spring.boot</groupId>
 			<artifactId>mybatis-spring-boot-starter</artifactId>
-			<version>2.3.1</version>
+			<version>3.0.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -117,6 +117,11 @@
 			<artifactId>spring-boot-starter-redis</artifactId>
 			<version>1.4.7.RELEASE</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+			<version>3.2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>com.mysql</groupId>
 			<artifactId>mysql-connector-j</artifactId>
@@ -130,7 +135,15 @@
 			<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>
 	</dependencies>
 
 	<build>
@@ -173,6 +186,15 @@
 				</configuration>
 			</plugin>
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.xml</include>
+					<include>**/*.properties</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 
 </project>
diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
index 9d24e1a..c2c2302 100644
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/IntelligentApplicationOrchestrationServiceApplication.java
@@ -4,7 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@MapperScan("com.bipt.intelligentapplicationorchestrationservice.dao")
+@MapperScan("com.bipt.intelligentapplicationorchestrationservice.mapper")
 @SpringBootApplication
 public class IntelligentApplicationOrchestrationServiceApplication {
 
diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java
index 1f579fc..40c2de2 100644
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/cache/CacheSyncTask.java
@@ -1,7 +1,7 @@
 package com.bipt.intelligentapplicationorchestrationservice.cache;
 
 import com.bipt.intelligentapplicationorchestrationservice.service.CacheManager;
-import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao;
+import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
 import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/dao/GpuResourceDao.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuResourceDao.java
similarity index 97%
rename from src/main/java/com/bipt/intelligentapplicationorchestrationservice/dao/GpuResourceDao.java
rename to src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuResourceDao.java
index a0fd58e..e415e25 100644
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/dao/GpuResourceDao.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/mapper/GpuResourceDao.java
@@ -1,4 +1,4 @@
-package com.bipt.intelligentapplicationorchestrationservice.dao;
+package com.bipt.intelligentapplicationorchestrationservice.mapper;
 
 import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
 import org.apache.ibatis.annotations.*;
diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java
index 0367af2..b39d307 100644
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/CacheManager.java
@@ -1,6 +1,6 @@
 package com.bipt.intelligentapplicationorchestrationservice.service;
 
-import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao;
+import com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao;
 import com.bipt.intelligentapplicationorchestrationservice.exception.CacheInitException;
 import com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource;
 import jakarta.annotation.PostConstruct;
diff --git a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java
index 185584f..81957a1 100644
--- a/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java
+++ b/src/main/java/com/bipt/intelligentapplicationorchestrationservice/service/impl/GpuManageServiceImpl.java
@@ -1,6 +1,6 @@
 package com.bipt.intelligentapplicationorchestrationservice.service.impl;
 
-import com.bipt.intelligentapplicationorchestrationservice.dao.GpuResourceDao;
+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;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1f79f49..073c811 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -30,4 +30,4 @@ mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.type-aliases-package=com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity
 
 #mybatis.mapper-locations=classpath:mapper/*.xml
-#mybatis.type-aliases-package=com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity
+#mybatis.type-aliases-package=com.bipt.intelligentapplicationorchestrationservice.gpu.entity.entity
diff --git a/src/main/resources/mapper/GpuResourceMapper.xml b/src/main/resources/mapper/GpuResourceMapper.xml
index 7d5134e..7950d7f 100644
--- a/src/main/resources/mapper/GpuResourceMapper.xml
+++ b/src/main/resources/mapper/GpuResourceMapper.xml
@@ -1,11 +1,11 @@
 <?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.gpu.dao.GpuResourceDao">
+<mapper namespace="com.bipt.intelligentapplicationorchestrationservice.mapper.GpuResourceDao">
 
     <!-- 动态条件查询 -->
     <select id="selectByFields"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
         SELECT *
         FROM Ipz.public.gpu_resource
         <where>
@@ -28,7 +28,7 @@
 
     <!-- 分页查询 -->
     <select id="findByPage"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
         SELECT *
         FROM gpu_resource
         WHERE is_deleted = 0
@@ -38,7 +38,7 @@
 
     <!-- 增量同步查询 -->
     <select id="findModifiedSince"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
         SELECT *, is_deleted
         FROM gpu_resource
         WHERE update_time &gt; #{since}
@@ -47,7 +47,7 @@
 
     <!-- 带锁查询 -->
     <select id="selectByIdWithLock"
-            resultType="com.bipt.intelligentapplicationorchestrationservice.gpu.model.entity.GpuResource">
+            resultType="com.bipt.intelligentapplicationorchestrationservice.entity.entity.GpuResource">
         SELECT *
         FROM gpu_resource
         WHERE GPUId = #{gpuId}