From 4e76b9737e036c18e8a9e840dc443615ffcec348 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 20 十月 2022 12:20:18 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java
index 566ce55..477780a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java
@@ -69,7 +69,7 @@
private Integer sec;
// 璁惧娓╁害 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
private Double deviceTemperature;
- // 浜害鐧惧垎姣� 1
+ // 鐏�1浜害鐧惧垎姣� 1
private Integer lightPercent;
// 鐢电綉鐢靛帇 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
private Double voltage;
@@ -91,6 +91,8 @@
private Double recentlyUsingPower;
// 绱鐢ㄧ數鐢甸噺 4
private Double totalUsingPower;
+ // 鐏�2浜害鐧惧垎姣� 1
+ private Integer light2Percent;
// 淇濈暀 11
private String retain;
// 鍘熷抚
@@ -106,7 +108,9 @@
this.min = HexUtil.hexToInt(hex.substring(8, 10));
this.sec = HexUtil.hexToInt(hex.substring(10, 12));
- this.deviceTemperature = NumberUtil.round(HexUtil.hexToInt(hex.substring(12, 16)) * 0.01, 2).doubleValue();
+// //闇�瑕佹妸鍗佸叚杩涘埗杞簩杩涘埗
+// this.deviceTemperature = NumberUtil.round(HexUtil.hexToInt(hex.substring(12, 16)) * 0.01, 2).doubleValue();
+ this.deviceTemperature = NumberUtil.round(temperatureTransition(hex.substring(12, 16)), 2).doubleValue();
this.lightPercent = HexUtil.hexToInt(hex.substring(16, 18));
this.voltage = NumberUtil.round(HexUtil.hexToInt(hex.substring(18, 22)) * 0.1, 1).doubleValue();
this.electricCurrent = NumberUtil.round(HexUtil.hexToInt(hex.substring(22, 26)) * 0.001, 3).doubleValue();
@@ -118,13 +122,54 @@
this.totalLightSec = HexUtil.hexToLong(hex.substring(50, 58));
this.recentlyUsingPower = NumberUtil.round(HexUtil.hexToInt(hex.substring(58, 66)) * (double) 0.001, 3).doubleValue();
this.totalUsingPower = NumberUtil.round(HexUtil.hexToInt(hex.substring(66, 74)) * (double) 0.001, 3).doubleValue();
- this.retain = hex.substring(74, 96);
+ this.light2Percent = HexUtil.hexToInt(hex.substring(74, 76));
+ this.retain = hex.substring(76, 96);
return this;
}
+
+ /**
+ * 灏�16杩涘埗杞垚2杩涘埗锛岃繘琛岃ˉ鐮侊紙鍙嶇爜鍩虹涓�+1锛夛紝寰楀埌姝ｇ‘鏁板��
+ * 浼犲叆16杩涘埗鐨勬俯搴︼紝绫诲瀷涓篠tring
+ * 濡侳500
+ */
+ public static 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 static 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;
+ }
+
}
- public static void main(String[] args) {
- System.out.println(HexUtil.hexToLong("F64D020F"));
- System.out.println(5 * (float) 0.001);
- }
}
--
Gitblit v1.9.3