public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-16 20:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 【数据源】上传excel文件提示异常

Browse Source
This commit is contained in:
taojinlong
2025-08-26 15:59:34 +08:00
committed by taojinlong
parent 6cc2f39b94
commit 24907af4bc
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetSQLManage.java
View File

@@ -386,7 +386,7 @@ public class DatasetSQLManage {
}
}
private DsTypeDTO getDatasourceType(Map<Long, DatasourceSchemaDTO> dsMap, Long datasourceId) {
public DsTypeDTO getDatasourceType(Map<Long, DatasourceSchemaDTO> dsMap, Long datasourceId) {
DatasourceSchemaDTO datasourceSchemaDTO = dsMap.get(datasourceId);
String type;
if (datasourceSchemaDTO == null) {

8
core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
View File

@@ -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<Long, DatasourceSchemaDTO> 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();