From 3f0b65b6b8af5c8c0aa2efa57be3adf2398cd62c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 21:10:30 +0800
Subject: [PATCH] 四川网关-提交测试
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 94a291c..1fe57e0 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -196,6 +196,7 @@
KafaGrainData result = new KafaGrainData();
result.setMessageId(ScConstant.getMessageId());
+ result.setMessgeId(result.getMessageId());
result.setDeviceID(device.getDeviceId());
result.setAvgTemperature(lastData.getTempAve() + "");
result.setMinTemperature(lastData.getTempMin() + "");
@@ -245,20 +246,20 @@
//鍒ゆ柇鏈�澶�
if (curTemp.equals(result.getMaxTemperature())) {
- result.setMaxX(x);
- result.setMaxY(y);
- result.setMaxZ(position);
+ result.setMaxX(x+"");
+ result.setMaxY(y+"");
+ result.setMaxZ(position+"");
}
//鍒ゆ柇鏈�灏�
if (curTemp.equals(result.getMinTemperature())) {
- result.setMinX(x);
- result.setMinY(y);
- result.setMinZ(position);
+ result.setMinX(x+"");
+ result.setMinY(y+"");
+ result.setMinZ(position+"");
}
- temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x, y));
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
}
//绮俯淇℃伅
@@ -278,8 +279,8 @@
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
- // trhInfo.setTemperatureAndhumidity(temperatureAndhumidity);
trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
+ //trhInfo.put("temperatureAndhumidity",grainTH);
JSONObject params = new JSONObject();
params.put("TRHInfo", trhInfo);
--
Gitblit v1.9.3