public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 接口计算字段加密

Browse Source
This commit is contained in:
junjun
2025-04-10 16:33:57 +08:00
committed by 王嘉豪
parent 65e4cff70e
commit c8f2108dbd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@@ -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<ChartViewFieldDTO> getSizeField(ChartViewDTO view) throws Exception {

7
core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
View File

@@ -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));