From 236cf59aae727d304487676413c4337f73b16e67 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 16 一月 2024 12:14:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway

---
 src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
index 14f9580..8b6907e 100644
--- a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
+++ b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
@@ -303,16 +303,18 @@
             }
             reqData = new BaseReqData();
             reqData.setProductId(device.getProductId());
+            reqData.setDeviceName(device.getDeviceName());
             reqData.setDeviceId(param.getDeviceId());
             reqData.setDayTime(param.getDayTime());
             reqData.setDevice(device);
 
+            //鑾峰彇鍒�
             resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrainKafka(reqData);
 
             //鑷姩鎺ㄩ��
             if (BaseResp.CODE_200 == resp.getCode()) {
                 reqData.setData(resp.getData());
-                gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainDataByKafka(reqData);
+                gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportGrainDataByHand(reqData);
             }
         }
 

--
Gitblit v1.9.3