From eba62a3d7fac058d1159e15e257e15ff39780d06 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Sun, 1 Sep 2024 11:13:26 +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   | 5 ++---
 .../java/com/muyu/server/service/DataRunNameService.java    | 4 ++--
 .../muyu/server/service/impl/DataRunNameServiceImpl.java    | 6 +++---
 3 files changed, 7 insertions(+), 8 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 088625d..0c4d786 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
@@ -61,17 +61,16 @@ public class DataRunNameController {
 
     /**
      * 数据类型转换
-     * @param basicId 数据类型转换ID
+     * @par 数据类型转换ID
      * @return 返回结果
      */
     @PostMapping("/findTableValue")
     @Operation(summary = "获取数据库名",description = "返回所有数据库以及所有表的结果集")
     public Result<List<DataValue>> findTableValue(
-            @RequestParam(name = "basicId") String basicId,
             @RequestParam(name = "dataId") String dataId,
             @RequestParam(name = "tableName") String tableName
     ){
 
-        return Result.success(dataRunNameService.findTableValue(basicId,dataId,tableName));
+        return Result.success(dataRunNameService.findTableValue(dataId,tableName));
     }
 }
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 8124a2e..b890c80 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
@@ -35,8 +35,8 @@ public interface DataRunNameService {
 
     /**
      * 数据类型转换
-     * @param basicId 数据类型转换ID
+     * @paracId 数据类型转换ID
      * @return 返回结果
      */
-    List<DataValue> findTableValue(String basicId, String dataId,String tableName);
+    List<DataValue> findTableValue( String dataId,String tableName);
 }
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 08ef2c6..e54b72b 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
@@ -147,14 +147,14 @@ public class DataRunNameServiceImpl implements DataRunNameService {
 
     /**
      * 数据类型转换
-     * @param basicId 数据类型转换ID
+     * @para 数据类型转换ID
      * @return 返回结果
      */
     @Override
-    public List<DataValue> findTableValue(String basicId, String dataId,String tableName) {
+    public List<DataValue> findTableValue( String dataId,String tableName) {
         DataName byId = dataNameService.getById(dataId);
         MySqlQuery mySqlQuery = new MySqlQuery();
-        mySqlQuery.setDataSourceId(String.valueOf(basicId));
+
         DruidDataSource connRs1 = JdbcHelper.getConnRs(byId.getName());
         DruidPooledConnection conn = null;
         try {