From 24907af4bcdc45495d068112f4f26d5a2dfd6f48 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 26 Aug 2025 15:59:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E3=80=91=E4=B8=8A=E4=BC=A0excel=E6=96=87=E4=BB=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dataset/manage/DatasetSQLManage.java | 2 +- .../io/dataease/datasource/server/DatasourceServer.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java index c2d25ceef6..eae13c387f 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java @@ -386,7 +386,7 @@ public class DatasetSQLManage { } } - private DsTypeDTO getDatasourceType(Map dsMap, Long datasourceId) { + public DsTypeDTO getDatasourceType(Map dsMap, Long datasourceId) { DatasourceSchemaDTO datasourceSchemaDTO = dsMap.get(datasourceId); String type; if (datasourceSchemaDTO == null) { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index 46ba7fc621..8fc8a4765f 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -14,6 +14,7 @@ import io.dataease.constant.LogST; import io.dataease.constant.SQLConstants; import io.dataease.dao.auto.entity.CoreDatasource; import io.dataease.dataset.manage.DatasetDataManage; +import io.dataease.dataset.manage.DatasetSQLManage; import io.dataease.dataset.utils.TableUtils; import io.dataease.datasource.dao.auto.entity.CoreDatasourceTask; import io.dataease.datasource.dao.auto.entity.CoreDatasourceTaskLog; @@ -110,6 +111,8 @@ public class DatasourceServer implements DatasourceApi { private ScheduleManager scheduleManager; @Resource private CoreUserManage coreUserManage; + @Resource + private DatasetSQLManage datasetSQLManage; @Autowired(required = false) private PluginManageApi pluginManage; @Autowired(required = false) @@ -1109,11 +1112,12 @@ public class DatasourceServer implements DatasourceApi { Configuration configuration = JsonUtil.parseObject(datasourceSchemaDTO.getConfiguration(), Configuration.class); String schema = StringUtils.isNotEmpty(configuration.getSchema()) ? configuration.getSchema() + "." : ""; - String sql = "SELECT * FROM " + schema + tableName; - Provider provider = ProviderFactory.getProvider(datasourceSchemaDTO.getType()); Map dsMap = new HashMap<>(); datasourceSchemaDTO.setSchemaAlias(String.format(SQLConstants.SCHEMA, datasourceSchemaDTO.getId())); dsMap.put(datasourceSchemaDTO.getId(), datasourceSchemaDTO); + DsTypeDTO datasourceType = datasetSQLManage.getDatasourceType(dsMap, datasourceSchemaDTO.getId()); + String sql = "SELECT * FROM " + schema + datasourceType.getPrefix() + tableName + datasourceType.getSuffix(); + Provider provider = ProviderFactory.getProvider(datasourceSchemaDTO.getType()); sql = provider.transSqlDialect(sql, dsMap); sql = new String(Base64.getEncoder().encode(sql.getBytes())); PreviewSqlDTO previewSqlDTO = new PreviewSqlDTO();