From 6f71f97ddc70c2ed92da1e8680ce7e86f2fe1689 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 10 Jul 2024 16:23:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/report/reader/DeliveryDetailReader.java | 2 +- .../src/main/java/com/logpm/report/util/ReportExcelUtil.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java index c71a83ca4..7774621c8 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/reader/DeliveryDetailReader.java @@ -38,7 +38,7 @@ public class DeliveryDetailReader implements ExportReader { @Override public List findList(Page page, Wrapper query) { - return asyncService.getdetailPages(page, query, Convert.toInt(page.getCurrent()), Convert.toInt(page.getTotal())); + return asyncService.getdetailPages(page, query, Convert.toInt(page.getCurrent()), Convert.toInt(page.getSize())); } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java index 3c295715d..1cd0d4a38 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/util/ReportExcelUtil.java @@ -116,8 +116,6 @@ public class ReportExcelUtil { int findNum = (int) Math.ceil((count / pageSize.doubleValue())); // 封装查询后需要导出的数据 Map> pageMap = new ConcurrentHashMap<>(ReportConstants.HASHMAP_DEFAULT_SIZE); - // 定义线程池，大表导出使用一个线程池 - ExecutorService executorService = ThreadPoolUtil.getThreadPool(); // 控制线程全部查询完后执行导出操作 CountDownLatch countDownLatch = new CountDownLatch(findNum); ExcelWriter excelWriter = null; @@ -128,7 +126,6 @@ public class ReportExcelUtil { e.printStackTrace(); } int num = 0; - List> futures = new ArrayList<>(); for (int i = 0; i < sheetNum; i++) { // sheet编号 int finalI = i + 1;