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)) { // 返回当前打印队列状态