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 ++++++++++++++-
src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java | 4 ++--
src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java | 5 ++---
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java
index a9c7e68..11d3573 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainWeather.java
@@ -15,13 +15,13 @@
private String pm;
- private String radiation;
+ private String radiation = "0";
private String rainfallAmount;
private String temperature;
- private String windAngle;
+ private String windAngle="0";
private String windDirection;
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));
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
index 742bbf0..d863ab5 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/OnReceiveMqttService.java
@@ -3,14 +3,13 @@
import com.alibaba.fastjson2.JSONObject;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayRemoteManager;
-import com.fzzy.gateway.hx2023.data.CloudSendData;
+import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.data.BaseResp;
+import com.fzzy.gateway.hx2023.data.CloudSendData;
import com.fzzy.gateway.hx2023.data.SyncReqData;
import com.fzzy.mqtt.MqttProviderConfig;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
--
Gitblit v1.9.3