From 50da1f165cc96d49d72694606920b77c74e1747c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 04 一月 2024 10:57:26 +0800
Subject: [PATCH] 调整KFKA数据推送测试2
---
src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java | 1 +
src/main/java/com/fzzy/gateway/hx2023/ScConstant.java | 6 ++++++
src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReportService.java | 3 ---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 3 ++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
index a533499..14f9580 100644
--- a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
+++ b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
@@ -302,6 +302,7 @@
continue;
}
reqData = new BaseReqData();
+ reqData.setProductId(device.getProductId());
reqData.setDeviceId(param.getDeviceId());
reqData.setDayTime(param.getDayTime());
reqData.setDevice(device);
diff --git a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
index dc8a7fe..13ef51c 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
@@ -58,6 +58,12 @@
*/
public static String TOPIC_EQUIPMENT_HEARTBEAT = "TOPIC_EQUIPMENT_HEARTBEAT_{kqdm}";
+
+ /**
+ * kafak 绮儏鏁版嵁鎺ㄩ�佸埌浜戠
+ */
+ public static String TOPIC_ZLJ_GRAIN_TEMPERATURE = "TOPIC_ZLJ_GRAIN_TEMPERATURE";
+
/**
* 缃戝叧璁惧鐘舵�佹秷鎭秷鎭� topic锛歍OPIC_EQUIPMENT_STATUS_{搴撶偣缂栫爜}
*/
diff --git a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReportService.java b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReportService.java
index 81ff5e4..4b17a11 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReportService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReportService.java
@@ -22,9 +22,6 @@
public String publishWithTopic(String sendData, String topic) {
-
-
-
//鎺ㄩ�佷俊鎭�
kafkaTemplate.send(topic, sendData).addCallback(success -> {
// 娑堟伅鍙戦�佸埌鐨則opic
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index 41bc49a..84afea1 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -145,7 +145,8 @@
@Override
public BaseResp reportGrainDataByKafka(BaseReqData reqData) {
- String topic = ScConstant.TOPIC_MESSAGE_REPORT;
+ String topic = ScConstant.TOPIC_ZLJ_GRAIN_TEMPERATURE;
+
//濡傛灉鏄祴璇曟ā寮忎笉鎵ц鎺ㄩ��
if (configData.getActive().indexOf("dev") >= 0) {
--
Gitblit v1.9.3