From 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 十一月 2023 17:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 d321e96..b6cd355 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -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));
--
Gitblit v1.9.3