From 436e34d183a33cae465f38c41232eba85eedd116 Mon Sep 17 00:00:00 2001
From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com>
Date: Thu, 29 Aug 2024 15:19:45 +0800
Subject: [PATCH] =?UTF-8?q?fine:()=E4=BF=AE=E6=94=B9=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DataRunNameController.java      | 12 ++++++++++++
 .../server/service/DataRunNameService.java     |  7 +++++++
 .../service/impl/DataRunNameServiceImpl.java   | 18 +++++++++++++++++-
 3 files changed, 36 insertions(+), 1 deletion(-)

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 0981af7..e207e55 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
@@ -2,6 +2,7 @@ package com.muyu.server.controller;
 
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.domain.Connect;
+import com.muyu.common.domain.DataName;
 import com.muyu.server.service.DataRunNameService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -37,4 +38,15 @@ public class DataRunNameController {
         String s = dataRunNameService.addDataTableName(connect);
         return Result.success(s,"同步成功");
     }
+
+    /**
+     *  连接数据库获取当前所有的数据库名称
+     * @return 所有数据库以及所有表的结果集
+     */
+    @PostMapping("/extractDataName")
+    @Operation(summary = "获取数据库名",description = "返回所有数据库以及所有表的结果集")
+    public Result<List<DataName>> getDatabase(){
+
+        return Result.success(dataRunNameService.getDatabasesName());
+    }
 }
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 93b0cf8..17250df 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
@@ -4,6 +4,7 @@ import com.muyu.common.domain.Connect;
 import com.muyu.common.domain.DataName;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @Author：yang
@@ -23,4 +24,10 @@ public interface DataRunNameService {
      * 添加 数据库名，表名，结构
      */
     String addDataTableName(Connect connect);
+
+    /**
+     * 查询数据库名称 和 表名称联查
+     * @return
+     */
+    List<DataName> getDatabasesName();
 }
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 ba30a59..5160c56 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
@@ -1,10 +1,10 @@
 package com.muyu.server.service.impl;
 
+import com.muyu.common.core.domain.Result;
 import com.muyu.common.domain.Connect;
 import com.muyu.common.domain.DataName;
 import com.muyu.common.domain.TableFie;
 import com.muyu.common.domain.TableNames;
-import com.muyu.server.mapper.DataRunNameMapper;
 import com.muyu.server.service.DataNameService;
 import com.muyu.server.service.DataRunNameService;
 import com.muyu.server.service.DataSourceService;
@@ -83,4 +83,20 @@ public class DataRunNameServiceImpl implements DataRunNameService {
 
         return "添加成功";
     }
+
+    /**
+     * 查询数据库名称 和 表名称联查
+     * @return
+     */
+    @Override
+    public List<DataName> getDatabasesName() {
+
+        List<DataName> dataNames = dataNameService.extractDataName();
+        dataNames.forEach(dataName -> {
+            String name = dataName.getName();
+            List<TableNames> tableNames = tableRunNameService.extractTableName(name);
+            dataName.setTableNames(tableNames);
+        });
+        return dataNames;
+    }
 }