From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java | 85 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 19 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
index 8c07181..a25bc62 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.IResponseInnerFrame;
@@ -98,25 +99,26 @@
return null;
}
this.c3Mac = hex.substring(0, 8);
- this.year = hex.substring(8, 10);
- this.month = hex.substring(10, 12);
- this.day = hex.substring(12, 14);
- this.hour = hex.substring(14, 16);
- this.min = hex.substring(16, 18);
- this.sec = hex.substring(18, 20);
- this.chargingPort = hex.substring(20, 24);
- this.statusBit = hex.substring(24, 26);
- this.deviceTemperature = (parseVal(hex, 26, 28) + "." + parseVal(hex, 28, 30));
- this.gridVoltage = hex.substring(30, 34);
- this.gridCurrent = hex.substring(34, 38);
- this.frequency = hex.substring(38, 42);
- this.powerFactor = hex.substring(42, 46);
- this.activePower = hex.substring(46, 50);
- this.reactivePower = hex.substring(50, 54);
- this.chargedCapacity = hex.substring(54, 58);
- this.reservedCapacity = hex.substring(58, 62);
- this.remainingAmount = hex.substring(62, 66);
- this.alreadyChargingTime = hex.substring(66, 72);
+ this.year = parseVal(hex.substring(8, 10));
+ this.month = parseVal(hex.substring(10, 12));
+ this.day = parseVal(hex.substring(12, 14));
+ this.hour = parseVal(hex.substring(14, 16));
+ this.min = parseVal(hex.substring(16, 18));
+ this.sec = parseVal(hex.substring(18, 20));
+ this.chargingPort = parseVal(hex.substring(20, 24));
+ this.statusBit = parseVal(hex.substring(24, 26));
+ this.deviceTemperature = temperatureTransition(hex.substring(26, 30)) + "";
+ this.gridVoltage = (parseVal(hex, 30, 34) * 0.01) + "";
+ this.gridCurrent = (parseVal(hex, 34, 38) * 0.01 + "");
+ this.frequency = (parseVal(hex, 38, 42) * 0.01 + "");
+ this.powerFactor = (parseVal(hex, 42, 46) * 0.01 + "");
+ this.activePower = (parseVal(hex, 46, 50) * 0.01 + "");
+ this.reactivePower = (parseVal(hex, 50, 54) * 0.01 + "");
+ this.chargedCapacity = (parseVal(hex, 54, 58) * 0.01 + "");
+ this.reservedCapacity = (parseVal(hex, 58, 62) * 0.01 + "");
+ this.remainingAmount = (parseVal(hex, 62, 66) * 0.01 + "");
+ this.alreadyChargingTime = parseVal(hex.substring(66, 72));
+ //72-80淇濈暀锛屾殏鏈娇鐢�
return this;
}
@@ -124,5 +126,50 @@
private Integer parseVal(String frame, int start, int end) {
return Integer.parseInt(frame.substring(start, end), 16);
}
+
+ private String parseVal(String hex) {
+ return Integer.parseInt(hex, 16) + "";
+ }
+
+ /**
+ * 灏�16杩涘埗杞垚2杩涘埗锛岃繘琛岃ˉ鐮侊紙鍙嶇爜鍩虹涓�+1锛夛紝寰楀埌姝ｇ‘鏁板��
+ * 浼犲叆16杩涘埗鐨勬俯搴︼紝绫诲瀷涓篠tring
+ * 濡侳500
+ */
+ public Double temperatureTransition(String temperature) {
+
+ //灏嗕紶杩涙潵鐨�16杩涘埗鐨勮浆涓�2杩涘埗
+ String twoBinStr = hexStr2BinStr(temperature);
+
+ if ("1".equals(twoBinStr.substring(0, 1))) {
+ //鏈�楂樹綅鏄�1锛屼负璐熸暟,灏�16杩涘埗鐨勮繘琛岃ˉ鐮侊紝杩斿洖
+ int max = 0b1111111111111111;
+ double result = (max - HexUtil.hexToInt(temperature)) * (-0.01);
+ return result;
+
+ } else if ("0".equals(twoBinStr.substring(0, 1))) {
+ //鏈�楂樹綅鏄�0锛屾鏁帮紝鐩存帴杩斿洖
+ double result = (HexUtil.hexToInt(temperature)) * (0.01);
+ return result;
+
+ }
+ //
+ return 0.00;
+ }
+
+ /**
+ * 16杩涘埗瀛楃涓茶浆涓轰簩杩涘埗
+ */
+ public String hexStr2BinStr(String hexStr) {
+ if (hexStr == null || hexStr.length() % 2 != 0) {
+ return null;
+ }
+ String bString = "", tmp;
+ for (int i = 0; i < hexStr.length(); i++) {
+ tmp = "0000" + Integer.toBinaryString(Integer.parseInt(hexStr.substring(i, i + 1), 16));
+ bString += tmp.substring(tmp.length() - 4);
+ }
+ return bString;
+ }
}
}
--
Gitblit v1.9.3