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/AmqpMessageListener.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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 dd55d88..bf1c318 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
@@ -8,9 +8,8 @@
 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.enums.C3ChargingEnum;
 import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
 import lombok.extern.slf4j.Slf4j;
 
@@ -114,29 +113,29 @@
 
     private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
         String functionCode = frame.getPayload().substring(2, 4);
-        if (A5C3ReportEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
+        if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
 //            A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
 //            log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
 //            log.info(netRequestFrame.toString());
             //缃戠粶璇锋眰
             c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
 
-        } else if (A5C3ReportEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
+        } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
             A5C3CommonReportInnerFrame codeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶codeRequestFrame");
             log.info(codeRequestFrame.toString());
-        } else if (A5C3ReportEnum.HEART_BEAT.getCode().equals(functionCode)) {
+        } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
             //蹇冭烦鍖�
             c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
-        } else if (A5C3ReportEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
+        } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
             A5C3CommonReportInnerFrame completeRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶completeRequestFrame");
             log.info(completeRequestFrame.toString());
-        } else if (A5C3ReportEnum.CHARGE_STOP.getCode().equals(functionCode)) {
+        } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
             A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
             log.info(stopRequestFrame.toString());
-        } else if (A5C3ReportEnum.ERROR_CODE.getCode().equals(functionCode)) {
+        } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
             A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
             log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
             log.info(errorCodeRequestFrame.toString());

--
Gitblit v1.9.3