From 013c5f28422defd9b47abbe17a827be693872a26 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 04 一月 2024 14:39:26 +0800
Subject: [PATCH] 调整优化正来电子粮情协议
---
src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisTH.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisTH.java b/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisTH.java
index beb890b..4b3f8c8 100644
--- a/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisTH.java
+++ b/src/main/java/com/fzzy/protocol/zldz/analysis/AnalysisTH.java
@@ -27,11 +27,11 @@
* 瑙ｆ瀽浠撳簱娓╂箍搴︿俊鎭紝灏嗕俊鎭斁鍦ㄧ紦瀛樹腑锛屼互渚跨伯鎯呬娇鐢�
*
* @param msg
- * @param ser
+ * @param device
*/
- public void analysis8828(ReMessage msg, GatewayDevice ser) {
+ public void analysis8828(ReMessage msg, GatewayDevice device) {
- log.debug("-----------analysis8828------------{}.{}", ser.getIp(), ser.getPort());
+ log.debug("-----------analysis8828------------{}.{}", device.getIp(), device.getPort());
String content = msg.getBody().getContent();
@@ -55,8 +55,8 @@
t = BytesUtil.hexToInt("FF" + temp);
}
if (t == ERROR_TH_TAG) {
- log.error("{}娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�", ser.getDeviceName());
- th.setRemark(ser.getDeviceName() + "娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�");
+ log.error("{}娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�", device.getDeviceName());
+ th.setRemark(device.getDeviceName() + "娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�");
} else {
th.setTempIn(Double.valueOf(t));
}
@@ -70,17 +70,17 @@
h = BytesUtil.hexToInt("FF" + temp);
}
if (h == ERROR_TH_TAG) {
- log.error("{}娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�", ser.getDeviceName());
- th.setRemark(ser.getDeviceName() + "娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�");
+ log.error("{}娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�", device.getDeviceName());
+ th.setRemark(device.getDeviceName() + "娓╂箍搴﹁В鏋愬紓甯革紝鍘熷洜锛氭病鏈夋娴嬪埌浼犳劅鍣�");
} else {
th.setHumidityIn(Double.valueOf(h));
}
- th.setSerId(ser.getId());
+ th.setSerId(device.getDeviceId());
th.setThAddr(thAddr + "");
//瀛樻斁缂撳瓨
- ProtocolUtils.addTh2Map(ser.getDeviceId(), th);
+ ProtocolUtils.addTh2Map(device.getDeviceId(), th);
log.info("浠撴俯浠撴箍瑙ｆ瀽瀹屾垚={}", th);
}
--
Gitblit v1.9.3