From a21b02f9c11dd06db5c2c3468bdd964adfed7b27 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 09 十一月 2023 00:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java
index 11cc0e9..eba0819 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncGrainImpl.java
@@ -135,7 +135,6 @@
//鏍瑰彿
cableNum = (i / cableZ) + 1;
-
temperature.add(new GrainTemp(cableNum + "", z + "", curTemp + "", position + ""));
}
@@ -143,6 +142,20 @@
grain.setOutPut(outPut);
+ //姘旇薄淇℃伅
+ GrainWeather weatherStation = new GrainWeather();
+ weatherStation.setMessageId(ScConstant.getMessageId());
+ weatherStation.setId(device.getDeviceId());
+ weatherStation.setAirPressure(weather.getPressure());
+ weatherStation.setHumidity(weather.getHumidity());
+ weatherStation.setPm(weather.getAir_pm25());
+ weatherStation.setRadiation("0");
+ weatherStation.setRainfallAmount(weather.getWea());
+ weatherStation.setTemperature(weather.getTem());
+ weatherStation.setWindDirection(weather.getWin());
+ weatherStation.setWindPower(weather.getWin_meter());
+ weatherStation.setWindSpeed(weather.getWin_speed());
+ grain.setWeatherStation(weatherStation);
BaseResp resp = new BaseResp();
resp.setData(JSONObject.toJSONString(grain));
--
Gitblit v1.9.3