From 11fedf1d94650cbda4751ea89371ed43432c325a Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期一, 13 十二月 2021 18:43:51 +0800
Subject: [PATCH] 基础通信
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java | 79 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 36 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 9b28ccd..566ce55 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
@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+import cn.hutool.core.util.HexUtil;
+import cn.hutool.core.util.NumberUtil;
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;
@@ -54,41 +56,41 @@
@Data
public static class HeartBeatDataPackage implements IResponseInnerFrame<HeartBeatDataPackage> {
// 骞碦TC 1
- private String year;
+ private Integer year;
// 鏈圧TC 1
- private String month;
+ private Integer month;
// 鏃TC 1
- private String day;
+ private Integer day;
// 鏃禦TC 1
- private String hour;
+ private Integer hour;
// 鍒哛TC 1
- private String min;
+ private Integer min;
// 绉扲TC 1
- private String sec;
+ private Integer sec;
// 璁惧娓╁害 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String deviceTemperature;
+ private Double deviceTemperature;
// 浜害鐧惧垎姣� 1
- private String lightPercent;
+ private Integer lightPercent;
// 鐢电綉鐢靛帇 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String gridVol;
+ private Double voltage;
// 鐢电綉鐢垫祦 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String gridCur;
+ private Double electricCurrent;
// 璧吂 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String hertz;
+ private Double hertz;
// 鍔熺巼鍥犵礌 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String powerFactor;
+ private Double powerFactor;
// 鏈夊姛鍔熺巼 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String activePower;
+ private Double activePower;
// 鏃犲姛鍔熺巼 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
- private String reactivePower;
+ private Double reactivePower;
// 鏈�杩戜竴娆′寒鐏椂闂� 4 绉�
- private String recentlyLightSec;
+ private Long recentlyLightSec;
// 绱浜伅鏃堕棿 4
- private String totalLightTime;
+ private Long totalLightSec;
// 鏈�杩戜竴娆＄敤鐢电數閲� 4
- private String recentlyUsingPower;
+ private Double recentlyUsingPower;
// 绱鐢ㄧ數鐢甸噺 4
- private String totalUsingPower;
+ private Double totalUsingPower;
// 淇濈暀 11
private String retain;
// 鍘熷抚
@@ -97,27 +99,32 @@
@Override
public HeartBeatDataPackage transformFrame(String hex) {
this.originFrame = hex;
- this.year = hex.substring(0, 2);
- this.month = hex.substring(2, 4);
- this.day = hex.substring(4, 6);
- this.hour = hex.substring(6, 8);
- this.min = hex.substring(8, 10);
- this.sec = hex.substring(10, 12);
+ this.year = HexUtil.hexToInt(hex.substring(0, 2));
+ this.month = HexUtil.hexToInt(hex.substring(2, 4));
+ this.day = HexUtil.hexToInt(hex.substring(4, 6));
+ this.hour = HexUtil.hexToInt(hex.substring(6, 8));
+ this.min = HexUtil.hexToInt(hex.substring(8, 10));
+ this.sec = HexUtil.hexToInt(hex.substring(10, 12));
- this.deviceTemperature = hex.substring(12, 16);
- this.lightPercent = hex.substring(16, 18);
- this.gridVol = hex.substring(18, 22);
- this.gridCur = hex.substring(22, 26);
- this.hertz = hex.substring(26, 30);
- this.powerFactor = hex.substring(30, 34);
- this.activePower = hex.substring(34, 38);
- this.reactivePower = hex.substring(38, 42);
- this.recentlyLightSec = hex.substring(42, 50);
- this.totalLightTime = hex.substring(50, 58);
- this.recentlyUsingPower = hex.substring(58, 66);
- this.totalUsingPower = hex.substring(66, 74);
+ this.deviceTemperature = NumberUtil.round(HexUtil.hexToInt(hex.substring(12, 16)) * 0.01, 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();
+ this.hertz = NumberUtil.round(HexUtil.hexToInt(hex.substring(26, 30)) * 0.01, 2).doubleValue();
+ this.powerFactor = NumberUtil.round(HexUtil.hexToInt(hex.substring(30, 34)) * 0.001, 3).doubleValue();
+ this.activePower = NumberUtil.round(HexUtil.hexToInt(hex.substring(34, 38)) * 0.01, 2).doubleValue();
+ this.reactivePower = NumberUtil.round(HexUtil.hexToInt(hex.substring(38, 42)) * 0.01, 2).doubleValue();
+ this.recentlyLightSec = HexUtil.hexToLong(hex.substring(42, 50));
+ 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);
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