From e92e3777e74ca4b0d2ec515f0e6514d88d6a46a5 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Sat, 31 Aug 2024 19:17:53 +0800
Subject: [PATCH] =?UTF-8?q?fine:()=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/server/controller/DataRunNameController.java   | 4 ++--
 .../java/com/muyu/server/service/DataRunNameService.java    | 2 +-
 .../muyu/server/service/impl/DataRunNameServiceImpl.java    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java
index 84475b3..ea26b56 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/controller/DataRunNameController.java
@@ -66,8 +66,8 @@ public class DataRunNameController {
      */
     @PostMapping("/findTableValue")
     @Operation(summary = "获取数据库名",description = "返回所有数据库以及所有表的结果集")
-    public Result<List<DataValue>> findTableValue(@RequestParam(name = "basicId") String basicId,@RequestParam(name = "dataName") String dataName){
+    public Result<List<DataValue>> findTableValue(@RequestParam(name = "basicId") String basicId,@RequestParam(name = "dataId") String dataId){
 
-        return Result.success(dataRunNameService.findTableValue(basicId,dataName));
+        return Result.success(dataRunNameService.findTableValue(basicId,dataId));
     }
 }
diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java
index 74d1d08..27d2ad9 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/DataRunNameService.java
@@ -38,5 +38,5 @@ public interface DataRunNameService {
      * @param basicId 数据类型转换ID
      * @return 返回结果
      */
-    List<DataValue> findTableValue(String basicId, String dataName);
+    List<DataValue> findTableValue(String basicId, String dataId);
 }
diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
index dc37630..7524f6f 100644
--- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
+++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java
@@ -151,11 +151,11 @@ public class DataRunNameServiceImpl implements DataRunNameService {
      * @return 返回结果
      */
     @Override
-    public List<DataValue> findTableValue(String basicId, String dataName) {
-
+    public List<DataValue> findTableValue(String basicId, String dataId) {
+        DataName byId = dataNameService.getById(dataId);
         MySqlQuery mySqlQuery = new MySqlQuery();
         mySqlQuery.setDataSourceId(String.valueOf(basicId));
-        DruidDataSource connRs1 = JdbcHelper.getConnRs(dataName);
+        DruidDataSource connRs1 = JdbcHelper.getConnRs(byId.getName());
         DruidPooledConnection conn = null;
         try {
             conn = connRs1.getConnection();