From da7b7879de8a5f8233139284bafdd9d06c42db91 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Mon, 23 Mar 2020 19:49:28 +0800
Subject: [PATCH] =?UTF-8?q?*=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E6=9F=90?=
 =?UTF-8?q?=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=AF=E8=83=BD=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84`warn`=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/alibaba/excel/ExcelReader.java   |  4 +-
 .../java/com/alibaba/excel/ExcelWriter.java   |  4 +-
 .../test/demo/write/CommentWriteHandler.java  | 37 +++++++++++++++++++
 .../easyexcel/test/demo/write/WriteTest.java  | 18 +++++++++
 update.md                                     |  3 +-
 5 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java

diff --git a/src/main/java/com/alibaba/excel/ExcelReader.java b/src/main/java/com/alibaba/excel/ExcelReader.java
index 07a373b..6cd0f78 100644
--- a/src/main/java/com/alibaba/excel/ExcelReader.java
+++ b/src/main/java/com/alibaba/excel/ExcelReader.java
@@ -274,7 +274,9 @@ public class ExcelReader {
      * Complete the entire read file.Release the cache and close stream.
      */
     public void finish() {
-        excelAnalyser.finish();
+        if (excelAnalyser != null) {
+            excelAnalyser.finish();
+        }
     }
 
     /**
diff --git a/src/main/java/com/alibaba/excel/ExcelWriter.java b/src/main/java/com/alibaba/excel/ExcelWriter.java
index a0b4795..0eafecd 100644
--- a/src/main/java/com/alibaba/excel/ExcelWriter.java
+++ b/src/main/java/com/alibaba/excel/ExcelWriter.java
@@ -325,7 +325,9 @@ public class ExcelWriter {
      * Close IO
      */
     public void finish() {
-        excelBuilder.finish(false);
+        if (excelBuilder != null) {
+            excelBuilder.finish(false);
+        }
     }
 
     /**
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java
new file mode 100644
index 0000000..299d407
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/CommentWriteHandler.java
@@ -0,0 +1,37 @@
+package com.alibaba.easyexcel.test.demo.write;
+
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.Drawing;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+
+import com.alibaba.excel.write.handler.AbstractRowWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+
+/**
+ * 自定义拦截器.新增注释,第一行头加批注
+ *
+ * @author Jiaju Zhuang
+ */
+public class CommentWriteHandler extends AbstractRowWriteHandler {
+
+    @Override
+    public void afterRowDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
+        Integer relativeRowIndex, Boolean isHead) {
+        if (isHead) {
+            Sheet sheet = writeSheetHolder.getSheet();
+            Drawing<?> drawingPatriarch = sheet.createDrawingPatriarch();
+            // 在第一行 第二列创建一个批注
+            Comment comment =
+                drawingPatriarch.createCellComment(new XSSFClientAnchor(0, 0, 0, 0, (short)1, 0, (short)2, 1));
+            // 输入批注信息
+            comment.setString(new XSSFRichTextString("创建批注!"));
+            // 将批注添加到单元格对象中
+            sheet.getRow(0).getCell(1).setCellComment(comment);
+        }
+    }
+
+}
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java
index c54ceb7..7139fa8 100644
--- a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java
@@ -439,6 +439,24 @@ public class WriteTest {
             .registerWriteHandler(new CustomCellWriteHandler()).sheet("模板").doWrite(data());
     }
 
+    /**
+     * 插入批注
+     * <p>
+     * 1. 创建excel对应的实体对象 参照{@link DemoData}
+     * <p>
+     * 2. 注册拦截器 {@link CommentWriteHandler}
+     * <p>
+     * 2. 直接写即可
+     */
+    @Test
+    public void commentWrite() {
+        String fileName = TestFileUtil.getPath() + "commentWrite" + System.currentTimeMillis() + ".xlsx";
+        // 这里 需要指定写用哪个class去写，然后写到第一个sheet，名字为模板 然后文件流会自动关闭
+        // 这里要注意inMemory 要设置为true，才能支持批注。目前没有好的办法解决 不在内存处理批注。这个需要自己选择。
+        EasyExcel.write(fileName, DemoData.class).inMemory(Boolean.TRUE).registerWriteHandler(new CommentWriteHandler())
+            .sheet("模板").doWrite(data());
+    }
+
     /**
      * 可变标题处理(包括标题国际化等)
      * <p>
diff --git a/update.md b/update.md
index 43dd560..b075a26 100644
--- a/update.md
+++ b/update.md
@@ -1,6 +1,7 @@
-# 2.2.0-beta1
+# 2.2.0-beta2
 * 修复最长匹配策略不同表格会有影响的bug [Issue #1010](https://github.com/alibaba/easyexcel/issues/1010)
 * `LinkedList`写入的性能问题 #1121
+* 修复在某些情况下可能出现不必要的`warn`日志
 
 # 2.2.0-beta1
 * 重写主流程，代码更加优雅
-- 
GitLab