From 908fe73545901cd3180e0f15701b3a623adb9eb8 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Wed, 6 Apr 2022 16:02:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A1=AB=E5=85=85=E6=A1=88?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fill/annotation/FillAnnotationData.java | 3 ++ .../annotation/FillAnnotationDataTest.java | 31 ++++++++++++++++++ .../alibaba/easyexcel/test/temp/LockTest.java | 2 +- .../src/test/resources/fill/annotation.xls | Bin 26624 -> 27136 bytes .../src/test/resources/fill/annotation.xlsx | Bin 10692 -> 10742 bytes 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java b/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java index bc4c2483..87e2bfae 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java +++ b/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationData.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.NumberFormat; import com.alibaba.excel.annotation.write.style.ContentLoopMerge; import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.converters.string.StringImageConverter; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -33,4 +34,6 @@ public class FillAnnotationData { private String string1; @ExcelProperty("字符串2") private String string2; + @ExcelProperty(value = "图片", converter = StringImageConverter.class) + private String image; } diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java b/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java index 93680d69..d2159e71 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java +++ b/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/core/fill/annotation/FillAnnotationDataTest.java @@ -9,17 +9,27 @@ import com.alibaba.easyexcel.test.util.TestFileUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.util.DateUtils; +import org.apache.poi.hssf.usermodel.HSSFClientAnchor; +import org.apache.poi.hssf.usermodel.HSSFPicture; +import org.apache.poi.hssf.usermodel.HSSFShape; +import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.PictureData; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFAnchor; +import org.apache.poi.xssf.usermodel.XSSFPicture; +import org.apache.poi.xssf.usermodel.XSSFShape; +import org.apache.poi.xssf.usermodel.XSSFSheet; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; /** * @author Jiaju Zhuang @@ -73,6 +83,26 @@ public class FillAnnotationDataTest { } } Assert.assertTrue(hasMerge); + if (sheet instanceof XSSFSheet) { + XSSFSheet xssfSheet = (XSSFSheet)sheet; + List shapeList = xssfSheet.getDrawingPatriarch().getShapes(); + XSSFShape shape0 = shapeList.get(0); + Assert.assertTrue(shape0 instanceof XSSFPicture); + XSSFPicture picture0 = (XSSFPicture)shape0; + CTMarker ctMarker0 = picture0.getPreferredSize().getFrom(); + Assert.assertEquals(1, ctMarker0.getRow()); + Assert.assertEquals(4, ctMarker0.getCol()); + } else { + HSSFSheet hssfSheet = (HSSFSheet)sheet; + List shapeList = hssfSheet.getDrawingPatriarch().getChildren(); + HSSFShape shape0 = shapeList.get(0); + Assert.assertTrue(shape0 instanceof HSSFPicture); + HSSFPicture picture0 = (HSSFPicture)shape0; + HSSFClientAnchor anchor = (HSSFClientAnchor)picture0.getAnchor(); + Assert.assertEquals(1, anchor.getRow1()); + Assert.assertEquals(4, anchor.getCol1()); + } + } private List data() throws Exception { @@ -82,6 +112,7 @@ public class FillAnnotationDataTest { data.setNumber(99.99); data.setString1("string1"); data.setString2("string2"); + data.setImage(TestFileUtil.getPath() + "converter" + File.separator + "img.jpg"); list.add(data); list.add(data); list.add(data); diff --git a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java b/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java index 322891da..07cb7989 100644 --- a/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java +++ b/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/temp/LockTest.java @@ -24,7 +24,7 @@ public class LockTest { @Test public void test() throws Exception { List list = - EasyExcel.read(new FileInputStream("/Users/zhuangjiaju/Downloads/test.xlsx")).useDefaultListener(false).doReadAllSync(); + EasyExcel.read(new FileInputStream("/Users/zhuangjiaju/Downloads/-0304.2.xlsx")).useDefaultListener(false).doReadAllSync(); for (Object data : list) { LOGGER.info("返回数据：{}", JSON.toJSONString(data)); } diff --git a/easyexcel-core/src/test/resources/fill/annotation.xls b/easyexcel-core/src/test/resources/fill/annotation.xls index 8fd19c5a7fa7300facc2a11f4f84c04ff6606b40..de09678c72f3ffdcb9a592432489129f66ec11bb 100644 GIT binary patch delta 2534 zcmchZYiv|S6vxlpz5D9!b|2kGw~yVmJoeRgx0DJ9+isy-Kod*lVSEroXptyJ3GxA~ zyAm+bN+>-DQ4loIL<-2`0;Wa<{h(>$hmw$JP@@=5 zqpB>Qz*Y4pg}-0pB`UodFQ)So;Xj$bqVi&TiW7#XnDEXN{PYz3oZ!WK;gHkmwRkE0 zZwO90>8f!6*4YAvc6fHhR=3h=bLsG;%Yh&HGB{e9!JqsY9IMKpwI+k1+6*#c9%4~q zsp<@N6YnA3N&I2rPZQrkd_VD_+Gc#-uzM%I=XU55$pi&jaGql0u-jf2 zoO>JNUs_`_`Dk=aBvuZ3kd*IgpENI!A(}Jg2TctyI3Y1iGUau!Yxk{v@2=wu>*?3Q z$nOEj=V$QAC>bG!_k|a+IPM8Q$m;Re@C?eKEfS~v&5LAN0*530EQy)uV#?U==pxG2 zrRYl5jNw?6^3@$nP_AB#EoOJ)NGwa)S{m=`kYR4lOmbREXG_yA zD2MZ{{2dEq7AG&H@krwX#yZB|z6{42YndLsi2&J_M3C&tM2PIxL@29=IefM#lrsJ! z`EyTj1Ebtc95RB;hqgDaU%REJuXMC9@z$!vn@fjG+Qf~U)^3=kD`ISQ&j1_aR5&Q=*hm&XqT3|+Fh)&8jDMJDmMzxok1cUqvS?zm`3FlDzv{W~?RDM8Guchf zdH4R#z4v_F``(+#u!&Rb4T-f(#=Jrd02c0_XP9Mnwv2YeX<=gcZwW6NrtnpxTOKhU zXY!CKY+!&tSiN}C>b^sXrWyITniT;Ssl%Hv7dQ`Pa63Pt!#~#HpXl&I`8=KHcs}2d z$B*mq!#ez+4qq)G@(+TZ16gOIBRc#}19~rTKD}zG7jzsfD%=7E>XBVj4vf?{3b#^E zIm(rrd4a|=a36L3+WbNqtWy@Kh9b>C9d)A&1gKkb8(+bGTcAU|5H@Xc?gFV7qC(>t z*b5NPd9^?kPZYY+;Z<{RXsf0jj+vsFA`sqEax2a8!NDc}k{^W66<)6KTXHVb;ZBV^ zGq8vH9xXQuM0i*ahgJ=%SX-7$@|fbD-Wzp3g{y|8hD#;OaW##3v=_M8*NQ%%=r3@0 zVUPbaWgm++f7aosD5{{e-&ME?_uK2t3AkMMVXgdu-DyOrL}YQ?Ttc4+uF>O(v53<9 z)fJPEmOsW=2)DUf@sLwQ!IfgIIPQ562fd?s(k-$!{MIwg8gZNZMLg>jP5cvM#O-bm zu2fdwv(+MN!e87+@zcsu>~M>wPO@9@g2RV%9uqE9KgF7Hq%z>>g>in}axILnyY9id zQjxV|tSX4kDj$9?rf|@iLZK{$6Fvc3t2U$Ek-}rdwi5f@TaU9eZzr)oh`mNks;b8e z#Ab-Km8S3~Vxz=@)jm8&Y>b$@JcVBp+gDwT&zFg~hSn|--(9{|p7ZT1Fj^pl-3?n< z7!Ne`QFSgh)Uha9LlH{6HI$|l7efarkz}}sN%%^53ya~8;a;j}O(ewD;=Pe(D%*3B z9xB&&ku+O}UD0u)9oo^jaO15Eu3WHc(!?G*KfcJ$;AL{c%W~W049E|`gR5Pw``BmhuB8T+KH&` zCUc8w#%ClyGvlNbP_(C}W&GA<26fj<1OCSq6JD08UHSWFp^&2ZD+*wf`(rQIe9IJ& znc^xk@Rvz#26{|yB-tdNOL`gl6A64e;cgR%TMayH`kaEB|2zO#iNg3GpZ!CQc#Gp# z32$Fq`O~P(2yyZWz(;&l9Qb>oju?%MxsicJ+^1^e>r6B{LkYZ1&oWq#Ta!}d^)P5J z-g}4dU2uhpX~swHmOMA|Q{$#7N=wEmw{b?5{J&Y&CElv)OD7IlGIbmZXj(NK#MIK*H@|dPYd- pK%kMNiKLlCl9vY)Y;unrM6O|qK&P?7D@@V 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