diff --git a/src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java b/src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java index 399f84d..6346289 100644 --- a/src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java +++ b/src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java @@ -15,9 +15,9 @@ public class WebSocketMessageType { public static final String SPRAY_POINT = "spray_point"; /** - * 湿度 + * 传感器 */ - public static final String HUMIDITY = "humidity"; + public static final String SENSOR = "sensor"; /** * 系统急停按钮被按下 diff --git a/src/main/java/com/qyft/ms/app/device/spray/HumidityCollector.java b/src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java similarity index 92% rename from src/main/java/com/qyft/ms/app/device/spray/HumidityCollector.java rename to src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java index 6192544..f9477e6 100644 --- a/src/main/java/com/qyft/ms/app/device/spray/HumidityCollector.java +++ b/src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java @@ -20,7 +20,7 @@ import java.util.concurrent.*; @Slf4j @Component @RequiredArgsConstructor -public class HumidityCollector { +public class SensorCollector { private final WebSocketService webSocketService; private final DeviceCommandService deviceCommandService; @@ -36,12 +36,12 @@ public class HumidityCollector { Double deviceHumidity = humidityGetCmdFutureResult.getDouble("humidity"); Map map = new HashMap<>(); map.put("humidity", deviceHumidity); - webSocketService.pushMsg(WebSocketMessageType.HUMIDITY, map); + webSocketService.pushMsg(WebSocketMessageType.SENSOR, map); } catch (Exception e) { if (!executorService.isShutdown()) { executorService.shutdown(); // 关闭 ScheduledExecutorService } - log.error("定时推送设备状态异常", e); + log.error("定时推送传感器状态错误", e); } }, 10, 1000, TimeUnit.MILLISECONDS); }