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

Merge pull request #11902 from dataease/pr@dev-v2@refactor_export-limit

Browse Source 
refactor(图表、数据集): 增加数据集图表导出数据总量license校验
This commit is contained in:
王嘉豪 2024-09-02 14:40:48 +08:00 committed by GitHub
commit 3553df0990
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ import io.dataease.exportCenter.manage.ExportCenterManage;
import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO; import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
import io.dataease.extensions.view.dto.ChartViewDTO; import io.dataease.extensions.view.dto.ChartViewDTO;
import io.dataease.extensions.view.dto.ChartViewFieldDTO; import io.dataease.extensions.view.dto.ChartViewFieldDTO;
import io.dataease.license.config.LicSt; import io.dataease.license.manage.F2CLicLimitedManage;
import io.dataease.result.ResultCode; import io.dataease.result.ResultCode;
import io.dataease.utils.JsonUtil; import io.dataease.utils.JsonUtil;
import io.dataease.utils.LogUtil; import io.dataease.utils.LogUtil;
@ -60,11 +60,11 @@ public class ChartDataServer implements ChartDataApi {
@Resource @Resource
private DatasetFieldServer datasetFieldServer; private DatasetFieldServer datasetFieldServer;
@Resource(name = "LimitConfig") @Resource(name = "f2CLicLimitedManage")
private LicSt limitConfig; private F2CLicLimitedManage f2CLicLimitedManage;
private Integer getExportLimit() { private Integer getExportLimit() {
return Math.toIntExact(Math.min(limitConfig.ALLATORIxDEMO(), limit)); return Math.toIntExact(Math.min(f2CLicLimitedManage.checkDatasetLimit(), limit));
} }
@Override @Override

8
core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
View File

@ -12,7 +12,7 @@ import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
import io.dataease.api.dataset.union.UnionDTO; import io.dataease.api.dataset.union.UnionDTO;
import io.dataease.extensions.datasource.api.PluginManageApi; import io.dataease.extensions.datasource.api.PluginManageApi;
import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj; import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj;
import io.dataease.license.config.LicSt; import io.dataease.license.manage.F2CLicLimitedManage;
import io.dataease.model.ExportTaskDTO; import io.dataease.model.ExportTaskDTO;
import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO; import io.dataease.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
import io.dataease.auth.bo.TokenUserBO; import io.dataease.auth.bo.TokenUserBO;
@ -117,8 +117,8 @@ public class ExportCenterManage {
@Resource @Resource
private DatasetDataManage datasetDataManage; private DatasetDataManage datasetDataManage;
@Resource(name = "LimitConfig") @Resource(name = "f2CLicLimitedManage")
private LicSt limitConfig; private F2CLicLimitedManage f2CLicLimitedManage;
@PostConstruct @PostConstruct
public void init() { public void init() {
@ -153,7 +153,7 @@ public class ExportCenterManage {
} }
private Long getExportLimit() { private Long getExportLimit() {
return Math.min(limitConfig.ALLATORIxDEMO(),limit); return Math.min(f2CLicLimitedManage.checkDatasetLimit(),limit);
} }
public void download(String id, HttpServletResponse response) throws Exception { public void download(String id, HttpServletResponse response) throws Exception {