From 62efe64940a17f750bd5a6d44f72f72390d6de05 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 29 May 2025 16:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdf/service/LeavePdfService.java          |  48 ++++++++++++----
 .../controller/pdf/service/PdfService.java    |  52 +++++++++++++-----
 .../resources/static/file/pdf/smryscb.pdf     | Bin 343271 -> 346415 bytes
 .../templates/system/newdev/apply/edit.html   |   1 +
 4 files changed, 75 insertions(+), 26 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java
index 0377c8b7..be3fb2ab 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/LeavePdfService.java
@@ -22,6 +22,8 @@ public class LeavePdfService {
     // 定义最大和最小字体大小，用于动态调整
     private static final float MAX_FONT_SIZE = 14;
     private static final float MIN_FONT_SIZE = 8;
+    // 预估的字段宽度（根据实际PDF调整）
+    private static final float ESTIMATED_FIELD_WIDTH = 100f;
     // 需要特殊处理的字段列表
     private static final String[] AUTO_WRAP_FIELDS = {
 
@@ -68,14 +70,23 @@ public class LeavePdfService {
 //                    for (PDAnnotationWidget widget : field.getWidgets()) {
 //                        widget.setHighlightMode(PDAnnotationWidget.HIGHLIGHT_MODE_NONE);
 //                    }
-                    if (fieldValue != null &&!fieldValue.isEmpty()) {
+                    if (fieldValue != null && !fieldValue.isEmpty()) {
                         field.setValue(fieldValue);
                         if (field instanceof PDTextField) {
                             PDTextField textField = (PDTextField) field;
                             if (isAutoWrapField(fieldName)) {
-                                textField.setMultiline(true);
-                                float fontSize = calculateFontSize(fieldValue);
-                                textField.setDefaultAppearance("/" + font.getName() + " " + fontSize + " Tf 0 g");
+                                // 计算文本在最大字体下的宽度
+                                float textWidth = calculateTextWidth(fieldValue, font, MAX_FONT_SIZE);
+                                // 如果文本宽度超过预估字段宽度，启用自动换行并调整字体
+                                if (textWidth > ESTIMATED_FIELD_WIDTH) {
+                                    textField.setMultiline(true);
+                                    float fontSize = calculateFontSize(fieldValue, font);
+                                    textField.setDefaultAppearance("/" + font.getName() + " " + fontSize + " Tf 0 g");
+                                } else {
+                                    // 文本未超出，使用默认字体和不换行
+                                    textField.setMultiline(false);
+                                    textField.setDefaultAppearance("/" + font.getName() + " " + MAX_FONT_SIZE + " Tf 0 g");
+                                }
                             } else {
                                 textField.setDefaultAppearance("/" + font.getName() + " 12 Tf 0 g");
                             }
@@ -118,12 +129,12 @@ public class LeavePdfService {
             if (refField != null) {
                 refField.setReadOnly(true);
             }
-            if (refField != null &&!file.isEmpty()) {
+            if (refField != null && !file.isEmpty()) {
                 // 假设图片插入到第一页，你可以根据实际情况修改
                 PDPage page = document.getPage(0);
 
                 // 手动指定图片插入位置
-                float x = 440; // 可以根据实际情况调整2
+                float x = 440; // 可以根据实际情况调整
                 float y = 650; // 可以根据实际情况调整
 
                 PDImageXObject image = null;
@@ -165,13 +176,26 @@ public class LeavePdfService {
         return false;
     }
 
-    // 计算适应字段的字体大小（仅用于需要特殊处理的字段）
-    private float calculateFontSize(String fieldValue) {
-        int textLength = fieldValue.length();
-        float fontSize = 10;
-        if (textLength > 30) {
-            fontSize = Math.max(MIN_FONT_SIZE, 10 - ((textLength - 30) / 5));
+    // 计算文本在指定字体和大小下的宽度
+    private float calculateTextWidth(String text, PDType0Font font, float fontSize) throws IOException {
+        if (text == null || text.isEmpty()) {
+            return 0;
         }
+        // 计算文本宽度，考虑字符间距
+        return font.getStringWidth(text) / 1000 * fontSize;
+    }
+
+    // 计算适应字段的字体大小
+    private float calculateFontSize(String fieldValue, PDType0Font font) throws IOException {
+        float fontSize = MAX_FONT_SIZE;
+        float textWidth = calculateTextWidth(fieldValue, font, fontSize);
+
+        // 循环降低字体大小直到文本适合预估宽度
+        while (textWidth > ESTIMATED_FIELD_WIDTH && fontSize > MIN_FONT_SIZE) {
+            fontSize -= 0.5f;
+            textWidth = calculateTextWidth(fieldValue, font, fontSize);
+        }
+
         return fontSize;
     }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/PdfService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/PdfService.java
index 3bdcc184..b0fd2f8f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/PdfService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/pdf/service/PdfService.java
@@ -20,11 +20,13 @@ import java.util.Map;
 public class PdfService {
 
     // 定义最大和最小字体大小，用于动态调整
-    private static final float MAX_FONT_SIZE = 14;
+    private static final float MAX_FONT_SIZE = 12;
     private static final float MIN_FONT_SIZE = 8;
+    // 预估的字段宽度（根据实际PDF调整）
+    private static final float ESTIMATED_FIELD_WIDTH = 100f;
     // 需要特殊处理的字段列表
     private static final String[] AUTO_WRAP_FIELDS = {
-            "常住地址", "户籍地址", "户籍地公安机关", "常住地公安机关"
+            "常住地址", "户籍地址", "户籍地公安机关", "常住地公安机关","姓名","已（拟）任涉密岗位"
     };
 
     public ByteArrayOutputStream fillForm(Map<String, String> formData,
@@ -68,14 +70,23 @@ public class PdfService {
 //                    for (PDAnnotationWidget widget : field.getWidgets()) {
 //                        widget.setHighlightMode(PDAnnotationWidget.HIGHLIGHT_MODE_NONE);
 //                    }
-                    if (fieldValue != null &&!fieldValue.isEmpty()) {
+                    if (fieldValue != null && !fieldValue.isEmpty()) {
                         field.setValue(fieldValue);
                         if (field instanceof PDTextField) {
                             PDTextField textField = (PDTextField) field;
                             if (isAutoWrapField(fieldName)) {
-                                textField.setMultiline(true);
-                                float fontSize = calculateFontSize(fieldValue);
-                                textField.setDefaultAppearance("/" + font.getName() + " " + fontSize + " Tf 0 g");
+                                // 计算文本在最大字体下的宽度
+                                float textWidth = calculateTextWidth(fieldValue, font, MAX_FONT_SIZE);
+                                // 如果文本宽度超过预估字段宽度，启用自动换行并调整字体
+                                if (textWidth > ESTIMATED_FIELD_WIDTH) {
+                                    textField.setMultiline(true);
+                                    float fontSize = calculateFontSize(fieldValue, font);
+                                    textField.setDefaultAppearance("/" + font.getName() + " " + fontSize + " Tf 0 g");
+                                } else {
+                                    // 文本未超出，使用默认字体和不换行
+                                    textField.setMultiline(false);
+                                    textField.setDefaultAppearance("/" + font.getName() + " " + MAX_FONT_SIZE + " Tf 0 g");
+                                }
                             } else {
                                 textField.setDefaultAppearance("/" + font.getName() + " 12 Tf 0 g");
                             }
@@ -118,12 +129,12 @@ public class PdfService {
             if (refField != null) {
                 refField.setReadOnly(true);
             }
-            if (refField != null &&!file.isEmpty()) {
+            if (refField != null && !file.isEmpty()) {
                 // 假设图片插入到第一页，你可以根据实际情况修改
                 PDPage page = document.getPage(0);
 
                 // 手动指定图片插入位置
-                float x = 435; // 可以根据实际情况调整2
+                float x = 435; // 可以根据实际情况调整
                 float y = 620; // 可以根据实际情况调整
 
                 PDImageXObject image = null;
@@ -165,13 +176,26 @@ public class PdfService {
         return false;
     }
 
-    // 计算适应字段的字体大小（仅用于需要特殊处理的字段）
-    private float calculateFontSize(String fieldValue) {
-        int textLength = fieldValue.length();
-        float fontSize = 10;
-        if (textLength > 30) {
-            fontSize = Math.max(MIN_FONT_SIZE, 10 - ((textLength - 30) / 5));
+    // 计算文本在指定字体和大小下的宽度
+    private float calculateTextWidth(String text, PDType0Font font, float fontSize) throws IOException {
+        if (text == null || text.isEmpty()) {
+            return 0;
         }
+        // 计算文本宽度，考虑字符间距
+        return font.getStringWidth(text) / 1000 * fontSize;
+    }
+
+    // 计算适应字段的字体大小
+    private float calculateFontSize(String fieldValue, PDType0Font font) throws IOException {
+        float fontSize = MAX_FONT_SIZE;
+        float textWidth = calculateTextWidth(fieldValue, font, fontSize);
+
+        // 循环降低字体大小直到文本适合预估宽度
+        while (textWidth > ESTIMATED_FIELD_WIDTH && fontSize > MIN_FONT_SIZE) {
+            fontSize -= 0.5f;
+            textWidth = calculateTextWidth(fieldValue, font, fontSize);
+        }
+
         return fontSize;
     }
 }
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/static/file/pdf/smryscb.pdf b/ruoyi-admin/src/main/resources/static/file/pdf/smryscb.pdf
index 660ad4287902b73f8d63b065f6cc1cd228fd32d4..c3a5fe7f3f7adc3c22e43abf410bb15c3c2a6157 100644
GIT binary patch
delta 3447
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
D*i40M

delta 324
zcmZ2KN%Z+okqr@y9EK)_W(Eev29pyQ*D)Gz=4VR#4H7dnF*i1!E+D`tGkNA;UQTlh
z1tVhvJyWyE>;Hb`H!;&QH#9a?FtXG$GcY!tdXO<`v*`am7LZ000}BH~u*T^Me2gs9
zPct)eav7R|wVRupPQS;@_yuHuv9Tf807D}Kv+WOA7{9TwgLPXPPyfixC=1d2pOcY;
z8>|p$xv{aybRjOrFYG3!dS+&p=F{bQ8MC&Rb2FMs!hO-cMTHTFnShuXh*`F8QDHsK
zvwgiS>t-%Sqv^>WtXk6-0trTw>1RAx)om=zEgelv9G%?EER5WY4P2d#9Gy*_TwP2Y
m&CJZ4E#2&5?d-UUOA?DpDvDCmxQtB<j7`kBR8?L5-M9dWYgah{

diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
index b270f919..570fe9ce 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html
@@ -388,6 +388,7 @@
                                 message: '请上传接近一寸照片尺寸的图片 (约295x413像素)',
                                 type: 'warning'
                             })
+                            return
                         }
                         this.selectedFile = file;
                     };