From 89ff614e171b437a6a702dd0a3486fe9a388e22a Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 27 Apr 2021 17:50:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=B0doris?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index a7f579a610..d996ee8780 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -7,6 +7,7 @@ import io.dataease.base.domain.*; import io.dataease.base.mapper.ChartViewMapper; import io.dataease.commons.utils.AuthUtils; import io.dataease.commons.utils.BeanUtils; +import io.dataease.commons.utils.CommonBeanFactory; import io.dataease.controller.request.chart.ChartExtFilterRequest; import io.dataease.controller.request.chart.ChartExtRequest; import io.dataease.controller.request.chart.ChartViewRequest; @@ -149,7 +150,7 @@ public class ChartViewService { // data = sparkCalc.getData(table.getId(), fields, xAxis, yAxis, "tmp_" + view.getId().split("-")[0], extFilterList); // 连接doris，构建doris数据源查询 - Datasource ds = dorisDatasource(); + Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource"); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); DatasourceRequest datasourceRequest = new DatasourceRequest(); datasourceRequest.setDatasource(ds); @@ -245,24 +246,6 @@ public class ChartViewService { return filter.toString(); } - public Datasource dorisDatasource() { - JSONObject jsonObject = new JSONObject(); - jsonObject.put("dataSourceType", "jdbc"); - jsonObject.put("dataBase", "example_db"); - jsonObject.put("username", "root"); - jsonObject.put("password", "dataease"); - jsonObject.put("host", "59.110.64.159"); - jsonObject.put("port", "9030"); - - Datasource datasource = new Datasource(); - datasource.setId("doris"); - datasource.setName("doris"); - datasource.setDesc("doris"); - datasource.setType("mysql"); - datasource.setConfiguration(jsonObject.toJSONString()); - return datasource; - } - public String getSQL(String type, String table, List xAxis, List yAxis, List extFilterRequestList) { DatasourceTypes datasourceType = DatasourceTypes.valueOf(type); switch (datasourceType) {