From 66b091963fb0f3356f27ec094c013369bf91db89 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 24 十二月 2023 14:02:19 +0800
Subject: [PATCH] 游仙协议解析-3
---
src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
index 5e1d840..fd3b52b 100644
--- a/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
+++ b/src/main/java/com/fzzy/protocol/youxian0/analysis/AnalysisService.java
@@ -1,7 +1,6 @@
package com.fzzy.protocol.youxian0.analysis;
import com.alibaba.fastjson.JSONObject;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.NumberUtil;
@@ -39,7 +38,6 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
-
private static Map<String, GrainRoot> contextGrainRoot = new HashMap<>();
@@ -80,11 +78,14 @@
//绮儏杩斿洖
if (ServiceUtils.FUNCTION_66.equalsIgnoreCase(funId)) {
+
+ log.info("---------寮�濮嬭В鏋愮伯鎯呬俊鎭�---------");
this.analysisGrainStep1(device, msgId, strMsg);
}
//娓╂箍搴﹁繑鍥�
if (ServiceUtils.FUNCTION_68.equalsIgnoreCase(funId)) {
+ log.info("---------寮�濮嬭В鏋愪粨娓╂箍搴︿俊鎭�---------");
this.analysisGrainTh(device, strMsg);
}
@@ -130,9 +131,9 @@
String kyeNumHex = strMsg.substring(2, 4);
String kyeNumBin = BytesUtil.toBinary8String(BytesUtil.hexToInt(kyeNumHex));
- String key = kyeNumBin.substring(0, 3);
+ String key = "00000" + kyeNumBin.substring(0, 3);
int keyValue = BytesUtil.hexToInt(BytesUtil.bin2Hex(key));
- key = kyeNumBin.substring(4);
+ key = "0000" + kyeNumBin.substring(4);
int numValue = BytesUtil.hexToInt(BytesUtil.bin2Hex(key));
//02 A4 BB BA BA B4
@@ -149,6 +150,7 @@
point = this.getGrainTemp(keyValue, tempHex);
log.debug("--------瑙ｆ瀽鍚庣殑娓╁害鐐�----{}---{}", tempHex, point);
grainRoot.getPoints().add(point);
+ start = 2 * 2;
}
@@ -307,6 +309,7 @@
log.error("------------绮儏鎺ㄩ�佸け璐ワ紝绯荤粺涓嶅瓨鍦ㄥ綋鍓嶅崗璁墽琛岀被----{}", reqData.getDevice().getDeviceName());
return;
}
+
reportService.reportGrainData(reqData);
}
--
Gitblit v1.9.3