{
*
*
* 1. 当前行游标归零
- * 2. 清空别名比较器
- * 3. 清除标题缓存
+ * 2. 清除标题缓存
*
*
* @return this
*/
public ExcelWriter reset() {
- resetRow();
- return this;
+ this.headLocationCache.clear();
+ return resetRow();
}
/**
@@ -250,6 +248,7 @@ public class ExcelWriter extends ExcelBase {
* @return this
* @since 4.0.12
*/
+ @SuppressWarnings("resource")
public ExcelWriter autoSizeColumnAll(final boolean useMergedCells, final float widthRatio) {
final int columnCount = this.getColumnCount();
for (int i = 0; i < columnCount; i++) {
@@ -379,13 +378,14 @@ public class ExcelWriter extends ExcelBase {
}
/**
- * 设置写出的目标文件
+ * 设置写出的目标文件
+ * 注意这个文件不能存在，存在则{@link #flush()}时会被覆盖
*
- * @param destFile 目标文件
+ * @param targetFile 目标文件
* @return this
*/
- public ExcelWriter setDestFile(final File destFile) {
- this.targetFile = destFile;
+ public ExcelWriter setTargetFile(final File targetFile) {
+ this.targetFile = targetFile;
return this;
}
@@ -600,6 +600,7 @@ public class ExcelWriter extends ExcelBase {
* @return this
* @since 4.0.10
*/
+ @SuppressWarnings("resource")
public ExcelWriter merge(final int lastColumn, final Object content, final boolean isSetHeaderStyle) {
Assert.isFalse(this.isClosed, "ExcelWriter has been closed!");
@@ -696,6 +697,7 @@ public class ExcelWriter extends ExcelBase {
* @param isWriteKeyAsHead 是否强制写出标题行（Map或Bean）
* @return this
*/
+ @SuppressWarnings("resource")
public ExcelWriter write(final Iterable data, final boolean isWriteKeyAsHead) {
Assert.isFalse(this.isClosed, "ExcelWriter has been closed!");
boolean isFirst = true;
@@ -723,7 +725,7 @@ public class ExcelWriter extends ExcelBase {
* @return this
* @since 3.2.3
*/
- @SuppressWarnings({"rawtypes", "unchecked"})
+ @SuppressWarnings({"rawtypes", "unchecked", "resource"})
public ExcelWriter write(final Iterable data, final Comparator comparator) {
Assert.isFalse(this.isClosed, "ExcelWriter has been closed!");
boolean isFirstRow = true;
@@ -787,7 +789,7 @@ public class ExcelWriter extends ExcelBase {
* @author vhukze
* @since 6.0.0
*/
- public ExcelWriter writeImg(final File imgFile, final int imgType, final SimpleClientAnchor clientAnchor) {
+ public ExcelWriter writeImg(final File imgFile, final ExcelImgType imgType, final SimpleClientAnchor clientAnchor) {
return writeImg(FileUtil.readBytes(imgFile), imgType, clientAnchor);
}
@@ -802,12 +804,8 @@ public class ExcelWriter extends ExcelBase {
* @author vhukze
* @since 6.0.0
*/
- public ExcelWriter writeImg(final byte[] pictureData, final int imgType, final SimpleClientAnchor clientAnchor) {
- final Drawing patriarch = this.sheet.createDrawingPatriarch();
- final ClientAnchor anchor = this.workbook.getCreationHelper().createClientAnchor();
- clientAnchor.copyTo(anchor);
-
- patriarch.createPicture(anchor, this.workbook.addPicture(pictureData, imgType));
+ public ExcelWriter writeImg(final byte[] pictureData, final ExcelImgType imgType, final SimpleClientAnchor clientAnchor) {
+ ExcelImgUtil.writeImg(this.sheet, pictureData, imgType, clientAnchor);
return this;
}
@@ -844,34 +842,8 @@ public class ExcelWriter extends ExcelBase {
* @return this
* @since 6.0.0
*/
- public ExcelWriter writeSimpleShape(final SimpleClientAnchor clientAnchor, ShapeConfig shapeConfig) {
- final Drawing patriarch = this.sheet.createDrawingPatriarch();
- final ClientAnchor anchor = this.workbook.getCreationHelper().createClientAnchor();
- clientAnchor.copyTo(anchor);
-
- if (null == shapeConfig) {
- shapeConfig = ShapeConfig.of();
- }
- final Color lineColor = shapeConfig.getLineColor();
- if (patriarch instanceof HSSFPatriarch) {
- final HSSFSimpleShape simpleShape = ((HSSFPatriarch) patriarch).createSimpleShape((HSSFClientAnchor) anchor);
- simpleShape.setShapeType(shapeConfig.getShapeType().ooxmlId);
- simpleShape.setLineStyle(shapeConfig.getLineStyle().getValue());
- simpleShape.setLineWidth(shapeConfig.getLineWidth());
- if (null != lineColor) {
- simpleShape.setLineStyleColor(lineColor.getRed(), lineColor.getGreen(), lineColor.getBlue());
- }
- } else if (patriarch instanceof XSSFDrawing) {
- final XSSFSimpleShape simpleShape = ((XSSFDrawing) patriarch).createSimpleShape((XSSFClientAnchor) anchor);
- simpleShape.setShapeType(shapeConfig.getShapeType().ooxmlId);
- simpleShape.setLineStyle(shapeConfig.getLineStyle().getValue());
- simpleShape.setLineWidth(shapeConfig.getLineWidth());
- if (null != lineColor) {
- simpleShape.setLineStyleColor(lineColor.getRed(), lineColor.getGreen(), lineColor.getBlue());
- }
- } else {
- throw new UnsupportedOperationException("Unsupported patriarch type: " + patriarch.getClass().getName());
- }
+ public ExcelWriter writeSimpleShape(final SimpleClientAnchor clientAnchor, final ShapeConfig shapeConfig) {
+ SimpleShapeUtil.writeSimpleShape(this.sheet, clientAnchor, shapeConfig);
return this;
}
// endregion
@@ -914,6 +886,7 @@ public class ExcelWriter extends ExcelBase {
* @param rowData 一行的数据
* @return this
*/
+ @SuppressWarnings("resource")
public ExcelWriter writeSecHeadRow(final Iterable rowData) {
final Row row = RowUtil.getOrCreateRow(this.sheet, this.currentRow.getAndIncrement());
final Iterator iterator = rowData.iterator();
@@ -994,6 +967,7 @@ public class ExcelWriter extends ExcelBase {
* @param isWriteKeyAsHead 为true写出两行，Map的keys做为一行，values做为第二行，否则只写出一行values
* @return this
*/
+ @SuppressWarnings("resource")
public ExcelWriter writeRow(final Map rowMap, final boolean isWriteKeyAsHead) {
Assert.isFalse(this.isClosed, "ExcelWriter has been closed!");
if (MapUtil.isEmpty(rowMap)) {
@@ -1001,7 +975,7 @@ public class ExcelWriter extends ExcelBase {
return passCurrentRow();
}
- final Table aliasTable = aliasTable(rowMap);
+ final Table aliasTable = this.config.aliasTable(rowMap);
if (isWriteKeyAsHead) {
// 写出标题行，并记录标题别名和列号的关系
writeHeadRow(aliasTable.columnKeys());
@@ -1075,6 +1049,7 @@ public class ExcelWriter extends ExcelBase {
* @param isWriteKeyAsHead 是否将Map的Key作为表头输出，如果为True第一行为表头，紧接着为values
* @return this
*/
+ @SuppressWarnings("resource")
public ExcelWriter writeCol(final Map> colMap, int startColIndex, final boolean isWriteKeyAsHead) {
for (final Object k : colMap.keySet()) {
final Iterable v = colMap.get(k);
@@ -1112,6 +1087,7 @@ public class ExcelWriter extends ExcelBase {
* @param isResetRowIndex 如果为true，写入完毕后Row index 将会重置为写入之前的未知，如果为false，写入完毕后Row index将会在写完的数据下方
* @return this
*/
+ @SuppressWarnings("resource")
public ExcelWriter writeCol(final Object headerVal, final int colIndex, final Iterable colData, final boolean isResetRowIndex) {
Assert.isFalse(this.isClosed, "ExcelWriter has been closed!");
int currentRowIndex = currentRow.get();
@@ -1297,7 +1273,7 @@ public class ExcelWriter extends ExcelBase {
/**
* 将Excel Workbook刷出到预定义的文件
* 如果用户未自定义输出的文件，将抛出{@link NullPointerException}
- * 预定义文件可以通过{@link #setDestFile(File)} 方法预定义，或者通过构造定义
+ * 预定义文件可以通过{@link #setTargetFile(File)} 方法预定义，或者通过构造定义
*
* @return this
* @throws IORuntimeException IO异常
@@ -1360,6 +1336,7 @@ public class ExcelWriter extends ExcelBase {
* 关闭工作簿
* 如果用户设定了目标文件，先写出目标文件后给关闭工作簿
*/
+ @SuppressWarnings("resource")
@Override
public void close() {
if (null != this.targetFile) {
@@ -1378,36 +1355,4 @@ public class ExcelWriter extends ExcelBase {
// 清空对象
this.styleSet = null;
}
-
- // region ----- Private method start
-
- /**
- * 为指定的key列表添加标题别名，如果没有定义key的别名，在onlyAlias为false时使用原key
- * key为别名，value为字段值
- *
- * @param rowMap 一行数据
- * @return 别名列表
- */
- private Table aliasTable(final Map rowMap) {
- final Table filteredTable = new RowKeyTable<>(new LinkedHashMap<>(), TableMap::new);
- final Map headerAlias = this.config.getHeaderAlias();
- final boolean onlyAlias = this.config.onlyAlias;
- if (MapUtil.isEmpty(headerAlias)) {
- rowMap.forEach((key, value) -> filteredTable.put(key, key, value));
- } else {
- rowMap.forEach((key, value) -> {
- final String aliasName = headerAlias.get(StrUtil.toString(key));
- if (null != aliasName) {
- // 别名键值对加入
- filteredTable.put(key, aliasName, value);
- } else if (!onlyAlias) {
- // 保留无别名设置的键值对
- filteredTable.put(key, key, value);
- }
- });
- }
-
- return filteredTable;
- }
- // endregion
}
diff --git a/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SimpleShapeUtil.java b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SimpleShapeUtil.java
new file mode 100644
index 000000000..5a4be7cfa
--- /dev/null
+++ b/hutool-poi/src/main/java/org/dromara/hutool/poi/excel/writer/SimpleShapeUtil.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024. looly(loolly@aliyun.com)
+ * Hutool is licensed under Mulan PSL v2.
+ * You can use this software according to the terms and conditions of the Mulan PSL v2.
+ * You may obtain a copy of Mulan PSL v2 at:
+ * https://license.coscl.org.cn/MulanPSL2
+ * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+ * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+ * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+ * See the Mulan PSL v2 for more details.
+ */
+
+package org.dromara.hutool.poi.excel.writer;
+
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFPatriarch;
+import org.apache.poi.hssf.usermodel.HSSFSimpleShape;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDrawing;
+import org.apache.poi.xssf.usermodel.XSSFSimpleShape;
+import org.dromara.hutool.poi.excel.SimpleClientAnchor;
+import org.dromara.hutool.poi.excel.style.ShapeConfig;
+
+import java.awt.Color;
+
+/**
+ * 简单形状工具类
+ * 用于辅助写出指定的图形
+ *
+ * @author Looly
+ * @since 6.0.0
+ */
+public class SimpleShapeUtil {
+
+ /**
+ * 绘制简单形状
+ *
+ * @param sheet {@link Sheet}
+ * @param clientAnchor 绘制区域信息
+ * @param shapeConfig 形状配置，包括形状类型、线条样式、线条宽度、线条颜色、填充颜色等
+ * @since 6.0.0
+ */
+ public static void writeSimpleShape(final Sheet sheet, final SimpleClientAnchor clientAnchor, ShapeConfig shapeConfig) {
+ final Drawing patriarch = sheet.createDrawingPatriarch();
+ final ClientAnchor anchor = sheet.getWorkbook().getCreationHelper().createClientAnchor();
+ clientAnchor.copyTo(anchor);
+
+ if (null == shapeConfig) {
+ shapeConfig = ShapeConfig.of();
+ }
+ final Color lineColor = shapeConfig.getLineColor();
+ if (patriarch instanceof HSSFPatriarch) {
+ final HSSFSimpleShape simpleShape = ((HSSFPatriarch) patriarch).createSimpleShape((HSSFClientAnchor) anchor);
+ simpleShape.setShapeType(shapeConfig.getShapeType().ooxmlId);
+ simpleShape.setLineStyle(shapeConfig.getLineStyle().getValue());
+ simpleShape.setLineWidth(shapeConfig.getLineWidth());
+ if (null != lineColor) {
+ simpleShape.setLineStyleColor(lineColor.getRed(), lineColor.getGreen(), lineColor.getBlue());
+ }
+ } else if (patriarch instanceof XSSFDrawing) {
+ final XSSFSimpleShape simpleShape = ((XSSFDrawing) patriarch).createSimpleShape((XSSFClientAnchor) anchor);
+ simpleShape.setShapeType(shapeConfig.getShapeType().ooxmlId);
+ simpleShape.setLineStyle(shapeConfig.getLineStyle().getValue());
+ simpleShape.setLineWidth(shapeConfig.getLineWidth());
+ if (null != lineColor) {
+ simpleShape.setLineStyleColor(lineColor.getRed(), lineColor.getGreen(), lineColor.getBlue());
+ }
+ } else {
+ throw new UnsupportedOperationException("Unsupported patriarch type: " + patriarch.getClass().getName());
+ }
+ }
+}