From fa0c3a1a436c4b0cc1239e3d2b68b728796a987b Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Wed, 5 Nov 2025 14:45:55 +0800 Subject: [PATCH] =?UTF-8?q?feat(printer):=20=E6=94=AF=E6=8C=81=E6=8C=89?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=88=9B=E5=BB=BA=E5=A4=9A=E4=B8=AA=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E4=BB=BB=E5=8A=A1-=20=E6=A0=B9=E6=8D=AE=E7=85=A7?= =?UTF-8?q?=E7=89=87=E6=95=B0=E9=87=8F=E7=94=9F=E6=88=90=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9A=84=E6=89=93=E5=8D=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?-=20=E9=BB=98=E8=AE=A4=E8=87=B3=E5=B0=91=E5=88=9B=E5=BB=BA1?= =?UTF-8?q?=E4=B8=AA=E6=89=93=E5=8D=B0=E4=BB=BB=E5=8A=A1=20-=20=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=8E=9F=E6=9C=89=E5=8D=95=E4=BB=BB=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=B9=B6=E9=80=82=E9=85=8D=E5=A4=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=20-=20=E7=A1=AE=E4=BF=9D=E6=AF=8F=E4=B8=AA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8B=AC=E7=AB=8B=E6=8F=92=E5=85=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=20-=20=E7=BB=B4=E6=8C=81=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=9C=BA=E8=BD=AE=E8=AF=A2=E9=80=89=E6=8B=A9=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../printer/impl/PrinterServiceImpl.java | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 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 575e4ffe..da97b0de 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 @@ -620,21 +620,28 @@ public class PrinterServiceImpl implements PrinterService { log.error("获取景区配置失败,使用原始照片进行打印。景区ID: {}, 照片ID: {}", item.getScenicId(), item.getId(), e); } - // 获取打印机名称(支持轮询) - String selectedPrinter = getNextPrinter(printer); + // 根据数量创建多个打印任务 + Integer quantity = item.getQuantity(); + if (quantity == null || quantity <= 0) { + quantity = 1; // 默认至少打印1张 + } - PrintTaskEntity task = new PrintTaskEntity(); - task.setPrinterId(printer.getId()); - task.setPrinterName(selectedPrinter); - task.setMpId(item.getId()); - task.setPaper(printer.getPreferPaper()); - task.setStatus(0); - task.setUrl(printUrl); - task.setHeight(printer.getPreferH()); - task.setWidth(printer.getPreferW()); - task.setCreateTime(new Date()); - task.setUpdateTime(new Date()); - printTaskMapper.insertTask(task); + for (int i = 0; i < quantity; i++) { + // 获取打印机名称(支持轮询) + String selectedPrinter = getNextPrinter(printer); + PrintTaskEntity task = new PrintTaskEntity(); + task.setPrinterId(printer.getId()); + task.setPrinterName(selectedPrinter); + task.setMpId(item.getId()); + task.setPaper(printer.getPreferPaper()); + task.setStatus(0); + task.setUrl(printUrl); + task.setHeight(printer.getPreferH()); + task.setWidth(printer.getPreferW()); + task.setCreateTime(new Date()); + task.setUpdateTime(new Date()); + printTaskMapper.insertTask(task); + } }); }