From ddefa6dc2532bf0a405d216a8fa8e2a4bb0bf96f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 18 十一月 2023 14:17:42 +0800
Subject: [PATCH] 增加HTTP地磅协议实现
---
src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
index 3bd840c..c9d3ec5 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/ScGatewayTestServiceImpl.java
@@ -289,7 +289,7 @@
headers.setDeviceName(device.getDeviceName());
headers.setProductId(device.getProductId());
headers.setOrgId(device.getOrgId());
- headers.setMsgId(ScConstant.getMessageId());
+ headers.setMsgId(reqData.getMessageId());
grain.setHeaders(headers);
GrainOutPut outPut = new GrainOutPut();
@@ -342,7 +342,7 @@
outPut.setTemperature(temperature);
- grain.setOutput(outPut);
+ grain.setOutput(JSONObject.toJSONString(outPut));
GatewayDevice gatewayDeviceWeather = GatewayUtils.getCacheByDeviceTypeOne(GatewayDeviceType.TYPE_09.getCode());
@@ -350,6 +350,7 @@
//姘旇薄淇℃伅
GrainWeather weatherStation = new GrainWeather();
weatherStation.setMessageId(ScConstant.getMessageId());
+ weatherStation.setMessgeId(weatherStation.getMessageId());
if (null != gatewayDeviceWeather) {
weatherStation.setId(gatewayDeviceWeather.getDeviceId());
@@ -365,7 +366,7 @@
weatherStation.setWindDirection(weather.getWin());
weatherStation.setWindPower(weather.getWin_meter());
weatherStation.setWindSpeed(weather.getWin_speed());
- grain.setWeatherStation(weatherStation);
+ grain.setWeatherStation(JSONObject.toJSONString(weatherStation));
return new BaseResp(JSONObject.toJSONString(grain));
}
--
Gitblit v1.9.3