From b6e685d83af9bb78ee5ce08eb3546dd2157cd7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Tue, 27 Aug 2024 13:08:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A1=A8=E3=80=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=85=83=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9a6751301d43b7314a32b0d3d5eb16e3020867bf)
---
 .../codegen/service/impl/GenTableServiceImpl.java     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 ab52cbd41..c469e52bf 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
@@ -42,6 +42,7 @@ import lombok.RequiredArgsConstructor;
 import org.anyline.metadata.Column;
 import org.anyline.metadata.Database;
 import org.anyline.metadata.Table;
+import org.anyline.proxy.CacheProxy;
 import org.anyline.proxy.ServiceProxy;
 import org.anyline.service.AnylineService;
 import org.jetbrains.annotations.NotNull;
@@ -101,7 +102,8 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     public List<String> queryTableColumn(String dsName, String tableName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
-        return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).collect(Collectors.toList());
+        CacheProxy.clear();
+        return ServiceProxy.metadata().columns(tableName).values().stream().map(Column::getName).toList();
     }
 
     /**
@@ -115,6 +117,7 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     public IPage queryTablePage(Page<Table> page, GenTable table) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(table.getDsName());
+        CacheProxy.clear();
         List<Table> tableList = ServiceProxy.metadata().tables()
                 .values().stream().filter(t -> {
                     if (StrUtil.isBlank(table.getTableName())) {
@@ -151,7 +154,8 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     public List<String> queryTableList(String dsName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
-        return ServiceProxy.metadata().tables().values().stream().map(Table::getName).collect(Collectors.toList());
+        CacheProxy.clear();
+        return ServiceProxy.metadata().tables().values().stream().map(Table::getName).toList();
     }
 
     /**
@@ -183,13 +187,14 @@ public class GenTableServiceImpl extends ServiceImpl<GenTableMapper, GenTable> i
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public GenTable tableImport(String dsName, String tableName) {
+    protected GenTable tableImport(String dsName, String tableName) {
         // 手动切换数据源
         DynamicDataSourceContextHolder.push(dsName);
 
         // 查询表是否存在
         GenTable table = new GenTable();
         // 从数据库获取表信息
+        CacheProxy.clear();
         AnylineService service = ServiceProxy.service();
         Table tableMetadata = service.metadata().table(tableName);
         Database database = service.metadata().database();