From ef270bd1855b5ce3f398c5df024840a498e33a8f Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期四, 31 三月 2022 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
index 85cd023..469963c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -1,11 +1,11 @@
package com.sandu.ximon.admin.manager.iot.amqp.processor;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3OperationReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3ChargingReportEnum;
import com.sandu.ximon.admin.service.C3ChargingService;
import lombok.extern.slf4j.Slf4j;
@@ -30,14 +30,17 @@
@Override
public void process(String productKey, String deviceName, CommonFrame frame) {
String functionCode = frame.getPayload().substring(2, 4);
- if (C3ChargingReportEnum.HeartBeat_Data.getCode().equals(functionCode)) {
+ if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
log.info("蹇冭烦鐩稿簲鈥斺�擟3鍏呯數妗╂暟鎹�" + productKey + " ------- " + deviceName);
A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶heartbeatReportInnerFrame");
log.info(heartbeatReportInnerFrame.toString());
if (heartbeatReportInnerFrame.isValidate()) {
- SpringContextHolder.getBean(C3ChargingService.class).saveReportData(deviceName, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ SpringContextHolder.getBean(C3ChargingService.class).updateReportState(deviceName
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage().getC3Mac()
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage().getStatusBit()
+ , heartbeatReportInnerFrame.getHeartBeatDataPackage().getDeviceTemperature());
}
} else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�擟3鍏呯數妗╁紑濮嬪厖鐢�");
@@ -48,6 +51,14 @@
// if (operationReportInnerFrame.isValidate()) {
// SpringContextHolder.getBean(C3ChargingService.class).saveReportData(deviceName, operationReportInnerFrame.getHeartBeatDataPackage());
// }
+ } else if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
+ A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
+ log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
+ log.info(netRequestFrame.toString());
+
+ if (netRequestFrame.isValidate()) {
+ SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
+ }
}
}
}
--
Gitblit v1.9.3