From 2bdc188fc9499d7946665a90cc5fdc9feffbc2e7 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Sun, 8 Sep 2024 19:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/domain/Source.java | 29 +++++++++----------
 .../etl/service/impl/ProductServiceImpl.java  | 24 +++++++++++----
 2 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/cloud-etl-common/src/main/java/com/muyu/domain/Source.java b/cloud-etl-common/src/main/java/com/muyu/domain/Source.java
index c216c56..9760896 100644
--- a/cloud-etl-common/src/main/java/com/muyu/domain/Source.java
+++ b/cloud-etl-common/src/main/java/com/muyu/domain/Source.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.muyu.common.core.annotation.Excel;
 import com.muyu.common.core.web.domain.BaseEntity;
 import com.muyu.domain.mysql.BaseConfig;
-import com.muyu.domain.mysql.config.MysqlPoolConfig;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
@@ -89,22 +88,22 @@ public class Source extends BaseEntity {
     @Excel(name = "驱动 ")
     private String driverName;
 
-    public  static  MysqlPoolConfig getMysqlPoolConfig(Source source) {
-      return   MysqlPoolConfig.builder()
-                .id(source.getId())
-                .dataResourceName(source.getDataResourceName())
-                .dataSourcesSystemName(source.getDataSourcesSystemName())
-                .host(source.getHost())
-                .port(source.getPort())
-                .databaseType(source.getDatabaseType())
-                .databaseName(source.getDatabaseName())
-                .initLinkNum(source.getInitLinkNum())
-                .maxLinkNum(source.getMaxLinkNum())
-                .build();
-    }
+//    public  static  getMysqlPoolConfig(Source source) {
+//      return   MysqlPoolConfig.builder()
+//                .id(source.getId())
+//                .dataResourceName(source.getDataResourceName())
+//                .dataSourcesSystemName(source.getDataSourcesSystemName())
+//                .host(source.getHost())
+//                .port(source.getPort())
+//                .databaseType(source.getDatabaseType())
+//                .databaseName(source.getDatabaseName())
+//                .initLinkNum(source.getInitLinkNum())
+//                .maxLinkNum(source.getMaxLinkNum())
+//                .build();
+//    }
 
 
-    public String getUrl(){
+    public   String getUrl(){
         StringBuilder urlSb = new StringBuilder(BaseConfig.MYSQLJDBCPRO);
         urlSb.append(this.host);
         urlSb.append(":");
diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java
index cedd3cf..f09496e 100644
--- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/ProductServiceImpl.java
@@ -1,6 +1,5 @@
 package com.muyu.cloud.etl.service.impl;
 
-import com.muyu.Hikari.HikariPool;
 import com.muyu.cloud.etl.service.ProductService;
 import com.muyu.cloud.etl.service.SourceService;
 import com.muyu.cloud.etl.service.TableInfoService;
@@ -8,6 +7,7 @@ import com.muyu.domain.DataValue;
 import com.muyu.domain.Source;
 import com.muyu.domain.TableInfo;
 import com.muyu.domain.enums.DataType;
+import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -173,6 +173,22 @@ public class ProductServiceImpl implements ProductService {
     @Override
     public int addProduct(Long basicId, Long tableId, DataValue[][] listList) {
 
+        Source dataSources = sourceService.getById(basicId);
+        TableInfo tableInfo = tableInfoService.getById(tableId);
+        String tableName = tableInfo.getTableName();
+
+        HikariConfig hikariConfig = new HikariConfig();
+        hikariConfig.setPoolName("HikariCP 连接池");
+        hikariConfig.setDriverClassName(dataSources.getDriverName());
+        hikariConfig.setJdbcUrl(dataSources.getUrl());
+        hikariConfig.setUsername(dataSources.getUsername());
+        hikariConfig.setPassword(dataSources.getPassword());
+        hikariConfig.setMinimumIdle(2);
+        hikariConfig.setMaximumPoolSize(10);
+
+        HikariDataSource hikariDataSource = new HikariDataSource(hikariConfig);
+
+
         log.info("数据源ID的basicId{}值"+basicId);
         log.info("表的主键{}值"+tableId);
         for (DataValue[] dataValues : listList) {
@@ -180,10 +196,8 @@ public class ProductServiceImpl implements ProductService {
                 log.info("里面的所有的值"+dataValue);
             }
         }
-        Source dataSources = sourceService.getById(basicId);
-        TableInfo tableInfo = tableInfoService.getById(tableId);
-        String tableName = tableInfo.getTableName();
-        HikariDataSource hikariDataSource = HikariPool.getHikariDataSource(dataSources);
+
+//        HikariDataSource hikariDataSource = HikariPool.getHikariDataSource(dataSources);
 
         ExecutorService executorService = Executors.newFixedThreadPool(8);