center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: es 数据源添加表

Browse Source
This commit is contained in:
taojinlong 2022-04-05 21:57:43 +08:00
parent 8ec3e7f837
commit fbb2651832
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/provider/datasource/EsProvider.java
View File

@ -13,6 +13,7 @@ import io.dataease.dto.datasource.TableDesc;
import io.dataease.dto.datasource.TableField; import io.dataease.dto.datasource.TableField;
import io.dataease.exception.DataEaseException; import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
import io.dataease.plugins.common.constants.EsSqlLConstants;
import io.dataease.provider.query.es.EsQueryProvider; import io.dataease.provider.query.es.EsQueryProvider;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -97,7 +98,7 @@ public class EsProvider extends DatasourceProvider {
@Override @Override
public List<TableField> getTableFileds(DatasourceRequest datasourceRequest) throws Exception { public List<TableField> getTableFileds(DatasourceRequest datasourceRequest) throws Exception {
datasourceRequest.setQuery("desc " + datasourceRequest.getTable()); datasourceRequest.setQuery("desc " + String.format(EsSqlLConstants.KEYWORD_TABLE, datasourceRequest.getTable()));
List<TableField> tableFields = new ArrayList<>(); List<TableField> tableFields = new ArrayList<>();
try { try {
String response = exexQuery(datasourceRequest, datasourceRequest.getQuery(), "?format=json"); String response = exexQuery(datasourceRequest, datasourceRequest.getQuery(), "?format=json");
@ -292,6 +293,7 @@ public class EsProvider extends DatasourceProvider {
Request request = new Request(); Request request = new Request();
request.setQuery(sql); request.setQuery(sql);
request.setFetch_size(datasourceRequest.getFetchSize()); request.setFetch_size(datasourceRequest.getFetchSize());
System.out.println(new Gson().toJson(request));
String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri; String url = esConfiguration.getUrl().endsWith("/") ? esConfiguration.getUrl() + uri : esConfiguration.getUrl() + "/" + uri;
String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig); String response = HttpClientUtil.post(url, new Gson().toJson(request), httpClientConfig);
return response; return response;