diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java b/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java index 4f6fed9f0b..1602341ddb 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java @@ -1,7 +1,9 @@ package io.dataease.commons.utils; +import java.io.BufferedOutputStream; import java.io.File; +import cn.hutool.core.io.FileUtil; import io.dataease.commons.model.excel.ExcelSheetModel; import java.util.List; @@ -9,29 +11,24 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.CellStyle; -import org.apache.poi.ss.usermodel.FillPatternType; -import org.apache.poi.ss.usermodel.Font; -import org.apache.poi.ss.usermodel.IndexedColors; + +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; public class ExcelUtils { - private static final String suffix = ".xls"; + private static final String suffix = ".xlsx"; public static File exportExcel(List sheets, String fileName) throws Exception { AtomicReference realFileName = new AtomicReference<>(fileName); - HSSFWorkbook wb = new HSSFWorkbook(); + Workbook wb = new XSSFWorkbook(); sheets.forEach(sheet -> { List> details = sheet.getData(); details.add(0, sheet.getHeads()); String sheetName = sheet.getSheetName(); - HSSFSheet curSheet = wb.createSheet(sheetName); + Sheet curSheet = wb.createSheet(sheetName); if (StringUtils.isBlank(fileName)) { String cName = sheetName + suffix; realFileName.set(cName); @@ -47,11 +44,11 @@ public class ExcelUtils { if (CollectionUtils.isNotEmpty(details)) { for (int i = 0; i < details.size(); i++) { - HSSFRow row = curSheet.createRow(i); + Row row = curSheet.createRow(i); List rowData = details.get(i); if (rowData != null) { for (int j = 0; j < rowData.size(); j++) { - HSSFCell cell = row.createCell(j); + Cell cell = row.createCell(j); cell.setCellValue(rowData.get(j)); if (i == 0) {// 头部 cell.setCellStyle(cellStyle); @@ -67,7 +64,17 @@ public class ExcelUtils { realFileName.set(realFileName.get() + suffix); } File result = new File("/opt/dataease/data/" + realFileName.get()); - wb.write(result); + BufferedOutputStream outputStream = FileUtil.getOutputStream(result); + try { + wb.write(outputStream); + } catch (Exception e) { + LogUtil.error(e.getMessage(), e); + throw e; + } finally { + wb.close(); + outputStream.flush(); + outputStream.close(); + } return result; }