From 4104c1cd996403cf14b6eb59582dfbd64370f1b6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 23 三月 2022 17:42:22 +0800
Subject: [PATCH] 灯杆倾斜
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightPoleHeelingHeartbeatReportInnerFrame.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightPoleHeelingHeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightPoleHeelingHeartbeatReportInnerFrame.java
index 33a55e7..9573c0b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightPoleHeelingHeartbeatReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightPoleHeelingHeartbeatReportInnerFrame.java
@@ -52,7 +52,7 @@
@Data
public static class HeartBeatDataPackage implements IResponseInnerFrame<HeartBeatDataPackage> {
//璁惧鍨嬪彿
- private int equipmentModel;
+ private String equipmentModel;
//X杞�
private double theXAxis;
//Y杞�
@@ -60,24 +60,24 @@
//Z杞�
private double theZAxis;
//棰勭暀
- private int reservedA;
- private int reservedB;
- private int reservedC;
- private int reservedD;
+ private String reservedA;
+ private String reservedB;
+ private String reservedC;
+ private String reservedD;
@Override
public HeartBeatDataPackage transformFrame(String hex) {
if (StrUtil.isBlank(hex)) {
return null;
}
- this.equipmentModel = (parseVal(hex, 0, 4));
+ this.equipmentModel = "V" + (parseVal(hex, 0, 2)) + "." + String.format("%02d", parseVal(hex, 2, 4));
this.theXAxis = NumberUtil.round(temperatureTransition(hex.substring(4, 8)) * 0.1, 1).doubleValue();
this.theYAxis = NumberUtil.round(temperatureTransition(hex.substring(8, 12)) * 0.1, 1).doubleValue();
this.theZAxis = NumberUtil.round(temperatureTransition(hex.substring(12, 16)) * 0.1, 1).doubleValue();
- this.reservedA = (parseVal(hex, 16, 20));
- this.reservedB = (parseVal(hex, 20, 24));
- this.reservedC = (parseVal(hex, 24, 28));
- this.reservedD = (parseVal(hex, 28, 32));
+ this.reservedA = hex.substring(16, 20);
+ this.reservedB = hex.substring(20, 24);
+ this.reservedC = hex.substring(24, 28);
+ this.reservedD = hex.substring(28, 32);
//72-80淇濈暀锛屾殏鏈娇鐢�
return this;
--
Gitblit v1.9.3