Browse Source

fix:急停放到设备状态中

tags/1.0
白凤吉 5 months ago
parent
commit
54f4867e4a
  1. 5
      src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java

5
src/main/java/com/qyft/ms/system/service/device/DeviceCommandService.java

@ -1,14 +1,12 @@
package com.qyft.ms.system.service.device; package com.qyft.ms.system.service.device;
import cn.hutool.json.JSONObject; 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.app.device.status.DeviceStatus;
import com.qyft.ms.system.common.constant.CommandStatus; import com.qyft.ms.system.common.constant.CommandStatus;
import com.qyft.ms.system.common.device.command.CommandFuture; import com.qyft.ms.system.common.device.command.CommandFuture;
import com.qyft.ms.system.core.client.DeviceTcpClient; import com.qyft.ms.system.core.client.DeviceTcpClient;
import com.qyft.ms.system.model.bo.DeviceCommand; import com.qyft.ms.system.model.bo.DeviceCommand;
import com.qyft.ms.system.model.form.FrontCmdControlForm; import com.qyft.ms.system.model.form.FrontCmdControlForm;
import com.qyft.ms.system.service.WebSocketService;
import com.qyft.ms.system.service.front.FrontCommandService; import com.qyft.ms.system.service.front.FrontCommandService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -95,7 +93,8 @@ public class DeviceCommandService {
if ("system_e_stop_pressed".equals(eventType)) {//系统急停按钮被按下 if ("system_e_stop_pressed".equals(eventType)) {//系统急停按钮被按下
deviceStatus.setStopPressed(true); deviceStatus.setStopPressed(true);
} else if ("system_e_stop_released".equals(eventType)) {//系统急停按钮被释放 } else if ("system_e_stop_released".equals(eventType)) {//系统急停按钮被释放
} deviceStatus.setStopPressed(false);
deviceStatus.setStopPressed(false);
}
} else if ("status".equals(tag)) { } else if ("status".equals(tag)) {
} }

Loading…
Cancel
Save