From 8fabbe853901bbea837acd31869bc8a5d3fa64fb Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Mon, 18 Aug 2025 16:11:25 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BC=93=E5=AD=98=E7=B1=BB=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E3=80=82=202=E3=80=81pom=E4=BF=AE=E6=94=B9mysql?=
 =?UTF-8?q?=E4=B8=BA8.0.33=E7=89=88=E6=9C=AC.=203=E3=80=81=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2mapper=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mdm/mdmModule/config/CacheConfig.java     | 32 ++++++++++---------
 .../IntegrationTaskLivingDetailsEntity.xml    | 10 +++---
 pom.xml                                       |  5 +--
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java
index 2eed9fd8..9e08985e 100644
--- a/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java
+++ b/base-service/src/main/java/com/hzya/frame/mdm/mdmModule/config/CacheConfig.java
@@ -1,32 +1,34 @@
 package com.hzya.frame.mdm.mdmModule.config;
 
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.concurrent.ConcurrentMapCache;
-import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @Configuration
 @EnableCaching
 public class CacheConfig extends CachingConfigurerSupport {
 
+    @Override
     @Bean
-    public CacheManager cacheManager() {
-        SimpleCacheManager cacheManager = new SimpleCacheManager();
-
-        // 添加所有需要的缓存（包括缺失的mdmModuleDb）
-        List<Cache> caches = new ArrayList<>();
-        caches.add(new ConcurrentMapCache("mdmModuleDb"));
-        caches.add(new ConcurrentMapCache("mdmModuleDbFileds"));
-        caches.add(new ConcurrentMapCache("mdmModule"));
-
-        cacheManager.setCaches(caches);
+    public ConcurrentMapCacheManager cacheManager() {
+        // 整合所有需要的缓存名称：原有的mdm相关缓存 + 新的业务缓存
+        List<String> cacheNames = Arrays.asList(
+                // 原有缓存（来自SimpleCacheManager的配置）
+                "mdmModuleDb",
+                "mdmModuleDbFileds",
+                "mdmModule",
+                // 新添加的业务缓存（来自之前的ConcurrentMapCacheManager配置）
+                "sysApplicationPlugin",
+                "IntegrationTask",
+                "IntegrationTaskLiving"
+        );
+        ConcurrentMapCacheManager cacheManager = new ConcurrentMapCacheManager();
+        cacheManager.setCacheNames(cacheNames); // 注册所有缓存名称
         return cacheManager;
     }
 }
diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml b/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml
index fb8310d6..ad69560e 100644
--- a/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml
+++ b/base-service/src/main/java/com/hzya/frame/sysnew/integtationTaskLivingDetails/entity/IntegrationTaskLivingDetailsEntity.xml
@@ -73,11 +73,11 @@
      </sql>
 
     <!--通过ID获取数据 -->
-    <select id="entity_get" resultMap="get-IntegrationTaskLivingDetailsEntity-result">
-        select
-        <include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />
-        from integration_task_living_details where id = #{ id } and sts='Y'
-    </select>
+<!--    <select id="entity_get" resultMap="get-IntegrationTaskLivingDetailsEntity-result">-->
+<!--        select-->
+<!--        <include refid="IntegrationTaskLivingDetailsEntity_Base_Column_List" />-->
+<!--        from integration_task_living_details where id = #{ id } and sts='Y'-->
+<!--    </select>-->
 
  <!-- 查询 采用==查询 -->
  <select id="entity_list_base" resultMap="get-IntegrationTaskLivingDetailsEntity-result" parameterType = "com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity">
diff --git a/pom.xml b/pom.xml
index 981977e1..857e7f56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,9 @@
         <druid.version>1.1.22</druid.version>
         <!--        <mybatis-spring-boot-starter.version>2.2.2</mybatis-spring-boot-starter.version>-->
         <mybatis-plus-boot-starter.version>3.5.6</mybatis-plus-boot-starter.version>
-        <!--        <mysql-connector-j.version>8.0.33</mysql-connector-j.version>-->
-        <mysql-connector-java>5.1.49</mysql-connector-java>
+<!--                <mysql-connector-j.version>8.0.13</mysql-connector-j.version>-->
+<!--        <mysql-connector-java>5.1.49</mysql-connector-java>-->
+        <mysql-connector-java>8.0.33</mysql-connector-java>
         <pagehelper-spring-boot-starter.version>1.4.6</pagehelper-spring-boot-starter.version>
         <spring-boot-starter-cache.version>2.7.18</spring-boot-starter-cache.version>
         <sa.token.version>1.30.0</sa.token.version>