From 191c6dfce76986f240197244031cbe00618dfdec Mon Sep 17 00:00:00 2001 From: lifangliang Date: Fri, 29 Aug 2025 17:23:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=9C=BA=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../printserver/main/service/PrintQueueService.java | 2 +- .../goeing/printserver/main/ws/PrinterClient.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java b/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java index f15cd17..dd28e41 100644 --- a/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java +++ b/src/main/java/com/goeing/printserver/main/service/PrintQueueService.java @@ -231,7 +231,7 @@ public class PrintQueueService { try { // 执行打印 - Thread.sleep(20000L); +// Thread.sleep(20000L); printService.print(printRequest); log.info("打印任务完成: {}", printRequest.getFileUrl()); diff --git a/src/main/java/com/goeing/printserver/main/ws/PrinterClient.java b/src/main/java/com/goeing/printserver/main/ws/PrinterClient.java index 52260d0..30ba691 100644 --- a/src/main/java/com/goeing/printserver/main/ws/PrinterClient.java +++ b/src/main/java/com/goeing/printserver/main/ws/PrinterClient.java @@ -95,10 +95,18 @@ public class PrinterClient implements ApplicationRunner { PrintService[] printServices = PrinterJob.lookupPrintServices(); Set collect = Arrays.stream(printServices).map(PrintService::getName).collect(Collectors.toSet()); - List collect1 = collect.stream().sorted().collect(Collectors.toList()); + List printerList = collect.stream().sorted().collect(Collectors.toList()); + + // 获取设置中的默认打印机 + String defaultPrinter = config.getDefaultPrinter(); + + // 构建响应对象 + Map response = new HashMap<>(); + response.put("printerList", printerList); + response.put("defaultPrinter", defaultPrinter); webSocketMessageDTO.setType("RESPONSE"); - webSocketMessageDTO.setPayload(JSONUtil.toJsonStr(collect1)); + webSocketMessageDTO.setPayload(JSONUtil.toJsonStr(response)); session.getBasicRemote().sendText(JSONUtil.toJsonStr(webSocketMessageDTO)); } else if ("queueStatus".equals(type)) { // 返回当前打印队列状态