From b33bd0f766b5ae25058f2bd584ec0a3409e6f2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Mon, 8 Jul 2024 16:32:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=98=BF=E9=87=8C=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E6=B1=A0=E5=BC=82=E5=B8=B8=202=E3=80=81=E4=BB=8ECAD=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0=E5=8E=9F=E5=A7=8Bbom=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/config/MasterDataSourceConfig.java    | 4 ++++
 .../product/bomnew/service/BomNewOriginalParentV2Service.java | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java
index 36120549..9da3af15 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/config/MasterDataSourceConfig.java
@@ -89,6 +89,10 @@ public class MasterDataSourceConfig {
         dataSource.setMinIdle(2);
         dataSource.setInitialSize(2);
         dataSource.setDefaultAutoCommit(false);
+        dataSource.setTestWhileIdle(true);
+        dataSource.setTimeBetweenEvictionRunsMillis(60000);
+        dataSource.setMinEvictableIdleTimeMillis(200000);
+        dataSource.setMaxEvictableIdleTimeMillis(230000);
         return dataSource;
     }
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
index 7d40ce26..5c8d59fb 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewOriginalParentV2Service.java
@@ -191,10 +191,10 @@ public class BomNewOriginalParentV2Service extends ServiceImpl<BomNewOriginalPar
 
         }
         if (CollUtil.isNotEmpty(convert.getResultParent())) {
-            this.saveOrUpdateBatch(convert.getResultParent());
+            this.saveBatch(convert.getResultParent());
         }
         if (CollUtil.isNotEmpty(convert.getResultChild())) {
-            originalChildService.saveOrUpdateBatch(convert.getResultChild());
+            originalChildService.saveBatch(convert.getResultChild());
         }
     }