Browse Source

fix:调整传感器ws推送数据类型

tags/1.0
白凤吉 5 months ago
parent
commit
6032346307
  1. 4
      src/main/java/com/qyft/ms/app/common/constant/WebSocketMessageType.java
  2. 6
      src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java

4
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";
/**
* 系统急停按钮被按下

6
src/main/java/com/qyft/ms/app/device/spray/HumidityCollector.java → 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<String, Object> 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);
}
Loading…
Cancel
Save