github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 19:42:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #11053 from dataease/pr@dev-v2@fixDS

Browse Source 
fix(数据源): mongo 对接失败
This commit is contained in:
taojinlong 2024-07-19 18:29:52 +08:00 committed by GitHub
commit afa95790ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java
View File

@ -1,6 +1,7 @@
package io.dataease.datasource.provider; package io.dataease.datasource.provider;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSch;
import com.jcraft.jsch.Session; import com.jcraft.jsch.Session;
import io.dataease.commons.utils.CommonThreadPool; import io.dataease.commons.utils.CommonThreadPool;
@ -188,6 +189,27 @@ public class CalciteProvider extends Provider {
return map; return map;
} }
private List<TableField> fetchResultField(ResultSet rs ) throws Exception {
List<TableField> fieldList = new ArrayList<>();
ResultSetMetaData metaData = rs.getMetaData();
int columnCount = metaData.getColumnCount();
for (int j = 0; j < columnCount; j++) {
String columnName = metaData.getColumnName(j + 1);
String label = StringUtils.isNotEmpty(metaData.getColumnLabel(j + 1)) ? metaData.getColumnLabel(j + 1) : columnName;
TableField tableField = new TableField();
tableField.setOriginName(columnName);
tableField.setName(label);
tableField.setType(metaData.getColumnTypeName(j + 1));
tableField.setFieldType(tableField.getType());
int deType = FieldUtils.transType2DeType(tableField.getType());
tableField.setDeExtractType(deType);
tableField.setDeType(deType);
fieldList.add(tableField);
}
return fieldList;
}
@Override @Override
public List<TableField> fetchTableField(DatasourceRequest datasourceRequest) throws DEException { public List<TableField> fetchTableField(DatasourceRequest datasourceRequest) throws DEException {
List<TableField> datasetTableFields = new ArrayList<>(); List<TableField> datasetTableFields = new ArrayList<>();
@ -219,8 +241,9 @@ public class CalciteProvider extends Provider {
ResultSet resultSet = null; ResultSet resultSet = null;
try (ConnectionObj con = getConnection(datasourceRequest.getDatasource()); try (ConnectionObj con = getConnection(datasourceRequest.getDatasource());
Statement statement = getStatement(con.getConnection(), 30)) { Statement statement = getStatement(con.getConnection(), 30)) {
if (DatasourceConfiguration.DatasourceType.valueOf(datasourceSchemaDTO.getType()) == DatasourceConfiguration.DatasourceType.oracle) { if (datasourceRequest.getDatasource().getType().equalsIgnoreCase("mongo") || datasourceRequest.getDatasource().getType().equalsIgnoreCase("doris")) {
statement.executeUpdate("ALTER SESSION SET CURRENT_SCHEMA = " + datasourceConfiguration.getSchema()); resultSet = statement.executeQuery("select * from " + table + " limit 0 offset 0 ");
return fetchResultField(resultSet);
} }
resultSet = statement.executeQuery(getTableFiledSql(datasourceRequest)); resultSet = statement.executeQuery(getTableFiledSql(datasourceRequest));
while (resultSet.next()) { while (resultSet.next()) {
@ -341,7 +364,7 @@ public class CalciteProvider extends Provider {
} }
} }
private Session initSession(DatasourceConfiguration configuration) throws Exception{ private Session initSession(DatasourceConfiguration configuration) throws Exception {
JSch jsch = new JSch(); JSch jsch = new JSch();
Session session = jsch.getSession(configuration.getSshUserName(), configuration.getSshHost(), configuration.getSshPort()); Session session = jsch.getSession(configuration.getSshUserName(), configuration.getSshHost(), configuration.getSshPort());
if (!configuration.getSshType().equalsIgnoreCase("password")) { if (!configuration.getSshType().equalsIgnoreCase("password")) {
@ -359,7 +382,6 @@ public class CalciteProvider extends Provider {
} }
private DatasetTableDTO getTableDesc(DatasourceRequest datasourceRequest, ResultSet resultSet) throws SQLException { private DatasetTableDTO getTableDesc(DatasourceRequest datasourceRequest, ResultSet resultSet) throws SQLException {
DatasetTableDTO tableDesc = new DatasetTableDTO(); DatasetTableDTO tableDesc = new DatasetTableDTO();
tableDesc.setDatasourceId(datasourceRequest.getDatasource().getId()); tableDesc.setDatasourceId(datasourceRequest.getDatasource().getId());
@ -979,10 +1001,10 @@ public class CalciteProvider extends Provider {
switch (datasourceType) { switch (datasourceType) {
case StarRocks: case StarRocks:
case doris: case doris:
case mongo:
tableSqls.add("show tables"); tableSqls.add("show tables");
break; break;
case mysql: case mysql:
case mongo:
case mariadb: case mariadb:
case TiDB: case TiDB:
configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class); configuration = JsonUtil.parseObject(datasourceRequest.getDatasource().getConfiguration(), Mysql.class);