From dc073bf778c6f5b16fbd6e82c7bf1e5b1c6d2533 Mon Sep 17 00:00:00 2001
From: lwj <3529558005@qq.com>
Date: Fri, 30 Aug 2024 09:37:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloud/etl/controller/DataValueController.java     |  2 +-
 .../com/muyu/cloud/etl/service/DataValueService.java  |  2 +-
 .../cloud/etl/service/impl/DataValueServiceImpl.java  | 11 +++++------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java
index 55e21f5..d0d5eff 100644
--- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java
+++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/DataValueController.java
@@ -25,7 +25,7 @@ public class DataValueController {
     //获取字段值
     @PostMapping("/findTableValueList")
     public Result findTableValueList(@RequestParam("basicId") Long basicId,@RequestParam("tableName") String tableName ) {
-        List<List<DataValue>> list= dataValueService.findTableValueList(basicId,tableName);
+    List<DataValue> list= dataValueService.findTableValueList(basicId,tableName);
         return Result.success(list);
     }
 }
diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java
index 3930a70..c315bf7 100644
--- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java
+++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/DataValueService.java
@@ -7,5 +7,5 @@ import java.util.List;
 public interface DataValueService {
    List< List<DataValue> >findTableValue(Long basicId, String sql);
 
-   List<List<DataValue>> findTableValueList(Long basicId, String tableName);
+   List<DataValue> findTableValueList(Long basicId, String tableName);
 }
diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java
index bf700c4..daafdd8 100644
--- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java
+++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/DataValueServiceImpl.java
@@ -77,7 +77,7 @@ public class DataValueServiceImpl implements DataValueService {
     }
 
     @Override
-    public List<List<DataValue>> findTableValueList(Long basicId, String tableName) {
+    public List<DataValue> findTableValueList(Long basicId, String tableName) {
         Source source = sourceService.getInfo(basicId);
         String host = source.getHost();
         String port = source.getPort();
@@ -86,11 +86,10 @@ public class DataValueServiceImpl implements DataValueService {
         String url = "jdbc:" + databaseType + "://" + host + ":" + port + "/" + databaseName + "?" + source.getConnectionParams();
         String user = source.getUsername();
         String password = source.getPassword();
-        List<List<DataValue>> list = new ArrayList<>();
         Connection conn=null;
-
+        ArrayList<DataValue> dataValues = new ArrayList<>();
         try {
-            ArrayList<DataValue> dataValues = new ArrayList<>();
+
             conn = DriverManager.getConnection(url, user, password);
             try {
                 PreparedStatement preparedStatement = conn.prepareStatement("SELECT  * FROM " + tableName);
@@ -120,7 +119,7 @@ public class DataValueServiceImpl implements DataValueService {
                                 .build();
                         dataValues.add(build);
                     }
-                    list.add(dataValues);
+
                 }
             } catch (SQLException e) {
                 throw new RuntimeException(e);
@@ -130,6 +129,6 @@ public class DataValueServiceImpl implements DataValueService {
         }
 
 
-        return list;
+        return dataValues;
     }
 }