ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-06-02 11:33:36 +08:00
parent 57b4dfa7a7
commit cb72dacc02
20 changed files with 93 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-poi/src/main/java/org/dromara/hutool/poi/excel/ExcelWriter.java
View File

@ -1025,7 +1025,7 @@ public class ExcelWriter extends ExcelBase<ExcelWriter> {
} else if (rowBean instanceof Hyperlink) {
// Hyperlink当成一个值
return writeRow(ListUtil.of(rowBean), isWriteKeyAsHead);
} else if (BeanUtil.isWritableBean(rowBean.getClass())) {
} else if (BeanUtil.isReadableBean(rowBean.getClass())) {
if (MapUtil.isEmpty(this.headerAlias)) {
rowMap = BeanUtil.beanToMap(rowBean, new LinkedHashMap<>(), false, false);
} else {

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/CellEditorTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/CellEditorTest.java
View File

@ -10,8 +10,10 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.cell.CellEditor;
import lombok.AllArgsConstructor;
import lombok.Data;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelReadTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelReadTest.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.core.io.resource.ResourceUtil;
import org.dromara.hutool.core.lang.Console;
@ -19,6 +19,8 @@ import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.util.ObjUtil;
import lombok.Data;
import org.apache.poi.ss.usermodel.Cell;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

3
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelSaxReadTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/ExcelSaxReadTest.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.collection.ListUtil;
@ -19,6 +19,7 @@ import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.core.text.StrUtil;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.cell.values.FormulaCellValue;
import org.dromara.hutool.poi.excel.sax.Excel03SaxReader;
import org.dromara.hutool.poi.excel.sax.handler.RowHandler;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue1729Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue1729Test.java
View File

@ -10,9 +10,11 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import lombok.Data;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue3118Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3118Test.java Executable file → Normal file
View File

@ -10,9 +10,11 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue3120Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3120Test.java Executable file → Normal file
View File

@ -10,8 +10,10 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

5
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue3481Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/Issue3481Test.java
View File

@ -1,5 +1,8 @@
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

3
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI53OSTTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI53OSTTest.java
View File

@ -10,9 +10,10 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5Q1TWTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5Q1TWTest.java
View File

@ -10,8 +10,10 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI5U1JATest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI5U1JATest.java
View File

@ -10,8 +10,10 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI8PT9ZTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8PT9ZTest.java
View File

@ -1,8 +1,10 @@
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import lombok.Data;
import org.dromara.hutool.core.annotation.Alias;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI8ZIQCTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/reader/IssueI8ZIQCTest.java
View File

@ -1,5 +1,7 @@
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.reader;
import org.dromara.hutool.poi.excel.ExcelReader;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

6
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/BigExcelWriteTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/BigExcelWriteTest.java
View File

@ -10,13 +10,17 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.writer;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.poi.excel.BigExcelWriter;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.dromara.hutool.poi.excel.TestBean;
import org.dromara.hutool.poi.excel.style.StyleUtil;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.FillPatternType;

30
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteBeanTest.java Normal file
View File

@ -0,0 +1,30 @@
package org.dromara.hutool.poi.excel.writer;
import lombok.Getter;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
public class ExcelWriteBeanTest {
@Test
@Disabled
public void writeRowTest() {
final MyBean bean = new MyBean("value1", "value2");
final ExcelWriter writer = ExcelUtil.getWriter("d:/test/writeRowTest.xlsx");
writer.writeRow(bean, true);
writer.close();
}
@Getter
static class MyBean {
private final String property1;
private final String property2;
public MyBean(final String property1, final String property2) {
this.property1 = property1;
this.property2 = property2;
}
}
}

3
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/ExcelWriteTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/ExcelWriteTest.java
View File

@ -10,7 +10,7 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.writer;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.date.DateUtil;
@ -20,6 +20,7 @@ import org.dromara.hutool.core.data.id.IdUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.core.util.ObjUtil;
import org.dromara.hutool.poi.excel.*;
import org.dromara.hutool.poi.excel.cell.setters.EscapeStrCellSetter;
import org.dromara.hutool.poi.excel.style.StyleUtil;
import org.apache.poi.common.usermodel.HyperlinkType;

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2221Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2221Test.java
View File

@ -10,10 +10,12 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.writer;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.map.MapUtil;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.dromara.hutool.poi.excel.style.StyleUtil;
import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.usermodel.Font;

16
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/Issue2307Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/Issue2307Test.java
View File

@ -10,13 +10,17 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.writer;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.dromara.hutool.core.collection.ListUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.lang.Console;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.dromara.hutool.poi.excel.StyleSet;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@ -63,9 +67,9 @@ public class Issue2307Test {
}
// 空串,实际应该有值
System.out.println("writer.getCell(1,0): " + writer.getCell(0,1));
System.out.println("writer.getCell(1,1): " + writer.getCell(1,1));
System.out.println("sheet.getRow(1).getCell(0): " + sheet.getRow(1).getCell(0));
Console.log("writer.getCell(1,0): " + writer.getCell(0,1));
Console.log("writer.getCell(1,1): " + writer.getCell(1,1));
Console.log("sheet.getRow(1).getCell(0): " + sheet.getRow(1).getCell(0));
}
}
}

4
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI66Z6BTest.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI66Z6BTest.java
View File

@ -10,10 +10,12 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.writer;
import org.dromara.hutool.core.date.DateUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

5
hutool-poi/src/test/java/org/dromara/hutool/poi/excel/IssueI6MBS5Test.java → hutool-poi/src/test/java/org/dromara/hutool/poi/excel/writer/IssueI6MBS5Test.java
View File

@ -10,9 +10,12 @@
* See the Mulan PSL v2 for more details.
*/
package org.dromara.hutool.poi.excel;
package org.dromara.hutool.poi.excel.writer;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.poi.excel.ExcelUtil;
import org.dromara.hutool.poi.excel.ExcelWriter;
import org.dromara.hutool.poi.excel.WorkbookUtil;
import org.dromara.hutool.poi.excel.cell.CellUtil;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;