From 7f79e077d1d9c457cb26da2fe1713895d1888184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Thu, 27 Mar 2025 13:38:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(codegen):=20=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E8=A1=A8=E5=92=8C=E5=88=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=AE=8C=E6=95=B4=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将`queryTableList`和`queryTableColumn`返回值从字符串列表改为完整的`Table`和`Column`对象
- 移除`GenDsConfController`的`@Inner`注解限制
---
 .../pigx/codegen/controller/GenDsConfController.java      | 2 --
 .../pig4cloud/pigx/codegen/service/GenTableService.java   | 5 +++--
 .../pigx/codegen/service/impl/GenTableServiceImpl.java    | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java
index 4497684f3..aabf6fa68 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java
@@ -28,7 +28,6 @@ import com.pig4cloud.pigx.codegen.entity.GenDatasourceConf;
 import com.pig4cloud.pigx.codegen.service.GenDatasourceConfService;
 import com.pig4cloud.pigx.common.core.util.R;
 import com.pig4cloud.pigx.common.core.util.SpringContextHolder;
-import com.pig4cloud.pigx.common.security.annotation.Inner;
 import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -72,7 +71,6 @@ public class GenDsConfController {
 	 * @return
 	 */
 	@GetMapping("/list")
-	@Inner(value = false)
 	public R list() {
 		return R.ok(datasourceConfService.list());
 	}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java
index acfe10ba2..88521b526 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/GenTableService.java
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pig4cloud.pigx.codegen.entity.GenTable;
+import org.anyline.metadata.Column;
 import org.anyline.metadata.Table;
 
 import java.util.List;
@@ -68,7 +69,7 @@ public interface GenTableService extends IService<GenTable> {
      * @param dsName 数据源名称
      * @return table
      */
-    List<String> queryTableList(String dsName);
+    List<Table> queryTableList(String dsName);
 
     /**
      * 查询表的全部字段
@@ -77,6 +78,6 @@ public interface GenTableService extends IService<GenTable> {
      * @param tableName 表名称
      * @return column
      */
-    List<String> queryTableColumn(String dsName, String tableName);
+    List<Column> queryTableColumn(String dsName, String tableName);
 
 }
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
index cb589b4e5..647a23110 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/GenTableServiceImpl.java
@@ -99,11 +99,11 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
      * @return column
      */
     @Override
-    public List<String> queryTableColumn(String dsName, String tableName) {
+    public List<Column> queryTableColumn(String dsName, String tableName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
         CacheProxy.clear();
-        return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).toList();
+        return ServiceProxy.metadata().columns(tableName).values().stream().toList();
     }
 
     /**
@@ -151,11 +151,11 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
      * @return table
      */
     @Override
-    public List<String> queryTableList(String dsName) {
+    public List<Table> queryTableList(String dsName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
         CacheProxy.clear();
-        return ServiceProxy.metadata().tables().values().stream().map(Table::getName).toList();
+        return ServiceProxy.metadata().tables().values().stream().toList();
     }
 
     /**