From e5e40869b53a0e8c9c4e86d3f488dceb08b3b845 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 31 十月 2023 12:18:11 +0800
Subject: [PATCH] 四川省网关接口相关11
---
src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java | 2 +-
src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java | 16 ++++++++--------
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 2 +-
src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java | 12 ++++++------
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
index c51084a..8e73894 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainData.java
@@ -14,7 +14,7 @@
private String messageId;
//璁惧缂栫爜
- private String deviceId;
+ private String deviceID;
//鏁翠粨骞冲潎娓╁害
private String avgTemperature;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java b/src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java
index f28ab6e..834a557 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/GrainDataDetail.java
@@ -9,13 +9,13 @@
public class GrainDataDetail {
//鏍瑰彿
- private int cableNum;
+ private String cableNum;
//灞傚彿
- private int layerNumber;
+ private String layerNumber;
//绱㈠紩
- private int position;
+ private String position;
//娓╁害鍊�
private String temperature;
@@ -24,9 +24,9 @@
}
public GrainDataDetail(int cableNum, int layerNumber, int position, String temperature) {
- this.cableNum = cableNum;
- this.layerNumber = layerNumber;
- this.position = position;
+ this.cableNum = cableNum + "";
+ this.layerNumber = layerNumber + "";
+ this.position = position + "";
this.temperature = temperature;
}
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
index 08423ed..5fa5291 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
@@ -31,12 +31,13 @@
* @return
*/
public String sendGrainData2Cloud(GrainData data) {
-
-
- log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}",data);
+
+
+ String strData = JSONObject.toJSONString(data);
+ log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}", strData);
//鎺ㄩ�佷俊鎭�
- kafkaTemplate.send("TOPIC_ZLJ_GRAIN_TEMPERATURE",JSONObject.toJSONString(data)).addCallback(success -> {
+ kafkaTemplate.send("TOPIC_ZLJ_GRAIN_TEMPERATURE", strData).addCallback(success -> {
// 娑堟伅鍙戦�佸埌鐨則opic
String topic = success.getRecordMetadata().topic();
// 娑堟伅鍙戦�佸埌鐨勫垎鍖�
@@ -44,11 +45,10 @@
// 娑堟伅鍦ㄥ垎鍖哄唴鐨刼ffset
long offset = success.getRecordMetadata().offset();
- log.info("绮儏鎺ㄩ�佹垚鍔�:" + topic + "-" + partition + "-" + offset);
+ log.info("绮儏鎺ㄩ�佹垚鍔�:{}-{}-{}-{}", topic, partition, offset, data.getDeviceID());
}, failure -> {
- log.error("绮儏鎺ㄩ�佸け璐�:" + failure.getMessage());
+ log.info("绮儏鎺ㄩ�佸け璐�:{}-{}", data.getDeviceID(), failure.getMessage());
});
-
return "SUCCESS";
@@ -56,7 +56,7 @@
@KafkaListener(topics = {"TOPIC_ZLJ_GRAIN_TEMPERATURE"})
public void onMessage1(ConsumerRecord<?, ?> record) {
- // log.debug("鑾峰彇娑堣垂淇℃伅锛�" + record.topic() + "-" + record.partition() + "-" + record.value());
+ // log.debug("鑾峰彇娑堣垂淇℃伅锛�" + record.topic() + "-" + record.partition() + "-" + record.value());
}
}
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 67f8bdd..1135ee6 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -197,7 +197,7 @@
GrainData result = new GrainData();
result.setMessageId(ScConstant.getMessageId());
- result.setDeviceId(device.getDeviceId());
+ result.setDeviceID(device.getDeviceId());
result.setAvgTemperature(lastData.getTempAve() + "");
result.setMinTemperature(lastData.getTempMin() + "");
result.setMaxTemperature(lastData.getTempMax() + "");
--
Gitblit v1.9.3