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/hx2023/kafka/KafkaDeviceReport.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 5fa5291..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,11 +31,11 @@
      * @param data
      * @return
      */
-    public String sendGrainData2Cloud(GrainData data) {
+    public String sendGrainData2Cloud(KafaGrainData data) {
 
 
         String strData = JSONObject.toJSONString(data);
-        log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}", strData);
+        //log.debug("----鎺ㄩ�佺伯鎯呬俊鎭埌浜戠---{}", strData);
 
         //鎺ㄩ�佷俊鎭�
         kafkaTemplate.send("TOPIC_ZLJ_GRAIN_TEMPERATURE", strData).addCallback(success -> {
@@ -45,9 +46,9 @@
             // 娑堟伅鍦ㄥ垎鍖哄唴鐨刼ffset
             long offset = success.getRecordMetadata().offset();
 
-            log.info("绮儏鎺ㄩ�佹垚鍔�:{}-{}-{}-{}", topic, partition, offset, data.getDeviceID());
+            log.info("---绮儏-->>浜戠鎴愬姛:{}-{}-{}-{}", topic, partition, offset, strData);
         }, failure -> {
-            log.info("绮儏鎺ㄩ�佸け璐�:{}-{}", data.getDeviceID(), failure.getMessage());
+            log.info("---绮儏-->>浜戠澶辫触:{}-{}", data.getDeviceID(), failure.getMessage());
         });
 
         return "SUCCESS";

--
Gitblit v1.9.3