From 0a8ef890592a9c0389c42daeebb9a3f0974c37e6 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 08 十一月 2023 14:59:41 +0800
Subject: [PATCH] 调整MQTT配置

---
 src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

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..adb141c 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/kafka/KafkaDeviceReport.java
@@ -1,11 +1,12 @@
 package com.fzzy.gateway.hx2023.kafka;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.fzzy.gateway.hx2023.data.GrainData;
+import com.fzzy.gateway.hx2023.data.KafaGrainData;
 
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Component;
@@ -30,13 +31,14 @@
      * @param data
      * @return
      */
-    public String sendGrainData2Cloud(GrainData data) {
-    	
-    	
-    	log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}",data);
+    public String sendGrainData2Cloud(KafaGrainData 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 +46,10 @@
             // 娑堟伅鍦ㄥ垎鍖哄唴鐨刼ffset
             long offset = success.getRecordMetadata().offset();
 
-            log.info("绮儏鎺ㄩ�佹垚鍔�:" + topic + "-" + partition + "-" + offset);
+            log.info("---绮儏-->>浜戠鎴愬姛:{}-{}-{}-{}", topic, partition, offset, strData);
         }, failure -> {
-            log.error("绮儏鎺ㄩ�佸け璐�:" + failure.getMessage());
+            log.info("---绮儏-->>浜戠澶辫触:{}-{}", data.getDeviceID(), failure.getMessage());
         });
-
 
         return "SUCCESS";
 
@@ -56,7 +57,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());
     }
 
 }

--
Gitblit v1.9.3