From c8f2108dbdad1ddac7c6bd277c06bc493433fd80 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 10 Apr 2025 16:33:57 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=8E=A5=E5=8F=A3=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=AD=97=E6=AE=B5=E5=8A=A0=E5=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/manage/ChartDataManage.java | 6 +----- .../java/io/dataease/chart/server/ChartDataServer.java | 7 ++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index e9ccad6695..85ecb18e28 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -77,7 +77,6 @@ public class ChartDataManage { private static final Logger logger = LoggerFactory.getLogger(ChartDataManage.class); public ChartViewDTO calcData(ChartViewDTO view) throws Exception { - DatasetUtils.viewDecode(view); ChartExtRequest chartExtRequest = view.getChartExtRequest(); if (chartExtRequest == null) { chartExtRequest = new ChartExtRequest(); @@ -419,10 +418,7 @@ public class ChartDataManage { } ChartCalcDataResult calcResult = chartHandler.calcChartResult(view, formatResult, filterResult, sqlMap, sqlMeta, provider); - ChartViewDTO chartViewDTO = chartHandler.buildChart(view, calcResult, formatResult, filterResult); - DatasetUtils.viewEncode(chartViewDTO); - encodeData(chartViewDTO); - return chartViewDTO; + return chartHandler.buildChart(view, calcResult, formatResult, filterResult); } private List getSizeField(ChartViewDTO view) throws Exception { diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index d470fc1709..99ea1262dd 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -13,6 +13,7 @@ import io.dataease.constant.CommonConstants; import io.dataease.dataset.manage.PermissionManage; import io.dataease.dataset.server.DatasetFieldServer; import io.dataease.constant.DeTypeConstants; +import io.dataease.dataset.utils.DatasetUtils; import io.dataease.exception.DEException; import io.dataease.exportCenter.manage.ExportCenterManage; import io.dataease.exportCenter.util.ExportCenterUtils; @@ -84,7 +85,11 @@ public class ChartDataServer implements ChartDataApi { if (CommonConstants.VIEW_DATA_FROM.TEMPLATE.equalsIgnoreCase(chartViewDTO.getDataFrom())) { return extendDataManage.getChartDataInfo(chartViewDTO.getId(), chartViewDTO); } else { - return chartDataManage.calcData(chartViewDTO); + DatasetUtils.viewDecode(chartViewDTO); + ChartViewDTO dto = chartDataManage.calcData(chartViewDTO); + DatasetUtils.viewEncode(dto); + chartDataManage.encodeData(dto); + return dto; } } catch (Exception e) { DEException.throwException(ResultCode.DATA_IS_WRONG.code(), e.getMessage() + "\n\n" + ExceptionUtils.getStackTrace(e));