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 i public List 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 i public IPage queryTablePage(Page page, GenTable table) { // 手动切换数据源 DynamicDataSourceContextHolder.push(table.getDsName()); + CacheProxy.clear(); List
tableList = ServiceProxy.metadata().tables() .values().stream().filter(t -> { if (StrUtil.isBlank(table.getTableName())) { @@ -151,7 +154,8 @@ public class GenTableServiceImpl extends ServiceImpl i public List 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 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();