From 9732169190c0d89ee3943ed9f5d73a1f6eb6c836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Mon, 14 Jul 2025 17:06:39 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=99=9A=E6=8B=9F=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=BD=E7=8E=BB=E5=8F=B0=E6=B8=A9=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qyft/ms/app/device/spray/SensorCollector.java | 19 ++++++++++++------- .../com/qyft/ms/app/service/VirtualDeviceService.java | 6 ++++++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java b/src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java index 6696e1e..9b91fcc 100644 --- a/src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java +++ b/src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java @@ -29,18 +29,23 @@ public class SensorCollector { ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); executorService.scheduleAtFixedRate(() -> { try { - DeviceCommand humidityGetCmd = DeviceCommandGenerator.humidityGet(); + DeviceCommand humidityGetCmd = DeviceCommandGenerator.humidityGet();//湿度 CommandFuture humidityGetCmdFuture = deviceCommandService.sendCommandNoFront(humidityGetCmd); - DeviceCommand getSlidePlatHeat = DeviceCommandGenerator.getSlidePlatHeat(); - CommandFuture getSlidePlatHeatFuture = deviceCommandService.sendCommandNoFront(getSlidePlatHeat); - commandWait(humidityGetCmdFuture,getSlidePlatHeatFuture); + DeviceCommand getSlidePlatHeatCmd = DeviceCommandGenerator.getSlidePlatHeat();//载玻台温度 + CommandFuture getSlidePlatHeatCmdFuture = deviceCommandService.sendCommandNoFront(getSlidePlatHeatCmd); + DeviceCommand getNozzleHeatCmd = DeviceCommandGenerator.getNozzleHeat();//喷嘴温度 + CommandFuture getNozzleHeatCmdFuture = deviceCommandService.sendCommandNoFront(getNozzleHeatCmd); + commandWait(humidityGetCmdFuture, getSlidePlatHeatCmdFuture); JSONObject humidityGetCmdFutureResult = humidityGetCmdFuture.getResponseResult(); - JSONObject getSlidePlatHeatFutureResult = getSlidePlatHeatFuture.getResponseResult(); + JSONObject getSlidePlatHeatFutureResult = getSlidePlatHeatCmdFuture.getResponseResult(); + JSONObject getNozzleHeatCmdFutureResult = getNozzleHeatCmdFuture.getResponseResult(); Double deviceHumidity = humidityGetCmdFutureResult.getJSONObject("data").getDouble("humidity"); - Double temperature = getSlidePlatHeatFutureResult.getJSONObject("data").getDouble("temperature"); + Double slideTemperature = getSlidePlatHeatFutureResult.getJSONObject("data").getDouble("temperature"); + Double nozzleTemperature = getNozzleHeatCmdFutureResult.getJSONObject("data").getDouble("temperature"); Map map = new HashMap<>(); map.put("humidity", deviceHumidity); - map.put("temperature", temperature); + map.put("slide_temperature", slideTemperature); + map.put("nozzle_temperature", nozzleTemperature); webSocketService.pushMsgNoLog(WebSocketMessageType.SENSOR, map); } catch (Exception ignored) { } diff --git a/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java b/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java index 7381478..7f1eaef 100644 --- a/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java +++ b/src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java @@ -49,6 +49,12 @@ public class VirtualDeviceService { data.putOnce("temperature", 50); jsonObject.putOnce("data", data); } + }else if (device.contains("nozzle_temperature")) { + if (action.contains("get")) {//获取设备整体状态 + JSONObject data = new JSONObject(); + data.putOnce("temperature", 60); + jsonObject.putOnce("data", data); + } } }