From 1426050b3b5bde9f63658b8141d92d5a91079c77 Mon Sep 17 00:00:00 2001 From: Looly Date: Tue, 6 Jan 2026 16:59:41 +0800 Subject: [PATCH] fix code --- .../v7/swing/PrintAttributeBuilder.java | 132 ++++++++++++------ .../java/cn/hutool/v7/swing/PrintUtil.java | 50 +++++-- 2 files changed, 129 insertions(+), 53 deletions(-) diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintAttributeBuilder.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintAttributeBuilder.java index c7df2385a9..29ef51111a 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintAttributeBuilder.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintAttributeBuilder.java @@ -51,6 +51,16 @@ public class PrintAttributeBuilder implements Builder @Serial private static final long serialVersionUID = 1L; + /** + * 创建打印属性构建器 + * + * @param printer 打印服务对象 + * @return 打印属性构建器实例 + */ + public static PrintAttributeBuilder of(final PrintService printer) { + return new PrintAttributeBuilder(printer); + } + private final PrintService printer; private final HashPrintRequestAttributeSet attributes; private final Set> supportedAttrs; @@ -99,18 +109,47 @@ public class PrintAttributeBuilder implements Builder } /** - * 强制 A4 纸（若不支持则尝试 Letter 或忽略） + * 强制 A4纸（210 mm × 297 mm） * * @return this，用于链式调用 */ public PrintAttributeBuilder a4Paper() { + return mediaSize(MediaSizeName.ISO_A4); + } + + /** + * 强制 A3纸（297 mm × 420 mm）（若不支持则尝试 Letter 或忽略） + * + * @return this，用于链式调用 + */ + public PrintAttributeBuilder a3Paper() { + return mediaSize(MediaSizeName.ISO_A3); + } + + /** + * 设置纸张类型 + * 
{@code
+	 *  A0: 841 mm × 1189 mm
+	 *  A1: 594 mm × 841 mm
+	 *  A2: 420 mm × 594 mm
+	 *  A3: 297 mm × 420 mm
+	 *  A4: 210 mm × 297 mm
+	 *  A5: 148 mm × 210 mm
+	 *  A6: 105 mm × 148 mm
+	 *  A7: 74 mm × 105 mm
+	 *  A8: 52 mm × 74 mm
+	 *  A9: 37 mm × 52 mm
+	 *  A10: 26 mm × 37 mm
+	 * }
+ * + * @param mediaSizeName {@link MediaSizeName} + * @return this，用于链式调用 + */ + public PrintAttributeBuilder mediaSize(final MediaSizeName mediaSizeName) { if (support(MediaSizeName.class)) { final MediaSizeName[] sizes = getSupportedValues(MediaSizeName.class); - if (ArrayUtil.contains(sizes, MediaSizeName.ISO_A4)) { - attributes.add(MediaSizeName.ISO_A4); - } else if (ArrayUtil.contains(sizes, MediaSizeName.NA_LETTER)) { - // 降级到 Letter（美标） - attributes.add(MediaSizeName.NA_LETTER); + if (ArrayUtil.contains(sizes, mediaSizeName)) { + attributes.add(mediaSizeName); } } return this; @@ -125,9 +164,8 @@ public class PrintAttributeBuilder implements Builder * @return 当前PrintAttributeBuilder实例，支持链式调用 */ public PrintAttributeBuilder landscape() { - if (support(OrientationRequested.class) && - supportsValue(OrientationRequested.LANDSCAPE)) { - attributes.add(OrientationRequested.LANDSCAPE); + if (support(OrientationRequested.class)) { + addAttribute(OrientationRequested.LANDSCAPE); } return this; } @@ -142,24 +180,23 @@ public class PrintAttributeBuilder implements Builder * @return 当前 PrintAttributeBuilder 实例，支持链式调用 */ public PrintAttributeBuilder portrait() { - if (support(OrientationRequested.class) && - supportsValue(OrientationRequested.PORTRAIT)) { - attributes.add(OrientationRequested.PORTRAIT); + if (support(OrientationRequested.class)) { + addAttribute(OrientationRequested.PORTRAIT); } return this; } /** - * 双面打印（若支持则启用，否则自动降级为单面并告警） + * 双面打印（若支持则启用，否则自动降级为单面） * * @return this */ public PrintAttributeBuilder duplex() { if (support(Sides.class)) { final Sides[] sides = getSupportedValues(Sides.class); - if (Arrays.asList(sides).contains(Sides.DUPLEX)) { + if (ArrayUtil.contains(sides, Sides.DUPLEX)) { attributes.add(Sides.DUPLEX); - } else if (Arrays.asList(sides).contains(Sides.TUMBLE)) { + } else if (ArrayUtil.contains(sides, Sides.TUMBLE)) { attributes.add(Sides.TUMBLE); } else { attributes.add(Sides.ONE_SIDED); @@ -176,8 +213,7 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用 */ public PrintAttributeBuilder oneSided() { - attributes.add(Sides.ONE_SIDED); - return this; + return addAttribute(Sides.ONE_SIDED); } /** @@ -186,9 +222,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder monochrome() { - if (support(Chromaticity.class) && - supportsValue(Chromaticity.MONOCHROME)) { - attributes.add(Chromaticity.MONOCHROME); + if (support(Chromaticity.class)) { + doAddAttribute(Chromaticity.MONOCHROME); } return this; } @@ -199,9 +234,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder color() { - if (support(Chromaticity.class) && - supportsValue(Chromaticity.COLOR)) { - attributes.add(Chromaticity.COLOR); + if (support(Chromaticity.class)) { + doAddAttribute(Chromaticity.COLOR); } return this; } @@ -212,9 +246,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder collated() { - if (support(SheetCollate.class) && - supportsValue(SheetCollate.COLLATED)) { - attributes.add(SheetCollate.COLLATED); + if (support(SheetCollate.class)) { + doAddAttribute(SheetCollate.COLLATED); } return this; } @@ -225,9 +258,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder uncollated() { - if (support(SheetCollate.class) && - supportsValue(SheetCollate.UNCOLLATED)) { - attributes.add(SheetCollate.UNCOLLATED); + if (support(SheetCollate.class)) { + doAddAttribute(SheetCollate.UNCOLLATED); } return this; } @@ -238,9 +270,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder highQuality() { - if (support(PrintQuality.class) && - supportsValue(PrintQuality.HIGH)) { - attributes.add(PrintQuality.HIGH); + if (support(PrintQuality.class)) { + doAddAttribute(PrintQuality.HIGH); } return this; } @@ -251,9 +282,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder draftMode() { - if (support(PrintQuality.class) && - supportsValue(PrintQuality.DRAFT)) { - attributes.add(PrintQuality.DRAFT); + if (support(PrintQuality.class)) { + doAddAttribute(PrintQuality.DRAFT); } return this; } @@ -264,9 +294,8 @@ public class PrintAttributeBuilder implements Builder * @return this，用于链式调用。 */ public PrintAttributeBuilder manualTray() { - if (support(MediaTray.class) && - supportsValue(MediaTray.MANUAL)) { - attributes.add(MediaTray.MANUAL); + if (support(MediaTray.class)) { + doAddAttribute(MediaTray.MANUAL); } return this; } @@ -284,6 +313,17 @@ public class PrintAttributeBuilder implements Builder return this; } + /** + * 添加打印属性 + * + * @param attr 要添加的打印属性对象 + * @return this，用于链式调用 + */ + public PrintAttributeBuilder addAttribute(final Attribute attr) { + doAddAttribute(attr); + return this; + } + /** * 构建最终的属性集 */ @@ -324,6 +364,20 @@ public class PrintAttributeBuilder implements Builder } } + /** + * 添加打印属性 + * + * @param attr 要添加的打印属性对象 + * @return {@code true}表示支持属性，添加成功，否则返回{@code false} + */ + private boolean doAddAttribute(final Attribute attr) { + if (supportsValue(attr)) { + attributes.add(attr); + return true; + } + return false; + } + private boolean support(final Class attrClass) { return supportedAttrs.contains(attrClass); } @@ -351,7 +405,7 @@ public class PrintAttributeBuilder implements Builder final Object vals = printer.getSupportedAttributeValues( value.getCategory(), null, null); if (vals instanceof final Attribute[] arr) { - return Arrays.asList(arr).contains(value); + return ArrayUtil.contains(arr, value); } return false; } diff --git a/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintUtil.java b/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintUtil.java index 39bf5c9543..972525ce4a 100644 --- a/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintUtil.java +++ b/hutool-swing/src/main/java/cn/hutool/v7/swing/PrintUtil.java @@ -19,9 +19,7 @@ package cn.hutool.v7.swing; import cn.hutool.v7.core.text.StrUtil; import javax.print.PrintService; -import javax.print.attribute.HashPrintRequestAttributeSet; import javax.print.attribute.PrintRequestAttributeSet; -import javax.print.attribute.standard.*; import java.awt.print.Printable; import java.awt.print.PrinterException; import java.awt.print.PrinterJob; @@ -98,7 +96,7 @@ public class PrintUtil { * * @param printable 可打印内容 * @param printerName 打印机名称(可选) - * @param attributes 打印属性(可选) + * @param attributes 打印属性(可选)，建议使用{@link PrintAttributeBuilder} */ public static void print(final Printable printable, final String printerName, PrintRequestAttributeSet attributes) { try { @@ -112,17 +110,7 @@ public class PrintUtil { } if (attributes == null) { - attributes = new HashPrintRequestAttributeSet(); - // 打印纸张大小 - attributes.add(MediaSizeName.ISO_A4); - // 打印方向 - attributes.add(OrientationRequested.PORTRAIT); - // 打印质量 - attributes.add(PrintQuality.NORMAL); - // 打印颜色 - attributes.add(Chromaticity.COLOR); - // 打印份数 - attributes.add(new Copies(1)); + attributes = colorA4(job.getPrintService(), 1); } job.setPrintable(printable); @@ -131,4 +119,38 @@ public class PrintUtil { throw new SwingException(e); } } + + /** + * 创建用于彩色A4打印的打印属性集 + * + * @param printer 打印服务对象 + * @param copies 份数 + * @return 包含A4纸张、彩色打印、纵向打印、高质量打印设置的打印属性集 + */ + public static PrintRequestAttributeSet colorA4(final PrintService printer, final int copies) { + return PrintAttributeBuilder.of(printer) + .a4Paper() // A4纸张 + .color() // 彩色打印 + .portrait() // 纵向打印 + .copies(copies) // 份数 + .highQuality() // 高质量打印 + .build(); + } + + /** + * 创建用于横向彩色A4打印的打印属性集 + * + * @param printer 打印服务对象 + * @param copies 份数 + * @return 包含A4纸张、彩色打印、横向打印、高质量打印设置的打印属性集 + */ + public static PrintRequestAttributeSet landscapeColorA4(final PrintService printer, final int copies) { + return PrintAttributeBuilder.of(printer) + .a4Paper() // A4纸张 + .color() // 彩色打印 + .landscape() // 横向打印 + .copies(copies) // 份数 + .highQuality() // 高质量打印 + .build(); + } }