From dc69c82be1f74b97b0aca8b33b60b549554b291c Mon Sep 17 00:00:00 2001
From: Saisai Liu <1374434128@qq.com>
Date: Sun, 21 Apr 2024 18:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/etl/domain/BasicConfigInfo.java  |  6 ++++++
 .../controller/BasicConfigInfoController.java |  7 ++++---
 .../etl/service/BasicConfigInfoService.java   |  3 ++-
 .../impl/BasicConfigInfoServiceImpl.java      | 19 ++++++++++---------
 .../mapper/BasicConfigInfoMapper.xml          | 10 +++++++++-
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java
index 4dc65db..e1b7b0e 100644
--- a/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java
+++ b/muyu-modules/muyv-etl/muyu-etl-common/src/main/java/com/muyu/etl/domain/BasicConfigInfo.java
@@ -72,6 +72,12 @@ public class BasicConfigInfo extends BaseEntity
     @Excel(name ="连接参数")
     private String connectionParams;
 
+    @Excel(name ="用户名")
+    private String username;
+
+    @Excel(name ="密码")
+    private String password;
+
     private String createBy;
     private String updateBy;
     private Date createTime;
diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java
index 281eee3..c858f5a 100644
--- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java
+++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/controller/BasicConfigInfoController.java
@@ -12,6 +12,7 @@ import com.muyu.etl.service.BasicConfigInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -99,10 +100,10 @@ public class BasicConfigInfoController extends BaseController
     /**
      * 测试连接
      */
-    @RequiresPermissions("etl:info:remove")
-    @Log(title = "基础信息", businessType = BusinessType.DELETE)
+    @RequiresPermissions("etl:info:test")
+    @Log(title = "测试连接")
     @PostMapping("/connectionTest")
-    public Result connectionTest(BasicConfigInfo basicConfigInfo){
+    public Result connectionTest(@RequestBody BasicConfigInfo basicConfigInfo) throws ServletException {
         return toAjax(basicConfigInfoService.connectionTest(basicConfigInfo));
     }
 }
diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java
index 949b950..b4ad37f 100644
--- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java
+++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/BasicConfigInfoService.java
@@ -3,6 +3,7 @@ package com.muyu.etl.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muyu.etl.domain.BasicConfigInfo;
 
+import javax.servlet.ServletException;
 import java.util.List;
 
 /**
@@ -61,5 +62,5 @@ public interface BasicConfigInfoService extends IService<BasicConfigInfo>
      */
     public int deleteBasicConfigInfoById(Long id);
 
-    boolean connectionTest(BasicConfigInfo basicConfigInfo);
+    boolean connectionTest(BasicConfigInfo basicConfigInfo) throws ServletException;
 }
diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
index 06172a7..b418d4e 100644
--- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
+++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/java/com/muyu/etl/service/impl/BasicConfigInfoServiceImpl.java
@@ -7,6 +7,7 @@ import com.muyu.etl.service.BasicConfigInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.ServletException;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -99,23 +100,23 @@ public class BasicConfigInfoServiceImpl  extends ServiceImpl<BasicConfigInfoMapp
     }
 
     @Override
-    public boolean connectionTest(BasicConfigInfo basicConfigInfo) {
+    public boolean connectionTest(BasicConfigInfo basicConfigInfo) throws ServletException {
         //定义下面需要的对象
         String host = basicConfigInfo.getHost();
         String port = basicConfigInfo.getPort();
         String databaseName = basicConfigInfo.getDatabaseName();
+        String databaseType = basicConfigInfo.getDatabaseType();
 
-        String url = "jdbc:mysql://localhost:3306/yourDatabase";
-        String user = "yourUsername";
-        String password = "yourPassword";
-
+        String url = "jdbc:"+databaseType+"://"+host+":"+port+"/"+databaseName+"";
+        String user = basicConfigInfo.getUsername();
+        String password = basicConfigInfo.getPassword();
+        Connection conn= null;
         try {
-            Connection conn = DriverManager.getConnection(url, user, password);
+            conn = DriverManager.getConnection(url, user, password);
             System.out.println("Connected to the MySQL server successfully.");
-            conn.close();
         } catch (SQLException e) {
-            System.out.println("Connection to MySQL failed: " + e.getMessage());
+            throw new ServletException("连接失败");
         }
-        return false;
+        return true;
     }
 }
diff --git a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml
index 502961f..a0b5235 100644
--- a/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml
+++ b/muyu-modules/muyv-etl/muyu-etl-service/src/main/resources/mapper/BasicConfigInfoMapper.xml
@@ -21,7 +21,7 @@
     </resultMap>
 
     <sql id="selectBasicConfigInfoVo">
-        select id, data_resource_name, data_sources_system_name, host, port, database_type, database_name, init_link_num, max_link_num, max_wait_time, max_wait_times,connection_params, remark from basic_config_info
+        select id, data_resource_name,username,password, data_sources_system_name, host, port, database_type, database_name, init_link_num, max_link_num, max_wait_time, max_wait_times,connection_params, remark from basic_config_info
     </sql>
 
     <select id="selectBasicConfigInfoList" parameterType="com.muyu.etl.domain.BasicConfigInfo" resultMap="BasicConfigInfoResult">
@@ -33,6 +33,8 @@
             <if test="port != null  and port != ''"> and port = #{port}</if>
             <if test="databaseType != null  and databaseType != ''"> and database_type = #{databaseType}</if>
             <if test="databaseName != null  and databaseName != ''"> and database_name like concat('%', #{databaseName}, '%')</if>
+            <if test="username != null "> and username = #{username}</if>
+            <if test="password != null "> and password = #{password}</if>
             <if test="initLinkNum != null "> and init_link_num = #{initLinkNum}</if>
             <if test="maxLinkNum != null "> and max_link_num = #{maxLinkNum}</if>
             <if test="maxWaitTime != null "> and max_wait_time = #{maxWaitTime}</if>
@@ -55,6 +57,8 @@
             <if test="port != null">port,</if>
             <if test="databaseType != null">database_type,</if>
             <if test="databaseName != null">database_name,</if>
+            <if test="username != null">username,</if>
+            <if test="password != null">password,</if>
             <if test="initLinkNum != null">init_link_num,</if>
             <if test="maxLinkNum != null">max_link_num,</if>
             <if test="maxWaitTime != null">max_wait_time,</if>
@@ -68,6 +72,8 @@
             <if test="dataSourcesSystemName != null">#{dataSourcesSystemName},</if>
             <if test="host != null">#{host},</if>
             <if test="port != null">#{port},</if>
+            <if test="username != null">#{username},</if>
+            <if test="password != null">#{password},</if>
             <if test="databaseType != null">#{databaseType},</if>
             <if test="databaseName != null">#{databaseName},</if>
             <if test="initLinkNum != null">#{initLinkNum},</if>
@@ -88,6 +94,8 @@
             <if test="port != null">port = #{port},</if>
             <if test="databaseType != null">database_type = #{databaseType},</if>
             <if test="databaseName != null">database_name = #{databaseName},</if>
+            <if test="username != null">username = #{username},</if>
+            <if test="password != null">password = #{password},</if>
             <if test="initLinkNum != null">init_link_num = #{initLinkNum},</if>
             <if test="maxLinkNum != null">max_link_num = #{maxLinkNum},</if>
             <if test="maxWaitTime != null">max_wait_time = #{maxWaitTime},</if>