From 4a92b736a9c14eaac38af0d1b26eba7f942c9601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 19 Mar 2025 19:30:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=80=A5=E5=81=9C=E6=94=BE=E5=88=B0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java | 6 ++++++ .../com/qyft/ms/system/service/device/DeviceCommandService.java | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java b/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java index 42b75f8..33701c6 100644 --- a/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java +++ b/src/main/java/com/qyft/ms/app/device/status/DeviceStatus.java @@ -51,6 +51,11 @@ public class DeviceStatus { */ private volatile boolean selfTestCompleted = false; + /** + * 是否按下急停 + */ + private volatile boolean stopPressed = false; + public JSONObject toJSON() { JSONObject json = new JSONObject(); json.putOnce("spraying", spraying); @@ -61,6 +66,7 @@ public class DeviceStatus { json.putOnce("prefilling", prefilling); json.putOnce("dehumidifierRunning", dehumidifierRunning); json.putOnce("selfTestCompleted", selfTestCompleted); + json.putOnce("stopPressed", stopPressed); return json; } diff --git a/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java b/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java index 7de2ef5..8dc1c65 100644 --- a/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java +++ b/src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java @@ -2,6 +2,7 @@ package com.qyft.ms.system.service.device; import cn.hutool.json.JSONObject; import com.qyft.ms.app.common.constant.WebSocketMessageType; +import com.qyft.ms.app.device.status.DeviceStatus; import com.qyft.ms.system.common.constant.CommandStatus; import com.qyft.ms.system.common.device.command.CommandFuture; import com.qyft.ms.system.core.client.DeviceTcpClient; @@ -27,7 +28,7 @@ public class DeviceCommandService { private final DeviceTcpClient deviceTcpClient; private final FrontCommandService frontCommandService; - private final WebSocketService webSocketService; + private final DeviceStatus deviceStatus; public CommandFuture executeCommand(DeviceCommand cmdToDevice) { @@ -92,10 +93,9 @@ public class DeviceCommandService { } else if ("event".equals(tag)) { String eventType = deviceResult.getStr("event_type"); if("system_e_stop_pressed".equals(eventType)) {//系统急停按钮被按下 - webSocketService.pushMsg(WebSocketMessageType.SYSTEM_E_STOP_PRESSED, "系统急停按钮被按下"); + deviceStatus.setStopPressed(true); }else if("system_e_stop_released".equals(eventType)) {//系统急停按钮被释放 - webSocketService.pushMsg(WebSocketMessageType.SYSTEM_E_STOP_RELEASED, "系统急停按钮被释放"); - } + } deviceStatus.setStopPressed(false); } else if ("status".equals(tag)) { }