From a0587b1f268b8535ed660fbc521d341d9268340a Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 17 十二月 2021 18:15:17 +0800
Subject: [PATCH] 灯模块
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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..e25240e 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;
// 鍘熷抚
@@ -118,13 +120,10 @@
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;
}
}
- public static void main(String[] args) {
- System.out.println(HexUtil.hexToLong("F64D020F"));
- System.out.println(5 * (float) 0.001);
- }
}
--
Gitblit v1.9.3