From f9de63b6b72c97c4dfabe2a7b5aee3b8a4f11f0a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期二, 07 十一月 2023 23:57:09 +0800
Subject: [PATCH] 增加地磅按钮
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
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 6051cb7..b6cd355 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -6,7 +6,7 @@
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
-import com.fzzy.gateway.hx2023.data.GrainData;
+import com.fzzy.gateway.hx2023.data.KafaGrainData;
import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
import com.fzzy.gateway.hx2023.data.WeightInfo;
@@ -48,6 +48,8 @@
//productId鐨勫�煎湪webSocket鎵ц鍙戦�佹柟娉曚腑琛ュ厖
WebSocketPacketHeader header = new WebSocketPacketHeader();
header.setDeviceName(device.getDeviceName());
+ header.setProductId("hx-weigh-big-01");
+ //header.set
packet.setHeaders(header);
packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
packet.setDeviceId(device.getDeviceId());
@@ -57,7 +59,7 @@
weightInfo.setGrossWeight(weigh);
weightInfo.setNetWeight(weigh);
weightInfo.setNetWeight(weigh);
-
+ weightInfo.setWeightUnit("KG");
JSONObject jsonObject = new JSONObject();
jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));
@@ -77,7 +79,7 @@
}
@Override
- public String pushGrainData2Cloud(GrainData data) {
+ public String pushGrainData2Cloud(KafaGrainData data) {
return kafkaDeviceReport.sendGrainData2Cloud(data);
}
--
Gitblit v1.9.3