diff --git a/.gitignore b/.gitignore
index 1fac4d5..f07a72c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,7 @@ build/
.kotlin
### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
+.idea/
*.iws
*.iml
*.ipr
diff --git a/src/main/java/com/kri/common/excel/ExcelMapper.java b/src/main/java/com/kri/common/excel/ExcelMapper.java
index 8d3ed37..c5eecff 100644
--- a/src/main/java/com/kri/common/excel/ExcelMapper.java
+++ b/src/main/java/com/kri/common/excel/ExcelMapper.java
@@ -15,6 +15,7 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.ss.usermodel.Cell;
@@ -24,6 +25,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.xssf.eventusermodel.XSSFReader;
+import org.apache.poi.xssf.eventusermodel.XSSFReader.SheetIterator;
import org.apache.poi.xssf.model.SharedStringsTable;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -36,11 +38,16 @@ import org.xml.sax.helpers.XMLReaderFactory;
/**
* Excel <-> 객체/맵 변환 유틸리티
*
- * 전제: - DTO 필드는 @ExcelColumn(header = "헤더명", order = 0) 형태로 어노테이션을 단다. - 셀 값 파싱은
- * ExcelUtil.getStringCell(Cell) 사용.
+ * 전제:
+ * - DTO 필드는 @ExcelColumn(header = "헤더명", order = 0) 형태로 어노테이션을 단다.
+ * - 셀 값 파싱은 ExcelUtil.getStringCell(Cell) 사용.
*/
public final class ExcelMapper {
+ private static final String DEFAULT_SHEET_NAME = "Sheet1";
+ private static final int DEFAULT_SHEET_INDEX = 0;
+ private static final int DEFAULT_HEADER_ROW_INDEX = 1;
+
private ExcelMapper() {
// 유틸 클래스 - 인스턴스 생성 방지
}
@@ -50,65 +57,81 @@ public final class ExcelMapper {
* ========================================================= */
public static Workbook writeToWorkbook(List data, Class clazz) {
- return writeToWorkbook(data, clazz, 1);
+ return writeToWorkbook(data, clazz, DEFAULT_SHEET_NAME, DEFAULT_HEADER_ROW_INDEX);
}
public static Workbook writeToWorkbook(List data, Class clazz, int headerRowIndex) {
- validateHeaderRowIndex(headerRowIndex);
+ return writeToWorkbook(data, clazz, DEFAULT_SHEET_NAME, headerRowIndex);
+ }
+ public static Workbook writeToWorkbook(List data, Class clazz, String sheetName) {
+ return writeToWorkbook(data, clazz, sheetName, DEFAULT_HEADER_ROW_INDEX);
+ }
+
+ public static Workbook writeToWorkbook(
+ List data,
+ Class clazz,
+ String sheetName,
+ int headerRowIndex
+ ) {
Workbook workbook = new XSSFWorkbook();
- Sheet sheet = workbook.createSheet("Sheet1");
-
- // 1) @ExcelColumn 기반 메타 수집
- List fields = getExcelFields(clazz);
-
- // 2) 헤더 작성
- int headerRowNum = toPoiRowIndex(headerRowIndex);
- Row headerRow = sheet.createRow(headerRowNum);
- for (ExcelFieldMeta meta : fields) {
- Cell cell = headerRow.createCell(meta.order());
- cell.setCellValue(meta.header());
- }
-
- // 3) 데이터 작성
- int rowIndex = headerRowNum + 1;
- if (data != null) {
- for (T item : data) {
- Row row = sheet.createRow(rowIndex++);
- for (ExcelFieldMeta meta : fields) {
- Cell cell = row.createCell(meta.order());
- Object value = meta.getValue(item);
- cell.setCellValue(value != null ? value.toString() : "");
- }
- }
- }
-
- // 4) 자동 너비 조정
- for (ExcelFieldMeta meta : fields) {
- if (meta.width() > 0) {
- sheet.setColumnWidth(meta.order(), meta.width() * 256);
- } else {
- sheet.autoSizeColumn(meta.order());
- }
- }
-
+ appendSheetToWorkbook(workbook, data, clazz, sheetName, headerRowIndex);
return workbook;
}
+ public static Workbook writeToWorkbook(
+ List data,
+ Class clazz,
+ int headerRowIndex,
+ String sheetName
+ ) {
+ return writeToWorkbook(data, clazz, sheetName, headerRowIndex);
+ }
+
+ public static void appendSheetToWorkbook(
+ Workbook workbook,
+ List data,
+ Class clazz,
+ String sheetName,
+ int headerRowIndex
+ ) {
+ Sheet sheet = createSheetOrThrow(workbook, sheetName);
+ writeDtoSheet(sheet, data, clazz, headerRowIndex, true);
+ }
+
/* =========================================================
* 2. Workbook -> List (in-memory 읽기)
* ========================================================= */
public static List readFromWorkbook(Workbook workbook, Class clazz) {
- return readFromWorkbook(workbook, clazz, 1);
+ return readFromWorkbook(workbook, clazz, DEFAULT_SHEET_INDEX, DEFAULT_HEADER_ROW_INDEX);
}
public static List readFromWorkbook(Workbook workbook, Class clazz, int headerRowIndex) {
+ return readFromWorkbook(workbook, clazz, DEFAULT_SHEET_INDEX, headerRowIndex);
+ }
+
+ public static List readFromWorkbook(
+ Workbook workbook,
+ Class clazz,
+ String sheetName,
+ int headerRowIndex
+ ) {
+ return readFromSheet(getSheetByNameOrThrow(workbook, sheetName), clazz, headerRowIndex);
+ }
+
+ public static List readFromWorkbook(
+ Workbook workbook,
+ Class clazz,
+ int sheetIndex,
+ int headerRowIndex
+ ) {
+ return readFromSheet(getSheetByIndexOrThrow(workbook, sheetIndex), clazz, headerRowIndex);
+ }
+
+ private static List readFromSheet(Sheet sheet, Class clazz, int headerRowIndex) {
validateHeaderRowIndex(headerRowIndex);
- Sheet sheet = workbook.getSheetAt(0);
-
- // 1) 헤더 행
int headerRowNum = toPoiRowIndex(headerRowIndex);
Row headerRow = sheet.getRow(headerRowNum);
if (headerRow == null) {
@@ -127,10 +150,7 @@ public final class ExcelMapper {
}
}
- // 2) DTO 필드 메타
List fields = getExcelFields(clazz);
-
- // 3) 데이터 행 -> DTO
List result = new ArrayList<>();
int lastRowNum = sheet.getLastRowNum();
@@ -151,7 +171,6 @@ public final class ExcelMapper {
Cell cell = row.getCell(colIdx);
String cellValue = ExcelUtil.getStringCell(cell);
-
if (cellValue != null) {
setFieldValue(instance, meta.field(), cellValue);
}
@@ -171,13 +190,31 @@ public final class ExcelMapper {
* ========================================================= */
public static List