From 4281f6c90e4a17845a5721ab51b3bc5c5409ab45 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期三, 07 一月 2026 23:27:04 +0800
Subject: [PATCH] 修改了对应代码
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java
index e18f2be..e50b657 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetSecond.java
@@ -22,7 +22,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
+import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -269,7 +271,30 @@
this.init(list, sheetName, Excel.Type.EXPORT);
exportExcel(response.getOutputStream());
}
+ private static double calculateScaleForCm(byte[] imageData, double widthCm, double heightCm) throws IOException {
+ // 璇诲彇鍥剧墖鑾峰彇鍘熷灏哄
+ BufferedImage img = ImageIO.read(new ByteArrayInputStream(imageData));
+ double originalWidthPx = img.getWidth();
+ double originalHeightPx = img.getHeight();
+ // Excel榛樿DPI锛�96锛�
+ double excelDpi = 96.0;
+ double pixelsPerCm = excelDpi / 2.54;
+
+ // 鐩爣鍍忕礌灏哄
+ double targetWidthPx = widthCm * pixelsPerCm;
+ double targetHeightPx = heightCm * pixelsPerCm;
+
+ // 璁＄畻姣斾緥锛堝彇瀹介珮涓殑杈冨皬姣斾緥锛屼繚鎸佺旱妯瘮锛�
+ double scaleWidth = targetWidthPx / originalWidthPx;
+ double scaleHeight = targetHeightPx / originalHeightPx;
+ System.out.println("-=========67676");
+ System.out.println(originalHeightPx);
+ System.out.println(originalWidthPx);
+ System.out.println(targetWidthPx);
+ System.out.println(targetHeightPx);
+ return Math.min(scaleWidth, scaleHeight);
+ }
/**
* 瀵筶ist鏁版嵁婧愬皢鍏堕噷闈㈢殑鏁版嵁瀵煎叆鍒癳xcel琛ㄥ崟
*
@@ -348,13 +373,27 @@
// 鍒涘缓鍥剧墖閿氱偣锛岃缃湪绗�2琛岀2鍒�
// 浜岀淮鐮佹樉绀哄湪鍙充笂瑙掍笖涓嶅～婊℃暣涓牸瀛�
// 缂╁皬鍥剧墖鑼冨洿锛氬彧鍗犵敤閮ㄥ垎鍗曞厓鏍肩┖闂�
- ClientAnchor anchor = new HSSFClientAnchor(680, 0, 1000, 250, (short) 1, 2, (short) 1, 2);
+
+ ClientAnchor anchor = new HSSFClientAnchor(699, 0, 1023, 97, (short) 1, 2, (short) 1, 3);
// 璁剧疆鍥剧墖浣嶇疆鍜屽ぇ灏�
anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_DONT_RESIZE);
// 娣诲姞鍥剧墖鍒板伐浣滆〃
- getDrawingPatriarch(sheet).createPicture(anchor,
+ org.apache.poi.ss.usermodel.Picture picture = getDrawingPatriarch(sheet).createPicture(anchor,
wb.addPicture(data, getImageType(data)));
+
+
+ int pictureIdx = wb.addPicture(data, getImageType(data));
+ // Picture picture = drawing.createPicture(anchor, pictureIdx);
+
+// 鍏抽敭锛氳绠楀苟搴旂敤3.15cm鐨勭缉鏀�
+// double targetSizeCm = 3.15;
+//
+//// 鏂规硶1锛氫娇鐢ㄧ簿纭绠�
+// double scale = calculateScaleForCm(data, targetSizeCm, targetSizeCm);
+// System.out.println(scale);
+// picture.resize(scale);
+
// 浜岀淮鐮佹坊鍔犲畬鎴愬悗锛屾仮澶嶅師鏉ョ殑鍒楀璁剧疆
sheet.setColumnWidth(1, currentColumnWidth);
}
@@ -410,7 +449,7 @@
sheet.setColumnWidth(1, (int) ((51.57 + 0.72) * 256)); // 绗簩鍒楋細瀹藉害51
CellStyle style = wb.createCellStyle();
- style.setAlignment(HorizontalAlignment.RIGHT);
+ style.setAlignment(HorizontalAlignment.LEFT);
style.setVerticalAlignment(VerticalAlignment.BOTTOM); // 璁剧疆鍨傜洿涓嬪榻�
style.setWrapText(true); // 璁剧疆鑷姩鎹㈣
--
Gitblit v1.9.1