czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.数据报表导出cpu拉高问题修复

Browse Source
This commit is contained in:
SongZhang
2024-08-13 10:59:27 +08:00
parent fd5b79d6ec
commit e53037232f
6 changed files with 78 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eladmin-common/src/main/java/cn/ysk/cashier/utils/FileUtil.java
View File

@@ -41,6 +41,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentLinkedQueue;
/**
* File工具类，扩展 hutool 工具包
@@ -270,7 +271,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
}
}
public static void downloadExcelAndMerge(List<Map<String, Object>> list, int colSize, HttpServletResponse response, ArrayList<Integer> mergeRowIndex) throws IOException {
public static void downloadExcelAndMerge(ConcurrentLinkedQueue<Map<String, Object>> list, int colSize, HttpServletResponse response, List<Integer> mergeRowIndex) throws IOException {
String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
File file = new File(tempPath);
ExcelWriter writer = ExcelUtil.getWriter(file);