diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/ShapePage.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/ShapePage.java index 32edef08..744f76d1 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/ShapePage.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/ShapePage.java @@ -6,6 +6,7 @@ import org.docx4j.dml.*; import org.docx4j.jaxb.XPathBinderAssociationIsPartialException; import org.pptx4j.pml.*; import pc.exam.pp.module.judgement.utils.wps_pptx.pptx4j.utils.PtToCmConverter; +import pc.exam.pp.module.judgement.utils.wps_pptx.pptx4j.utils.PtToEmuConverter; import pc.exam.pp.module.judgement.utils.wps_pptx.pptx4j.utils.Transition; import java.math.BigInteger; @@ -945,8 +946,10 @@ public class ShapePage { CTTextBody textBody = sp.getTxBody(); // 遍历所有段落 for (CTTextParagraph paragraph : textBody.getP()) { - if (paragraph.getPPr().getSpcBef() != null) { - return String.valueOf(paragraph.getPPr().getSpcBef().getSpcPts().getVal()); + if (paragraph.getPPr().getMarL() != null) { + // EMU转磅 + double pt = PtToEmuConverter.emuToPt(paragraph.getPPr().getMarL()); + return pt + "磅"; } } } diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/utils/PtToEmuConverter.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/utils/PtToEmuConverter.java new file mode 100644 index 00000000..2d98be43 --- /dev/null +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_pptx/pptx4j/utils/PtToEmuConverter.java @@ -0,0 +1,14 @@ +package pc.exam.pp.module.judgement.utils.wps_pptx.pptx4j.utils; + +public class PtToEmuConverter { + // 基础转换常数 + public static final double EMU = 12700; + + public static double ptToEmu(double pt) { + return pt * EMU; + } + + public static double emuToPt(double emu) { + return emu / EMU; + } +}