fine:()修改规格

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());
+    }
 }

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();
 }

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;
+    }
 }