diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java index f20a110..4b478d6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyExportNewHandler.java @@ -56,8 +56,10 @@ public class EmergencyExportNewHandler implements ExcelExportHandler respList = new ArrayList<>(sourceList.size()); + List imgUrls = new ArrayList<>(4); // 合并图片收集+下载,减少一次全量遍历 for (EmergencyTaskRespVO task : sourceList) { + imgUrls.clear(); // 清空复用 EmergencyTaskExcleNewRespVO vo = new EmergencyTaskExcleNewRespVO(); // 全局行号,跨分片连续不重复 vo.setTaskNo(String.valueOf(startIndex++)); @@ -82,7 +84,7 @@ public class EmergencyExportNewHandler implements ExcelExportHandler emergencyImgs = Optional.ofNullable(task.getEmergencyImg()).orElse(Collections.emptyList()); List endImgs = Optional.ofNullable(task.getEmergencyEndImg()).orElse(Collections.emptyList()); - List imgUrls = new ArrayList<>(4); + imgUrls.add(ImgDownUtils.getImgSafe(emergencyImgs, 0)); imgUrls.add(ImgDownUtils.getImgSafe(emergencyImgs, 1)); imgUrls.add(ImgDownUtils.getImgSafe(emergencyImgs, 2)); diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/filedownload/ExcelExportAsyncService.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/filedownload/ExcelExportAsyncService.java index 155b188..771200f 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/filedownload/ExcelExportAsyncService.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/filedownload/ExcelExportAsyncService.java @@ -29,7 +29,7 @@ public class ExcelExportAsyncService { @Value("${file.upload-local.expire-days}") private Integer expireDay; - public static final int BATCH_SIZE = 500; + public static final int BATCH_SIZE = 50; private final FileDownloadMapper fileDownloadMapper;