From 78c45343d67b8d2daeffeb78e8cb18264e0ba640 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 13 Feb 2026 11:49:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(printer):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E9=85=8D=E7=BD=AE=E6=9E=84=E5=BB=BA=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 WatermarkConfig 构建过程拆分为条件判断分支 - 针对 IPC 图像源增加特殊处理逻辑 - 统一构建器模式的调用流程 - 提高代码可读性和维护性 - 保持原有功能不变的情况下优化结构 --- .../service/printer/impl/PrinterServiceImpl.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java index c555e5d6..af565d18 100644 --- a/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/printer/impl/PrinterServiceImpl.java @@ -1087,7 +1087,7 @@ public class PrinterServiceImpl implements PrinterService { String printWatermarkPUrl = scenicConfig.getString("print_watermark_p_url", null); String printWatermarkLUrl = scenicConfig.getString("print_watermark_l_url", null); - return WatermarkConfig.builder() + WatermarkConfig.WatermarkConfigBuilder builder = WatermarkConfig.builder() .watermarkType(watermarkType) .scenicText(scenicText) .dateFormat(dateFormat) @@ -1095,9 +1095,14 @@ public class PrinterServiceImpl implements PrinterService { .storageAdapter(StorageFactory.use()) .edgeEnabled(true) .qrcodeFile(qrCodeFile) - .scale(scale) - .printWatermarkPUrlList(Collections.singletonList(printWatermarkPUrl)) - .printWatermarkLUrlList(Collections.singletonList(printWatermarkLUrl)) + .scale(scale); + if (context.getSource() == ImageSource.IPC) { + return builder + .printWatermarkPUrlList(Collections.singletonList(printWatermarkPUrl)) + .printWatermarkLUrlList(Collections.singletonList(printWatermarkLUrl)) + .build(); + } + return builder .build(); }