tangzheng/totus-nline
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
tangzh 2025-07-15 17:08:20 +08:00
parent 10e3cea687
commit 077805bac6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/WebSocketVueServiceImpl.java
View File

@ -181,7 +181,7 @@ public class WebSocketVueServiceImpl extends WebSocketService {
// {"Topic":"sdcp/request/12345678","command":"PAUSE"} // {"Topic":"sdcp/request/12345678","command":"PAUSE"}
else if (command.equals(CapabilitieEnum.PAUSE.name())) { else if (command.equals(CapabilitieEnum.PAUSE.name())) {
BusDevice device = myDeviceService.getByDeviceCode(deviceSn); 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<String, Object> commandResult = new HashMap<>(); Map<String, Object> commandResult = new HashMap<>();
commandResult.put("deviceSn", deviceSn); commandResult.put("deviceSn", deviceSn);
sendVueMessage(session, JSON.toJSONString(new SocketMsg(commandResult, "当前状态无法操作暂停", MsgEnum.ERROR))); sendVueMessage(session, JSON.toJSONString(new SocketMsg(commandResult, "当前状态无法操作暂停", MsgEnum.ERROR)));
@ -213,7 +213,7 @@ public class WebSocketVueServiceImpl extends WebSocketService {
// {"Topic":"sdcp/request/12345678","command":"CONTINUE"} // {"Topic":"sdcp/request/12345678","command":"CONTINUE"}
else if (command.equals(CapabilitieEnum.CONTINUE.name())) { else if (command.equals(CapabilitieEnum.CONTINUE.name())) {
BusDevice device = myDeviceService.getByDeviceCode(deviceSn); 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<String, Object> commandResult = new HashMap<>(); Map<String, Object> commandResult = new HashMap<>();
commandResult.put("deviceSn", deviceSn); commandResult.put("deviceSn", deviceSn);
sendVueMessage(session, JSON.toJSONString(new SocketMsg(commandResult, "当前状态无法操作继续", MsgEnum.ERROR))); sendVueMessage(session, JSON.toJSONString(new SocketMsg(commandResult, "当前状态无法操作继续", MsgEnum.ERROR)));