ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2023-02-09 19:23:03 +08:00
parent 48c60ea8d6
commit 2ee6fd8938
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelPicUtil.java
View File

@ -2,6 +2,7 @@ package cn.hutool.poi.excel;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.multi.ListValueMap;
import cn.hutool.core.text.StrUtil; import cn.hutool.core.text.StrUtil;
import org.apache.poi.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
import org.apache.poi.hssf.usermodel.HSSFPicture; import org.apache.poi.hssf.usermodel.HSSFPicture;
@ -19,9 +20,7 @@ import org.apache.poi.xssf.usermodel.XSSFSheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* Excel图片工具类 * Excel图片工具类
@ -37,7 +36,7 @@ public class ExcelPicUtil {
* @param sheetIndex sheet的索引 * @param sheetIndex sheet的索引
* @return 图片映射，键格式：行_列，值：{@link PictureData} * @return 图片映射，键格式：行_列，值：{@link PictureData}
*/ */
public static Map<String, PictureData> getPicMap(final Workbook workbook, int sheetIndex) { public static ListValueMap<String, PictureData> getPicMap(final Workbook workbook, int sheetIndex) {
Assert.notNull(workbook, "Workbook must be not null !"); Assert.notNull(workbook, "Workbook must be not null !");
if (sheetIndex < 0) { if (sheetIndex < 0) {
sheetIndex = 0; sheetIndex = 0;
@ -60,8 +59,8 @@ public class ExcelPicUtil {
* @param sheetIndex sheet的索引 * @param sheetIndex sheet的索引
* @return 图片映射，键格式：行_列，值：{@link PictureData} * @return 图片映射，键格式：行_列，值：{@link PictureData}
*/ */
private static Map<String, PictureData> getPicMapXls(final HSSFWorkbook workbook, final int sheetIndex) { private static ListValueMap<String, PictureData> getPicMapXls(final HSSFWorkbook workbook, final int sheetIndex) {
final Map<String, PictureData> picMap = new HashMap<>(); final ListValueMap<String, PictureData> picMap = new ListValueMap<>();
final List<HSSFPictureData> pictures = workbook.getAllPictures(); final List<HSSFPictureData> pictures = workbook.getAllPictures();
if (CollUtil.isNotEmpty(pictures)) { if (CollUtil.isNotEmpty(pictures)) {
final HSSFSheet sheet = workbook.getSheetAt(sheetIndex); final HSSFSheet sheet = workbook.getSheetAt(sheetIndex);
@ -71,7 +70,7 @@ public class ExcelPicUtil {
if (shape instanceof HSSFPicture) { if (shape instanceof HSSFPicture) {
pictureIndex = ((HSSFPicture) shape).getPictureIndex() - 1; pictureIndex = ((HSSFPicture) shape).getPictureIndex() - 1;
anchor = (HSSFClientAnchor) shape.getAnchor(); anchor = (HSSFClientAnchor) shape.getAnchor();
picMap.put(StrUtil.format("{}_{}", anchor.getRow1(), anchor.getCol1()), pictures.get(pictureIndex)); picMap.putValue(StrUtil.format("{}_{}", anchor.getRow1(), anchor.getCol1()), pictures.get(pictureIndex));
} }
} }
} }
@ -85,8 +84,8 @@ public class ExcelPicUtil {
* @param sheetIndex sheet的索引 * @param sheetIndex sheet的索引
* @return 图片映射，键格式：行_列，值：{@link PictureData} * @return 图片映射，键格式：行_列，值：{@link PictureData}
*/ */
private static Map<String, PictureData> getPicMapXlsx(final XSSFWorkbook workbook, final int sheetIndex) { private static ListValueMap<String, PictureData> getPicMapXlsx(final XSSFWorkbook workbook, final int sheetIndex) {
final Map<String, PictureData> sheetIndexPicMap = new HashMap<>(); final ListValueMap<String, PictureData> sheetIndexPicMap = new ListValueMap<>();
final XSSFSheet sheet = workbook.getSheetAt(sheetIndex); final XSSFSheet sheet = workbook.getSheetAt(sheetIndex);
XSSFDrawing drawing; XSSFDrawing drawing;
for (final POIXMLDocumentPart dr : sheet.getRelations()) { for (final POIXMLDocumentPart dr : sheet.getRelations()) {
@ -99,7 +98,7 @@ public class ExcelPicUtil {
if(shape instanceof XSSFPicture){ if(shape instanceof XSSFPicture){
pic = (XSSFPicture) shape; pic = (XSSFPicture) shape;
ctMarker = pic.getPreferredSize().getFrom(); ctMarker = pic.getPreferredSize().getFrom();
sheetIndexPicMap.put(StrUtil.format("{}_{}", ctMarker.getRow(), ctMarker.getCol()), pic.getPictureData()); sheetIndexPicMap.putValue(StrUtil.format("{}_{}", ctMarker.getRow(), ctMarker.getCol()), pic.getPictureData());
} }
// 其他类似于图表等忽略，see: https://gitee.com/dromara/hutool/issues/I38857 // 其他类似于图表等忽略，see: https://gitee.com/dromara/hutool/issues/I38857
} }