From a688902be88d187bf6b8773be23780fca81d737d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 30 三月 2022 17:41:20 +0800
Subject: [PATCH] C3

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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 67eea88..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
@@ -5,9 +5,7 @@
 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.A5C3ReportEnum;
 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;
 
@@ -32,7 +30,7 @@
     @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");
@@ -53,7 +51,7 @@
 //            if (operationReportInnerFrame.isValidate()) {
 //                SpringContextHolder.getBean(C3ChargingService.class).saveReportData(deviceName, operationReportInnerFrame.getHeartBeatDataPackage());
 //            }
-        } else if (A5C3ReportEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
+        } else if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
             A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
             log.info(netRequestFrame.toString());

--
Gitblit v1.9.3