Browse Source

feat:虚拟模式增加载玻台温度

master
白凤吉 3 weeks ago
parent
commit
9732169190
  1. 19
      src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java
  2. 6
      src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java

19
src/main/java/com/qyft/ms/app/device/spray/SensorCollector.java

@ -29,18 +29,23 @@ public class SensorCollector {
ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
executorService.scheduleAtFixedRate(() -> { executorService.scheduleAtFixedRate(() -> {
try { try {
DeviceCommand humidityGetCmd = DeviceCommandGenerator.humidityGet();
DeviceCommand humidityGetCmd = DeviceCommandGenerator.humidityGet();//湿度
CommandFuture humidityGetCmdFuture = deviceCommandService.sendCommandNoFront(humidityGetCmd); 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 humidityGetCmdFutureResult = humidityGetCmdFuture.getResponseResult();
JSONObject getSlidePlatHeatFutureResult = getSlidePlatHeatFuture.getResponseResult();
JSONObject getSlidePlatHeatFutureResult = getSlidePlatHeatCmdFuture.getResponseResult();
JSONObject getNozzleHeatCmdFutureResult = getNozzleHeatCmdFuture.getResponseResult();
Double deviceHumidity = humidityGetCmdFutureResult.getJSONObject("data").getDouble("humidity"); 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<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("humidity", deviceHumidity); map.put("humidity", deviceHumidity);
map.put("temperature", temperature);
map.put("slide_temperature", slideTemperature);
map.put("nozzle_temperature", nozzleTemperature);
webSocketService.pushMsgNoLog(WebSocketMessageType.SENSOR, map); webSocketService.pushMsgNoLog(WebSocketMessageType.SENSOR, map);
} catch (Exception ignored) { } catch (Exception ignored) {
} }

6
src/main/java/com/qyft/ms/app/service/VirtualDeviceService.java

@ -49,6 +49,12 @@ public class VirtualDeviceService {
data.putOnce("temperature", 50); data.putOnce("temperature", 50);
jsonObject.putOnce("data", data); 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);
}
} }
} }

Loading…
Cancel
Save