From c7bd75be264f9dcb67675e46072966b1be9b1678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Tue, 27 Aug 2024 19:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=90=8D=E7=A7=B0=E4=B8=8E=E8=A1=A8=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/muyu/gen/controller/GenController.java    | 10 ++++++++++
 .../muyu/gen/service/GenTableColumnServiceImpl.java    |  5 +++++
 .../java/com/muyu/gen/service/GenTableServiceImpl.java |  2 ++
 .../com/muyu/gen/service/IGenTableColumnService.java   |  2 ++
 src/main/resources/mapper/generator/GenTableMapper.xml |  5 ++++-
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/muyu/gen/controller/GenController.java b/src/main/java/com/muyu/gen/controller/GenController.java
index b79d70c..18d6520 100644
--- a/src/main/java/com/muyu/gen/controller/GenController.java
+++ b/src/main/java/com/muyu/gen/controller/GenController.java
@@ -215,4 +215,14 @@ public class GenController extends BaseController
     public Result<List<String>> selDbNameAll(){
         return Result.success(genTableService.selDbNameAll());
     }
+
+
+    /**
+     * 根据数据库名称与表名称查询表字段
+     */
+    @GetMapping("/selectDbTableColumnsByName/{dbName}/{table}")
+    public Result<List<GenTableColumn>> selTableAll(@PathVariable("dbName") String dbName,@PathVariable("table") String table){
+        List<GenTableColumn> genTableColumns = genTableColumnService.selectDbTableColumnsByName(table, dbName);
+        return Result.success(genTableColumns);
+    }
 }
diff --git a/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java
index 210910f..043c83b 100644
--- a/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java
+++ b/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java
@@ -66,4 +66,9 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService
 	{
 		return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids));
 	}
+
+    @Override
+    public List<GenTableColumn> selectDbTableColumnsByName(String table, String dbName) {
+        return genTableColumnMapper.selectDbTableColumnsByName(table,dbName);
+    }
 }
diff --git a/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java
index 61ffdf3..3d5ba35 100644
--- a/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java
+++ b/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java
@@ -437,6 +437,8 @@ public class GenTableServiceImpl implements IGenTableService
         return genTableMapper.selDbNameAll();
     }
 
+
+
     /**
      * 设置主键列信息
      *
diff --git a/src/main/java/com/muyu/gen/service/IGenTableColumnService.java b/src/main/java/com/muyu/gen/service/IGenTableColumnService.java
index 9015c70..e6d4d55 100644
--- a/src/main/java/com/muyu/gen/service/IGenTableColumnService.java
+++ b/src/main/java/com/muyu/gen/service/IGenTableColumnService.java
@@ -42,4 +42,6 @@ public interface IGenTableColumnService
      * @return 结果
      */
     public int deleteGenTableColumnByIds(String ids);
+
+    List<GenTableColumn> selectDbTableColumnsByName(String table, String dbName);
 }
diff --git a/src/main/resources/mapper/generator/GenTableMapper.xml b/src/main/resources/mapper/generator/GenTableMapper.xml
index a902b57..0e0af77 100644
--- a/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="select_dbName">
 		<choose>
 			<when test="dbName!=null and dbName!=''">
-				table_schema = #{dbName}
+				table_schema in (#{dbName})
 			</when>
 			<otherwise>
 				table_schema = (select database())
@@ -152,6 +152,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE table_schema NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys')
 		GROUP BY table_schema
 	</select>
+	<select id="selFilterableByDbNameAndTableName" resultType="java.lang.String">
+
+	</select>
 
 	<insert id="insertGenTable" parameterType="com.muyu.gen.domain.GenTable" useGeneratedKeys="true" keyProperty="tableId">
         insert into gen_table (