From b7cf4a3e5e89e6b39347bf12e6eafff258a84494 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期三, 08 十二月 2021 15:47:38 +0800
Subject: [PATCH] 通信协议完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightTimeSyncReportInnerFrame.java | 49 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5C3ReportEnum.java | 44 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightReportEnum.java | 29 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1DeviceMacRespInnerFrame.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java | 6
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java | 123 ++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java | 165 +++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java | 49 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java | 49 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java | 44 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightBrightnessRespInnerFrame.java | 5
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5AtmosphereReportEnum.java | 22 +
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 71 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java | 123 ++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1TernaryCodeRespInnerFrame.java | 2
15 files changed, 771 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
index d5741d1..e0a7a3e 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java
@@ -1,8 +1,12 @@
package com.sandu.ximon.admin.manager.iot.amqp;
import com.alibaba.fastjson.JSON;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.*;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonReportMessage;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5C3ReportEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightReportEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
import lombok.extern.slf4j.Slf4j;
@@ -76,11 +80,68 @@
/**
* 澶勭悊浠诲姟
*
- * @param productKey 浜у搧鐮�
- * @param deviceName 浜у搧鍚嶇О
- * @param connectFrame 涓婃姤甯�
+ * @param productKey 浜у搧鐮�
+ * @param deviceName 浜у搧鍚嶇О
+ * @param frame 涓婃姤甯�
*/
- private void processTask(String productKey, String deviceName, CommonFrame connectFrame) {
+ private void processTask(String productKey, String deviceName, CommonFrame frame) {
+ if (frame == null) {
+ return;
+ }
+ log.info("澶勭悊璁㈤槄");
+ log.info(frame.toString());
+ if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
+ // 鍗曠伅鏁版嵁涓婃姤澶勭悊
+ lightDataReportAnalysis(productKey, deviceName, frame);
+ } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_C3_DATA.getCode())) {
+ // C3鍏呯數妗╀笂鎶ュ鐞�
+ c3ChargingReportAnalysis(productKey, deviceName, frame);
+ } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
+ // 澶ф皵鏁版嵁鎸囦护涓婃姤
+ atmosphereAnalysis(productKey, deviceName, frame);
+ }
+ }
+ private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
+ String functionCode = frame.getPayload().substring(2, 4);
+ if (A5C3ReportEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ } else if (A5C3ReportEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ } else if (A5C3ReportEnum.HEART_BEAT.getCode().equals(functionCode)) {
+ A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+ } else if (A5C3ReportEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+
+ } else if (A5C3ReportEnum.CHARGE_STOP.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+
+ } else if (A5C3ReportEnum.ERROR_CODE.getCode().equals(functionCode)) {
+ A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
+
+ }
+ }
+
+ private void atmosphereAnalysis(String productKey, String deviceName, CommonFrame frame) {
+ A5AtmosphereHeartbeatReportInnerFrame transformFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+// log.info("澶ф皵蹇冭烦涓婃姤");
+// log.info(transformFrame.toString());
+ }
+
+ private void lightDataReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
+ String functionCode = frame.getPayload().substring(2, 4);
+ if (A5LightReportEnum.HeartBeat_Data.getCode().equals(functionCode)) {
+// log.info("蹇冭烦鐩稿簲");
+ A5LightHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5LightHeartbeatReportInnerFrame().transformFrame(frame.getPayload());
+// log.info(heartbeatReportInnerFrame.toString());
+ } else if (A5LightReportEnum.Time_Synchronized.getCode().equals(functionCode)) {
+// log.info("璇锋眰鏃堕棿鍚屾");
+ A5LightTimeSyncReportInnerFrame syncRespInnerFrame = new A5LightTimeSyncReportInnerFrame().transformFrame(frame.getPayload());
+// log.info(syncRespInnerFrame.toString());
+ } else if (A5LightReportEnum.Error_Code.getCode().equals(functionCode)) {
+// log.info("鏁呴殰鐮佷笂鎶�");
+ A5LightErrorCodeReportInnerFrame codeRespInnerFrame = new A5LightErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
+// log.info(codeRespInnerFrame.toString());
+ }
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
new file mode 100644
index 0000000..4c11e0f
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
@@ -0,0 +1,165 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+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;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 18:20
+ * A5-84-01
+ * 澶ф皵蹇冭烦鍖� 搴旂瓟
+ */
+@Data
+@ToString(callSuper = true)
+public class A5AtmosphereHeartbeatReportInnerFrame extends BaseResponseInnerFrame<A5AtmosphereHeartbeatReportInnerFrame> {
+
+ // 鐩爣鍦板潃 2
+ private String destinationAddress;
+ // 蹇冭烦鍖呮暟鎹� 58
+ private HeartBeatDataPackage heartBeatDataPackage;
+
+ private String originFrame;
+
+ @Override
+ public A5AtmosphereHeartbeatReportInnerFrame transformFrame(String hex) {
+ // 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 12));
+
+ String heartBeatData = hex.substring(12, 76);
+ HeartBeatDataPackage heartBeatDataPackage = new HeartBeatDataPackage();
+ heartBeatDataPackage.transformFrame(heartBeatData);
+ setHeartBeatDataPackage(heartBeatDataPackage);
+
+ setCrc32(hex.substring(hex.length() - 8));
+ // 鏍￠獙CRC32
+ String frame = hex.substring(2, hex.length() - 8);
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+
+ @Data
+ public static class HeartBeatDataPackage implements IResponseInnerFrame<HeartBeatDataPackage> {
+ // 璁惧鍨嬪彿 2
+ private String deviceType;
+ // 妯″潡棰勭儹鐘舵�佹爣蹇� 1
+ private String moduleWarmUpStatusFlag;
+ // 娓╁害鍊�
+ private Double temperature;
+ // 婀垮害鍊�
+ private Double humidity;
+ // 椋庨��
+ private Double windSpeed;
+ // 椋庡悜
+ private Double windDirection;
+ // 澶ф皵鍘�
+ private Integer pressure;
+ // 鍏夊己
+ private Integer lightIntensity;
+ // 鍣煶
+ private Integer noise;
+ // PM2.5
+ private Integer pm25;
+ // PM10
+ private Integer pm10;
+ // 鎬绘偓娴绮掔墿锛圱SP锛�
+ private Integer tsp;
+ // SO2浜屾哀鍖栫～/鐢查啗鐩稿鍊�
+ private Integer so2;
+ private Integer ech2o;
+ // NO2浜屾哀鍖栨爱/TVOC
+ private Integer no2;
+ private Integer tvoc;
+ // CO涓�姘у寲纰� /浜屾哀鍖栫⒊
+ private Integer co;
+ private Integer co2;
+ // O3鑷哀
+ private Integer o3;
+ // F姘熷寲鐗�
+ private Integer fluoride;
+
+ @Override
+ public HeartBeatDataPackage transformFrame(String hex) {
+ if (hex.length() != 64) {
+ return null;
+ }
+ Integer type = 0;
+ this.deviceType = hex.substring(0, 4);
+ if(this.deviceType.equals(DeviceType.SENSOR_V1.getType())) {
+ type = 1;
+ }
+ this.moduleWarmUpStatusFlag = hex.substring(4, 6);
+ this.temperature = Double.parseDouble(
+ parseVal(hex,6,8)
+ + "."
+ + parseVal(hex,8,10)
+ );
+ this.humidity = Double.parseDouble(
+ parseVal(hex,10,12)
+ + "."
+ + parseVal(hex,12,14)
+ );
+ this.windSpeed = parseVal(hex,14,18) * .1;
+ this.windDirection = parseVal(hex,18,22) * .1;
+ this.pressure = parseVal(hex,22,26);
+ this.lightIntensity = parseVal(hex,26,32);
+ this.noise = parseVal(hex,32, 36);
+ this.pm25 = parseVal(hex,36, 40);
+ this.pm10 = parseVal(hex,40,44);
+ this.tsp = parseVal(hex,44,48);
+
+ /**
+ * 浠ヤ笅鍖哄垎鐗堟湰
+ */
+ if(type.equals(1)) {
+ this.ech2o = parseVal(hex,48, 52);
+ this.tvoc = parseVal(hex,52, 56);
+ this.co2 = parseVal(hex,56, 60);
+ } else {
+ this.so2 = parseVal(hex,48, 52);
+ this.ech2o = parseVal(hex,48, 52);
+ this.tvoc = parseVal(hex,52, 56);
+ this.no2 = parseVal(hex,52, 56);
+ this.co = parseVal(hex,56, 60);
+ this.co2 = parseVal(hex,56, 60);
+ }
+
+ this.o3 = parseVal(hex,60, 62);
+ this.fluoride = parseVal(hex,62, 64);
+
+ return this;
+ }
+
+ private Integer parseVal (String frame, int start, int end) {
+ return Integer.parseInt(frame.substring(start,end),16);
+ }
+ }
+
+ public enum DeviceType {
+
+ SENSOR_V1("0101");
+
+ private String type;
+
+ DeviceType(String type) {
+ this.type = type;
+ }
+
+ public String getType() {
+ return type;
+ }
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java
new file mode 100644
index 0000000..108a0b0
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java
@@ -0,0 +1,44 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+import cn.hutool.core.util.StrUtil;
+import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 18:20
+ * A5-82-40/41/43/44
+ * c3鍏呯數妗� 涓婃姤 缃戠粶璇锋眰/浜岀淮鐮佽姹�/涓婃姤鍏呯數缁撴潫/涓婃姤鍏呯數涓柇
+ */
+@Data
+@ToString(callSuper = true)
+public class A5C3CommonReportInnerFrame extends BaseResponseInnerFrame<A5C3CommonReportInnerFrame> {
+
+ // 鐩爣鍦板潃 4
+ private String destinationAddress;
+
+ @Override
+ public A5C3CommonReportInnerFrame transformFrame(String hex) {
+ // 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 16));
+
+ setCrc32(hex.substring(hex.length() - 8));
+ // 鏍￠獙CRC32
+ String frame = hex.substring(2, hex.length() - 8);
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java
new file mode 100644
index 0000000..7b4e534
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3ErrorCodeReportInnerFrame.java
@@ -0,0 +1,49 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+import cn.hutool.core.util.StrUtil;
+import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 14:46
+ * A5-81-42
+ * 鍗曠伅涓婃姤ampq 鏁呴殰鐮�
+ */
+@Data
+@ToString(callSuper = true)
+public class A5C3ErrorCodeReportInnerFrame extends BaseResponseInnerFrame<A5C3ErrorCodeReportInnerFrame> {
+
+ /**
+ * 鐩爣鍦板潃 2
+ */
+ private String destinationAddress;
+ /**
+ * 鏁呴殰鐮�
+ */
+ private String errorCode;
+
+ @Override
+ public A5C3ErrorCodeReportInnerFrame transformFrame(String hex) {
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 16));
+
+ setErrorCode(hex.substring(16, hex.length() - 8));
+ setCrc32(hex.substring(hex.length() - 8));
+ // 鏍￠獙CRC32
+ String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + getErrorCode();
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+}
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
new file mode 100644
index 0000000..c01e550
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3HeartbeatReportInnerFrame.java
@@ -0,0 +1,123 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+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;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 18:20
+ * A5-82-45
+ * c3鍏呯數妗╂晠闅滅爜 涓婃姤
+ */
+@Data
+@ToString(callSuper = true)
+public class A5C3HeartbeatReportInnerFrame extends BaseResponseInnerFrame<A5C3HeartbeatReportInnerFrame> {
+
+ // 鐩爣鍦板潃 4
+ private String destinationAddress;
+ // 蹇冭烦鍖呮暟鎹�
+ private HeartBeatDataPackage heartBeatDataPackage;
+
+ @Override
+ public A5C3HeartbeatReportInnerFrame transformFrame(String hex) {
+ // 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 16));
+
+ String heartBeatData = hex.substring(16, hex.length() - 8);
+ HeartBeatDataPackage heartBeatDataPackage = new HeartBeatDataPackage();
+ heartBeatDataPackage.transformFrame(heartBeatData);
+ setHeartBeatDataPackage(heartBeatDataPackage);
+
+ setCrc32(hex.substring(hex.length() - 8));
+ // 鏍￠獙CRC32
+ String frame = hex.substring(2, hex.length() - 8);
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+
+ @Data
+ public static class HeartBeatDataPackage implements IResponseInnerFrame<HeartBeatDataPackage> {
+ // c3Mac(id hex)
+ private String c3Mac;
+ // 骞�
+ private String year;
+ // 鏈�
+ private String month;
+ // 鏃�
+ private String day;
+ // 鏃�
+ private String hour;
+ // 鍒�
+ private String min;
+ // 绉�
+ private String sec;
+ // 鍏呯數妗╁彛
+ private String chargingPort;
+ // 鍏呯數妗╁彛鐘舵�佷綅
+ private String statusBit;
+ // 璁惧娓╁害 0.1鈩�
+ private String deviceTemperature;
+ // 鐢电綉鐢靛帇 0.1V
+ private String gridVoltage;
+ // 鐢电綉鐢垫祦 0.1A
+ private String gridCurrent;
+ // 棰戠巼 0.01Hz
+ private String frequency;
+ // 鍔熺巼鍥犵礌 0.001
+ private String powerFactor;
+ // 鏈夊姛鍔熺巼 0.1KW
+ private String activePower;
+ // 鏃犲姛鍔熺巼 0.1KFar
+ private String reactivePower;
+ // 宸插厖鐢甸噺 0.01KWh
+ private String chargedCapacity;
+ // 棰勭害鐢甸噺 1KWh
+ private String reservedCapacity;
+ // 鍓╀綑閲戦 0.1鍏�
+ private String remainingAmount;
+ // 宸插厖鏃堕暱
+ private String alreadyChargingTime;
+
+ @Override
+ public HeartBeatDataPackage transformFrame(String hex) {
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ 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.chargingPort = hex.substring(12, 16);
+ this.statusBit = hex.substring(16, 18);
+ this.deviceTemperature = hex.substring(18, 22);
+ this.gridVoltage = hex.substring(22, 26);
+ this.gridCurrent = hex.substring(26, 30);
+ this.frequency = hex.substring(30, 34);
+ this.powerFactor = hex.substring(34, 38);
+ this.activePower = hex.substring(38, 42);
+ this.reactivePower = hex.substring(42, 46);
+ this.chargedCapacity = hex.substring(46, 50);
+ this.reservedCapacity = hex.substring(50, 54);
+ this.remainingAmount = hex.substring(54, 58);
+ this.alreadyChargingTime = hex.substring(58, 64);
+
+ return this;
+ }
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
new file mode 100644
index 0000000..5a44b37
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightErrorCodeReportInnerFrame.java
@@ -0,0 +1,49 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+import cn.hutool.core.util.StrUtil;
+import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 14:46
+ * A5-81-42
+ * 鍗曠伅涓婃姤ampq 鏁呴殰鐮�
+ */
+@Data
+@ToString(callSuper = true)
+public class A5LightErrorCodeReportInnerFrame extends BaseResponseInnerFrame<A5LightErrorCodeReportInnerFrame> {
+
+ /**
+ * 鐩爣鍦板潃 2
+ */
+ private String destinationAddress;
+ /**
+ * 鏁呴殰鐮�
+ */
+ private String errorCode;
+
+ @Override
+ public A5LightErrorCodeReportInnerFrame transformFrame(String hex) {
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 12));
+
+ setErrorCode(hex.substring(12, 16));
+ setCrc32(hex.substring(hex.length() - 8));
+ // 鏍￠獙CRC32
+ String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + getErrorCode();
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+}
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
new file mode 100644
index 0000000..9b28ccd
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightHeartbeatReportInnerFrame.java
@@ -0,0 +1,123 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+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;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 18:20
+ * A5-81-40
+ * 鐏蹇冭烦鍖� 涓婃姤
+ */
+@Data
+@ToString(callSuper = true)
+public class A5LightHeartbeatReportInnerFrame extends BaseResponseInnerFrame<A5LightHeartbeatReportInnerFrame> {
+
+ // 鐩爣鍦板潃 2
+ private String destinationAddress;
+ // 蹇冭烦鍖呮暟鎹� 58
+ private HeartBeatDataPackage heartBeatDataPackage;
+
+ private String originFrame;
+
+ @Override
+ public A5LightHeartbeatReportInnerFrame transformFrame(String hex) {
+ // 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 12));
+
+ String heartBeatData = hex.substring(12, 108);
+ HeartBeatDataPackage heartBeatDataPackage = new HeartBeatDataPackage();
+ heartBeatDataPackage.transformFrame(heartBeatData);
+ setHeartBeatDataPackage(heartBeatDataPackage);
+
+ setCrc32(hex.substring(108, 116));
+ // 鏍￠獙CRC32
+ String frame = hex.substring(2, hex.length() - 8);
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+
+ @Data
+ public static class HeartBeatDataPackage implements IResponseInnerFrame<HeartBeatDataPackage> {
+ // 骞碦TC 1
+ private String year;
+ // 鏈圧TC 1
+ private String month;
+ // 鏃TC 1
+ private String day;
+ // 鏃禦TC 1
+ private String hour;
+ // 鍒哛TC 1
+ private String min;
+ // 绉扲TC 1
+ private String sec;
+ // 璁惧娓╁害 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String deviceTemperature;
+ // 浜害鐧惧垎姣� 1
+ private String lightPercent;
+ // 鐢电綉鐢靛帇 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String gridVol;
+ // 鐢电綉鐢垫祦 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String gridCur;
+ // 璧吂 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String hertz;
+ // 鍔熺巼鍥犵礌 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String powerFactor;
+ // 鏈夊姛鍔熺巼 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String activePower;
+ // 鏃犲姛鍔熺巼 2 1瀛楄妭鏁存暟1瀛楄妭灏忔暟
+ private String reactivePower;
+ // 鏈�杩戜竴娆′寒鐏椂闂� 4 绉�
+ private String recentlyLightSec;
+ // 绱浜伅鏃堕棿 4
+ private String totalLightTime;
+ // 鏈�杩戜竴娆＄敤鐢电數閲� 4
+ private String recentlyUsingPower;
+ // 绱鐢ㄧ數鐢甸噺 4
+ private String totalUsingPower;
+ // 淇濈暀 11
+ private String retain;
+ // 鍘熷抚
+ private String originFrame;
+
+ @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.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.retain = hex.substring(74, 96);
+ return this;
+ }
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightTimeSyncReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightTimeSyncReportInnerFrame.java
new file mode 100644
index 0000000..c076648
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5LightTimeSyncReportInnerFrame.java
@@ -0,0 +1,49 @@
+package com.sandu.ximon.admin.manager.iot.frame.inner.report;
+
+import cn.hutool.core.util.StrUtil;
+import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * @author chenjiantian
+ * @date 2021/12/6 14:46
+ * A5-81-41
+ * 鍗曠伅涓婃姤ampq 璇锋眰鏃堕棿鍚屾
+ */
+@Data
+@ToString(callSuper = true)
+public class A5LightTimeSyncReportInnerFrame extends BaseResponseInnerFrame<A5LightTimeSyncReportInnerFrame> {
+
+ /**
+ * 鐩爣鍦板潃 2
+ */
+ private String destinationAddress;
+ /**
+ * 0x00锛氳姹傚悓姝�
+ */
+ private String responseStatus;
+
+ @Override
+ public A5LightTimeSyncReportInnerFrame transformFrame(String hex) {
+ if (StrUtil.isBlank(hex)) {
+ return null;
+ }
+ // MQTT閫氫俊鏂瑰紡(1)
+ setConnectType(hex.substring(0, 2));
+ // 鍔熻兘鐮�(1)
+ setFunctionCode(hex.substring(2, 4));
+ // 璐熻嵎闀垮害(2)
+ setPayloadLength(hex.substring(4, 8));
+
+ setDestinationAddress(hex.substring(8, 12));
+
+ setResponseStatus(hex.substring(12, hex.length() - 8));
+ setCrc32(hex.substring(hex.length() - 8));
+ // 鏍￠獙CRC32
+ String frame = getFunctionCode() + getPayloadLength() + getDestinationAddress() + getResponseStatus();
+ this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
+ return this;
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1DeviceMacRespInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1DeviceMacRespInnerFrame.java
index 3b0475b..b05bc67 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1DeviceMacRespInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1DeviceMacRespInnerFrame.java
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.response;
-import cn.hutool.core.util.HexUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import lombok.Data;
import lombok.ToString;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1TernaryCodeRespInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1TernaryCodeRespInnerFrame.java
index 691b71e..ff5b5b2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1TernaryCodeRespInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A1TernaryCodeRespInnerFrame.java
@@ -8,7 +8,7 @@
/**
* @author chenjiantian
* @date 2021/12/6 14:46
- * A1->0A/0B/0C
+ * A1->8A/8B/8C
* 璁剧疆闃块噷浜戜笁鍏冪爜 ProductKey DeviceName DeviceSecret 鍝嶅簲鍐呭
*/
@Data
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightBrightnessRespInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightBrightnessRespInnerFrame.java
index 3868888..f7ef5fa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightBrightnessRespInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightBrightnessRespInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.response;
+import cn.hutool.core.util.StrUtil;
import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
import lombok.Data;
@@ -8,7 +9,7 @@
/**
* @author chenjiantian
* @date 2021/12/6 14:46
- * 鐏寒搴︽帶鍒� 搴旂瓟
+ * A5-81-01鐏寒搴︽帶鍒� 搴旂瓟
*/
@Data
@ToString(callSuper = true)
@@ -25,7 +26,7 @@
@Override
public A5LightBrightnessRespInnerFrame transformFrame(String hex) {
- if (hex == null || hex.length() != 22) {
+ if (StrUtil.isBlank(hex)) {
return null;
}
// MQTT閫氫俊鏂瑰紡(1)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java
index 2273818..e0ffc63 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/A5LightHeartbeatRespInnerFrame.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.response;
+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;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;
@@ -9,6 +10,7 @@
/**
* @author chenjiantian
* @date 2021/12/6 18:20
+ * A5-81-02
* 鐏蹇冭烦鍖� 搴旂瓟
*/
@Data
@@ -25,7 +27,7 @@
@Override
public A5LightHeartbeatRespInnerFrame transformFrame(String hex) {
// 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
- if (hex == null || hex.length() != 116) {
+ if (StrUtil.isBlank(hex)) {
return null;
}
// MQTT閫氫俊鏂瑰紡(1)
@@ -44,7 +46,7 @@
setCrc32(hex.substring(108, 116));
// 鏍￠獙CRC32
- String frame = hex.substring(0, 14);
+ String frame = hex.substring(2, hex.length() - 8);
this.setValidate(CRC32Utils.validateFrame(frame, getCrc32()));
return this;
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5AtmosphereReportEnum.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5AtmosphereReportEnum.java
new file mode 100644
index 0000000..505b9b3
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5AtmosphereReportEnum.java
@@ -0,0 +1,22 @@
+package com.sandu.ximon.admin.manager.iot.rrpc.enums;
+
+/**
+ * @author chenjiantian
+ * A5-84 澶ф皵涓婃姤锛氾紙MQTT寮傛锛�
+ */
+public enum A5AtmosphereReportEnum {
+ // 涓婃姤蹇冭烦鍖�
+ HeartBeat_Data("01"),
+ ;
+
+
+ A5AtmosphereReportEnum(String code) {
+ this.code = code;
+ }
+
+ private final String code;
+
+ public String getCode() {
+ return code;
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5C3ReportEnum.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5C3ReportEnum.java
new file mode 100644
index 0000000..cb237e3
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5C3ReportEnum.java
@@ -0,0 +1,44 @@
+package com.sandu.ximon.admin.manager.iot.rrpc.enums;
+
+/**
+ * @author chenjiantian
+ * A5-83 C3鍏呯數妗╀笂鎶ワ細锛坅mqp锛�
+ */
+public enum A5C3ReportEnum {
+ /**
+ *缃戠粶璇锋眰
+ */
+ NETWORK_REQUEST("40"),
+ /**
+ * 浜岀淮鐮佽姹�
+ */
+ QR_CODE_REQUEST("41"),
+ /**
+ * 涓婃姤蹇冭烦鍖�
+ */
+ HEART_BEAT("42"),
+ /**
+ * 涓婃姤鍏呯數缁撴潫
+ */
+ CHARGE_COMPLETE("43"),
+ /**
+ * 涓婃姤鍏呯數涓柇
+ */
+ CHARGE_STOP("44"),
+ /**
+ * 涓婃姤鏁呴殰鐮�
+ */
+ ERROR_CODE("45")
+ ;
+
+
+ A5C3ReportEnum(String code) {
+ this.code = code;
+ }
+
+ private final String code;
+
+ public String getCode() {
+ return code;
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightReportEnum.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightReportEnum.java
new file mode 100644
index 0000000..8ac2da1
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/A5LightReportEnum.java
@@ -0,0 +1,29 @@
+package com.sandu.ximon.admin.manager.iot.rrpc.enums;
+
+/**
+ * @author chenjiantian
+ * A5-81 鍗曠伅涓诲姩涓婃姤锛氾紙amqp锛�
+ */
+public enum A5LightReportEnum {
+ // 涓婃姤蹇冭烦鍖�
+ HeartBeat_Data("40"),
+ // 璇锋眰鏃堕棿鍚屾
+ Time_Synchronized("41"),
+ // 鏁呴殰鐮�
+ Error_Code("42"),
+ // 鏈湴瀹氭椂/鍏夋帶寮�鍏崇伅鍔ㄤ綔涓婃姤
+ Timing_LightSwitch_Report("43"),
+ // 璇锋眰閫氳鍗忚妯″紡锛堜笂鐢靛悗10绉掍竴娆★紝鍙�6娆★級
+ Protocol_Model_Request("44");
+
+
+ A5LightReportEnum(String code) {
+ this.code = code;
+ }
+
+ private final String code;
+
+ public String getCode() {
+ return code;
+ }
+}
--
Gitblit v1.9.3