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

Merge pull request #12691 from dataease/dev-v2@fixexportdata

Browse Source 
fix:  数据导出超过100w时，分多个sheet
This commit is contained in:
taojinlong 2024-10-14 16:04:00 +08:00 committed by GitHub
commit 44e4b53f00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ import io.dataease.extensions.view.dto.DatasetRowPermissionsTreeObj;
import io.dataease.i18n.Translator; import io.dataease.i18n.Translator;
import io.dataease.license.config.XpackInteract; import io.dataease.license.config.XpackInteract;
import io.dataease.license.manage.F2CLicLimitedManage; import io.dataease.license.manage.F2CLicLimitedManage;
import io.dataease.license.utils.LicenseUtil;
import io.dataease.model.ExportTaskDTO; import io.dataease.model.ExportTaskDTO;
import io.dataease.system.manage.CoreUserManage; import io.dataease.system.manage.CoreUserManage;
import io.dataease.system.manage.SysParameterManage; import io.dataease.system.manage.SysParameterManage;
@ -422,6 +423,7 @@ public class ExportCenterManage implements BaseExportApi {
TokenUserBO tokenUserBO = AuthUtils.getUser(); TokenUserBO tokenUserBO = AuthUtils.getUser();
Future future = scheduledThreadPoolExecutor.submit(() -> { Future future = scheduledThreadPoolExecutor.submit(() -> {
LicenseUtil.validate();
AuthUtils.setUser(tokenUserBO); AuthUtils.setUser(tokenUserBO);
try { try {
exportTask.setExportStatus("IN_PROGRESS"); exportTask.setExportStatus("IN_PROGRESS");
@ -588,7 +590,7 @@ public class ExportCenterManage implements BaseExportApi {
} }
} }
exportTask.setExportStatus("IN_PROGRESS"); exportTask.setExportStatus("IN_PROGRESS");
double exportRogress2 = (double) ((double) s / (double) sheetCount); double exportRogress2 = (double) ((double) s - 1 / (double) sheetCount);
double exportRogress = (double) ((double) p / (double) pageSize) * ((double) 1 / sheetCount); double exportRogress = (double) ((double) p / (double) pageSize) * ((double) 1 / sheetCount);
DecimalFormat df = new DecimalFormat("#.##"); DecimalFormat df = new DecimalFormat("#.##");
String formattedResult = df.format((exportRogress + exportRogress2) * 100); String formattedResult = df.format((exportRogress + exportRogress2) * 100);