From 5d91a329768a2a86e01e4b9b6bc6a2b939b87adb Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期五, 16 一月 2026 22:48:51 +0800
Subject: [PATCH] 修改了对应代码

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java |  176 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 141 insertions(+), 35 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java
index 69ab2f7..f2404ff 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtilManySheetThird.java
@@ -16,9 +16,12 @@
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFDataValidation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.HSSFDataValidation;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -284,11 +287,11 @@
                 int column = 0;
                 if(index == 0) {
                     // 鍚堝苟绗竴琛岀殑鍓�5涓崟鍏冩牸
-                    sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));
+                    sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
 
                     // 鍒涘缓琛屽苟璁剧疆楂樺害
                      row = sheet.createRow(0);
-                    row.setHeight((short)(40 * 40));
+                    row.setHeight((short)(20 * 20));
 
 
                   //  sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, 7));
@@ -298,6 +301,8 @@
                     CellStyle style = wb.createCellStyle();
                     Font font = wb.createFont();
                     font.setBold(true);
+                    font.setFontHeightInPoints((short) 12);
+
                     font.setFontName("瀹嬩綋");
                     style.setFont(font);
                     style.setAlignment(HorizontalAlignment.CENTER);
@@ -305,6 +310,7 @@
                     row = sheet.createRow(1);
                //
                     row.createCell(0).setCellValue("ISO缂栧彿:");
+                    row.createCell(1).setCellValue(list.get(0).getIos5());
                  //   row.createCell(4).setCellValue("妗e彿:");
                     //鎷垮埌妗e彿
                     row.createCell(5).setCellValue("");
@@ -450,6 +456,8 @@
         CellStyle style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         style.setBorderRight(BorderStyle.THIN);
         style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
         style.setBorderLeft(BorderStyle.THIN);
@@ -464,23 +472,41 @@
         style.setFont(dataFont);
         styles.put("data", style);
 
-        style = wb.createCellStyle();
-        style.cloneStyleFrom(styles.get("data"));
-        style.setAlignment(HorizontalAlignment.CENTER);
-        style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
-        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-        Font headerFont = wb.createFont();
-        headerFont.setFontName("Arial");
-        headerFont.setFontHeightInPoints((short) 10);
-        headerFont.setBold(true);
-        headerFont.setColor(IndexedColors.WHITE.getIndex());
-        style.setFont(headerFont);
-        styles.put("header", style);
+        // 鍒涘缓琛ㄥご鏍峰紡鏄犲皠锛屾牴鎹瓻xcel娉ㄨВ鍔ㄦ�佺敓鎴�
+        Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();
+        for (Object[] os : fields)
+        {
+            Excel excel = (Excel) os[1];
+            String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());
+            if (!headerStyles.containsKey(key))
+            {
+                 style = wb.createCellStyle();
+                style.cloneStyleFrom(styles.get("data"));
+                style.setAlignment(HorizontalAlignment.CENTER);
+                style.setVerticalAlignment(VerticalAlignment.CENTER);
+                // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+                style.setWrapText(true);
+                // 鏍规嵁娉ㄨВ璁剧疆琛ㄥご鑳屾櫙鑹� - 宸叉敞閲婏紝琛ㄥご涓嶆樉绀鸿儗鏅壊
+                /*if (excel.headerBackgroundColor() != IndexedColors.WHITE) {
+                    style.setFillForegroundColor(excel.headerBackgroundColor().index);
+                    style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+                }*/
+                Font headerFont = wb.createFont();
+                headerFont.setFontName("Arial");
+                headerFont.setFontHeightInPoints((short) 10);
+                headerFont.setBold(false);
+                headerFont.setColor(excel.headerColor().index);
+                style.setFont(headerFont);
+                headerStyles.put(key, style);
+            }
+        }
+        styles.putAll(headerStyles);
 
         style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         Font totalFont = wb.createFont();
         totalFont.setFontName("Arial");
         totalFont.setFontHeightInPoints((short) 10);
@@ -490,16 +516,22 @@
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.LEFT);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         styles.put("data1", style);
 
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.CENTER);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         styles.put("data2", style);
 
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.RIGHT);
+        // 璁剧疆鍗曞厓鏍煎唴瀹硅嚜鍔ㄦ崲琛�
+        style.setWrapText(true);
         styles.put("data3", style);
 
         return styles;
@@ -514,7 +546,9 @@
         // 鍐欏叆鍒椾俊鎭�
         cell.setCellValue(attr.name());
         setDataValidation(attr, row, column);
-        cell.setCellStyle(styles.get("header"));
+        // 鏍规嵁Excel娉ㄨВ鍔ㄦ�侀�夋嫨琛ㄥご鏍峰紡
+        String key = StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor());
+        cell.setCellStyle(styles.get(key));
         return cell;
     }
 
@@ -531,7 +565,7 @@
         } else if (Excel.ColumnType.NUMERIC == attr.cellType()) {
             cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
         } else if (Excel.ColumnType.IMAGE == attr.cellType()) {
-            ClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
+            ClientAnchor anchor = new HSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), cell.getRow().getRowNum(), (short) (cell.getColumnIndex() + 1),
                     cell.getRow().getRowNum() + 1);
             String imagePath = Convert.toStr(value);
             if (StringUtils.isNotEmpty(imagePath)) {
@@ -578,12 +612,12 @@
         // 濡傛灉璁剧疆浜嗘彁绀轰俊鎭垯榧犳爣鏀句笂鍘绘彁绀�.
         if (StringUtils.isNotEmpty(attr.prompt())) {
             // 杩欓噷榛樿璁句簡2-101鍒楁彁绀�.
-            setXSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
+            setHSSFPrompt(sheet, "", attr.prompt(), 1, 100, column, column);
         }
         // 濡傛灉璁剧疆浜哻ombo灞炴�у垯鏈垪鍙兘閫夋嫨涓嶈兘杈撳叆
         if (attr.combo().length > 0) {
             // 杩欓噷榛樿璁句簡2-101鍒楀彧鑳介�夋嫨涓嶈兘杈撳叆.
-            setXSSFValidation(sheet, attr.combo(), 1, 100, column, column);
+            setHSSFValidation(sheet, attr.combo(), 1, 100, column, column);
         }
     }
 
@@ -593,15 +627,29 @@
     public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
         Cell cell = null;
         try {
-            // 璁剧疆琛岄珮
-            row.setHeight(maxHeight);
+            // 璁剧疆琛岄珮涓鸿嚜鍔ㄨ皟鏁�
+           // row.setHeight((short) -1);
             // 鏍规嵁Excel涓缃儏鍐靛喅瀹氭槸鍚﹀鍑�,鏈変簺鎯呭喌闇�瑕佷繚鎸佷负绌�,甯屾湜鐢ㄦ埛濉啓杩欎竴鍒�.
             if (attr.isExport()) {
                 // 鍒涘缓cell
                 cell = row.createCell(column);
-//                attr.align();
-//                int align = attr.align().value;
-//                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
+                // 璁剧疆鍗曞厓鏍兼牱寮�
+                HorizontalAlignment align = attr.align();
+                String styleKey = "data";
+                if (align == HorizontalAlignment.LEFT) {
+                    styleKey = "data1";
+                } else if (align == HorizontalAlignment.CENTER) {
+                    styleKey = "data2";
+                } else if (align == HorizontalAlignment.RIGHT) {
+                    styleKey = "data3";
+                }
+                // 鑾峰彇骞朵慨鏀规牱寮�
+                CellStyle style = styles.get(styleKey);
+                Workbook workbook = row.getSheet().getWorkbook();
+                CellStyle newStyle = workbook.createCellStyle();
+                newStyle.cloneStyleFrom(style);
+                newStyle.setWrapText(true); // 鍏抽敭锛氬惎鐢ㄨ嚜鍔ㄦ崲琛�
+                cell.setCellStyle(newStyle);
 
                 // 鐢ㄤ簬璇诲彇瀵硅薄涓殑灞炴��
                 Object value = getTargetValue(vo, field, attr);
@@ -618,6 +666,8 @@
                     // 璁剧疆鍒楃被鍨�
                     setCellVo(value, attr, cell);
                 }
+                adjustRowHeightAfterSetValue(row, cell, value);
+
                 addStatisticsData(column, Convert.toStr(value), attr);
             }
         } catch (Exception e) {
@@ -625,9 +675,67 @@
         }
         return cell;
     }
+    /**
+     * 璁剧疆鍊煎悗璋冩暣琛岄珮
+     */
+    private void adjustRowHeightAfterSetValue(Row row, Cell cell, Object value) {
+        if (value == null) return;
+
+        String text = value.toString();
+        Sheet sheet = row.getSheet();
+
+        // 1. 璁$畻鑷姩楂樺害锛堝熀浜庡唴瀹癸級
+        short autoHeight = calculateSimpleAutoHeight(text, cell);
+
+        // 2. 鑾峰彇褰撳墠琛岄珮
+        short currentHeight = row.getHeight();
+        if (currentHeight == -1) {
+            currentHeight = sheet.getDefaultRowHeight();
+        }
+
+        // 3. 浣跨敤杈冨ぇ鐨勯珮搴︼紙鑷姩璁$畻鐨勯珮搴︽垨褰撳墠楂樺害锛�
+        short baseHeight = (short) Math.max(currentHeight, autoHeight);
+        System.out.println(baseHeight+"aaaaaaaaatttttttt");
+        // 4. 鍦ㄥ熀纭�涓婂鍔犻澶栭珮搴︼紙100鍗曚綅 = 5鐐癸級
+        short extraHeight = 80;
+        short newHeight = (short) (baseHeight + extraHeight);
+
+        // 5. 闄愬埗鏈�澶ч珮搴�
+        short maxHeight = (short) 4000; // 100鐐�
+        row.setHeight((short) Math.min(maxHeight,newHeight));
+    }
 
     /**
-     * 璁剧疆 POI XSSFSheet 鍗曞厓鏍兼彁绀�
+     * 绠�鍖栫殑鑷姩楂樺害璁$畻
+     */
+    private short calculateSimpleAutoHeight(String text, Cell cell) {
+        if (text == null || text.isEmpty()) return 0;
+
+        Sheet sheet = cell.getSheet();
+        int colIndex = cell.getColumnIndex();
+
+        // 鑾峰彇鍒楀锛堝瓧绗︽暟锛�
+        int colWidthChars = sheet.getColumnWidth(colIndex) / 256;
+        if (colWidthChars <= 0) colWidthChars = 10;
+
+        // 璁$畻鏂囨湰琛屾暟
+        int lines = 1;
+        if (text.contains("\n")) {
+            // 鏈夋樉寮忔崲琛�
+            String[] parts = text.split("\n");
+            for (String part : parts) {
+                lines += Math.max(1, (int) Math.ceil(part.length() * 1.5 / colWidthChars));
+            }
+        } else {
+            // 鑷姩鎹㈣
+            lines = (int) Math.ceil(text.length() * 1.5 / colWidthChars);
+        }
+
+        // 姣忚楂樺害锛氬亣璁�18鐐癸紙360 POI鍗曚綅锛�
+        return (short) (lines * 360);
+    }
+    /**
+     * 璁剧疆 POI HSSFSheet 鍗曞厓鏍兼彁绀�
      *
      * @param sheet         琛ㄥ崟
      * @param promptTitle   鎻愮ず鏍囬
@@ -637,7 +745,7 @@
      * @param firstCol      寮�濮嬪垪
      * @param endCol        缁撴潫鍒�
      */
-    public void setXSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
+    public void setHSSFPrompt(Sheet sheet, String promptTitle, String promptContent, int firstRow, int endRow,
                               int firstCol, int endCol) {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         DataValidationConstraint constraint = helper.createCustomConstraint("DD1");
@@ -659,7 +767,7 @@
      * @param endCol   缁撴潫鍒�
      * @return 璁剧疆濂界殑sheet.
      */
-    public void setXSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
+    public void setHSSFValidation(Sheet sheet, String[] textlist, int firstRow, int endRow, int firstCol, int endCol) {
         DataValidationHelper helper = sheet.getDataValidationHelper();
         // 鍔犺浇涓嬫媺鍒楄〃鍐呭
         DataValidationConstraint constraint = helper.createExplicitListConstraint(textlist);
@@ -668,11 +776,9 @@
         // 鏁版嵁鏈夋晥鎬у璞�
         DataValidation dataValidation = helper.createValidation(constraint, regions);
         // 澶勭悊Excel鍏煎鎬ч棶棰�
-        if (dataValidation instanceof XSSFDataValidation) {
-            dataValidation.setSuppressDropDownArrow(true);
-            dataValidation.setShowErrorBox(true);
-        } else {
+        if (dataValidation instanceof HSSFDataValidation) {
             dataValidation.setSuppressDropDownArrow(false);
+            dataValidation.setShowErrorBox(true);
         }
 
         sheet.addValidationData(dataValidation);
@@ -869,7 +975,7 @@
      * 鍒涘缓涓�涓伐浣滅翱
      */
     public void createWorkbook() {
-        this.wb = new SXSSFWorkbook(500);
+        this.wb = new HSSFWorkbook();
     }
 
     /**

--
Gitblit v1.9.1