提交 c74e3863 authored 作者: taojinlong's avatar taojinlong

fix: 识别es 数据类型

上级 fb9ccc05
...@@ -49,11 +49,12 @@ public class EsProvider extends DatasourceProvider { ...@@ -49,11 +49,12 @@ public class EsProvider extends DatasourceProvider {
List<String[]> list = new LinkedList<>(); List<String[]> list = new LinkedList<>();
try { try {
EsConfigDTO esConfigDTO = new Gson().fromJson(dsr.getDatasource().getConfiguration(), EsConfigDTO.class); EsConfigDTO esConfigDTO = new Gson().fromJson(dsr.getDatasource().getConfiguration(), EsConfigDTO.class);
HttpClientConfig httpClientConfig = new HttpClientConfig(); HttpClientConfig httpClientConfig = new HttpClientConfig();
if(StringUtils.isNotEmpty(esConfigDTO.getUsername())){
String auth = esConfigDTO.getUsername() + ":" + esConfigDTO.getPassword(); String auth = esConfigDTO.getUsername() + ":" + esConfigDTO.getPassword();
byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8)); byte[] encodedAuth = Base64.encodeBase64(auth.getBytes(StandardCharsets.UTF_8));
httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth)); httpClientConfig.addHeader(HttpHeaders.AUTHORIZATION, "Basic " + new String(encodedAuth));
}
Requst requst = new Requst(); Requst requst = new Requst();
requst.setQuery(dsr.getQuery()); requst.setQuery(dsr.getQuery());
requst.setFetch_size(dsr.getFetchSize()); requst.setFetch_size(dsr.getFetchSize());
......
...@@ -151,7 +151,7 @@ public class EsQueryProvider extends QueryProvider { ...@@ -151,7 +151,7 @@ public class EsQueryProvider extends QueryProvider {
String cast = String.format(EsSqlLConstants.CAST, originField, "timestamp"); String cast = String.format(EsSqlLConstants.CAST, originField, "timestamp");
fieldName = String.format(EsSqlLConstants.DATETIME_FORMAT, cast, EsSqlLConstants.DEFAULT_DATE_FORMAT); fieldName = String.format(EsSqlLConstants.DATETIME_FORMAT, cast, EsSqlLConstants.DEFAULT_DATE_FORMAT);
} else if (f.getDeType() == DeTypeConstants.DE_INT) { } else if (f.getDeType() == DeTypeConstants.DE_INT) {
fieldName = String.format(EsSqlLConstants.CAST, originField, "timestamp"); fieldName = String.format(EsSqlLConstants.CAST, originField, "bigint");
} else { } else {
fieldName = originField; fieldName = originField;
} }
......
...@@ -504,12 +504,8 @@ public class DataSetTableService { ...@@ -504,12 +504,8 @@ public class DataSetTableService {
QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds)); datasourceRequest.setQuery(qp.createQuerySQLWithPage(table, fields, page, pageSize, realSize, false, ds));
map.put("sql", datasourceRequest.getQuery()); map.put("sql", datasourceRequest.getQuery());
System.out.println(datasourceRequest.getQuery());
try { try {
data.addAll(jdbcProvider.getData(datasourceRequest)); data.addAll(jdbcProvider.getData(datasourceRequest));
for(int i=0;i< data.size(); i++){
System.out.println(data.get(i)[2]);
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
DEException.throwException(e.getMessage()); DEException.throwException(e.getMessage());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论