From c0b44753020164f6965bb8bff4e0a6d17a5ea243 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 2 Sep 2024 14:39:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8=E3=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86):=20=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E5=9B=BE=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=80=BB=E9=87=8Flicense=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/chart/server/ChartDataServer.java    | 8 ++++----
 .../dataease/exportCenter/manage/ExportCenterManage.java  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

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 09d4877f16..5f8ccdd674 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
@@ -16,7 +16,7 @@ import io.dataease.exportCenter.manage.ExportCenterManage;
 import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
 import io.dataease.extensions.view.dto.ChartViewDTO;
 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.utils.JsonUtil;
 import io.dataease.utils.LogUtil;
@@ -60,11 +60,11 @@ public class ChartDataServer implements ChartDataApi {
     @Resource
     private DatasetFieldServer datasetFieldServer;
 
-    @Resource(name = "LimitConfig")
-    private LicSt limitConfig;
+    @Resource(name = "f2CLicLimitedManage")
+    private F2CLicLimitedManage f2CLicLimitedManage;
 
     private Integer getExportLimit() {
-        return Math.toIntExact(Math.min(limitConfig.ALLATORIxDEMO(), limit));
+        return Math.toIntExact(Math.min(f2CLicLimitedManage.checkDatasetLimit(), limit));
     }
 
     @Override
diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
index 11b2d20d71..87d40d6f81 100644
--- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
+++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java
@@ -12,7 +12,7 @@ import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.api.dataset.union.UnionDTO;
 import io.dataease.extensions.datasource.api.PluginManageApi;
 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.api.permissions.dataset.dto.DataSetRowPermissionsTreeDTO;
 import io.dataease.auth.bo.TokenUserBO;
@@ -117,8 +117,8 @@ public class ExportCenterManage {
     @Resource
     private DatasetDataManage datasetDataManage;
 
-    @Resource(name = "LimitConfig")
-    private LicSt limitConfig;
+    @Resource(name = "f2CLicLimitedManage")
+    private F2CLicLimitedManage f2CLicLimitedManage;
 
     @PostConstruct
     public void init() {
@@ -153,7 +153,7 @@ public class ExportCenterManage {
     }
 
     private Long getExportLimit() {
-        return Math.min(limitConfig.ALLATORIxDEMO(),limit);
+        return Math.min(f2CLicLimitedManage.checkDatasetLimit(),limit);
     }
 
     public void download(String id, HttpServletResponse response) throws Exception {