From 077805bac60abc6ce0f57deff75591b4502d8970 Mon Sep 17 00:00:00 2001 From: tangzh Date: Tue, 15 Jul 2025 17:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/WebSocketVueServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java index e8d697c..02abcfe 100644 --- a/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java +++ b/eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java @@ -181,7 +181,7 @@ public class WebSocketVueServiceImpl extends WebSocketService { // {"Topic":"sdcp/request/12345678","command":"PAUSE"} else if (command.equals(CapabilitieEnum.PAUSE.name())) { BusDevice device = myDeviceService.getByDeviceCode(deviceSn); - if (!(device.getStatus().equals(CurrentStatusEnum.SDCP_MACHINE_STATUS_PRINTING.getCode()) && device.getStatus().equals(CurrentStatusEnum.SDCP_MACHINE_STATUS_PREPARE.getCode()))) { + if (!(device.getStatus().equals(CurrentStatusEnum.SDCP_MACHINE_STATUS_PRINTING.getCode()) || device.getStatus().equals(CurrentStatusEnum.SDCP_MACHINE_STATUS_PREPARE.getCode()))) { Map commandResult = new HashMap<>(); commandResult.put("deviceSn", deviceSn); sendVueMessage(session, JSON.toJSONString(new SocketMsg(commandResult, "当前状态无法操作暂停", MsgEnum.ERROR))); @@ -213,7 +213,7 @@ public class WebSocketVueServiceImpl extends WebSocketService { // {"Topic":"sdcp/request/12345678","command":"CONTINUE"} else if (command.equals(CapabilitieEnum.CONTINUE.name())) { BusDevice device = myDeviceService.getByDeviceCode(deviceSn); - if (!(device.getStatus().equals(CurrentStatusEnum.SDCP_MACHINE_STATUS_PRINTING.getCode()) && device.getPrintStatus().equals(PrintInfoStatusEnum.SDCP_PRINT_STATUS_PAUSED.getCode()))) { + if (!(device.getStatus().equals(CurrentStatusEnum.SDCP_MACHINE_STATUS_PRINTING.getCode()) || device.getPrintStatus().equals(PrintInfoStatusEnum.SDCP_PRINT_STATUS_PAUSED.getCode()))) { Map commandResult = new HashMap<>(); commandResult.put("deviceSn", deviceSn); sendVueMessage(session, JSON.toJSONString(new SocketMsg(commandResult, "当前状态无法操作继续", MsgEnum.ERROR)));