From 727a69f859060093e685582fa10e5de82dcc138a Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期四, 29 十二月 2022 15:37:49 +0800
Subject: [PATCH] 放假备份。完成集中控制器对接。

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java |   94 ++++++++++++++++++++++++----------------------
 1 files changed, 49 insertions(+), 45 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 b08dff5..b753cdc 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,19 +1,34 @@
 package com.sandu.ximon.admin.manager.iot.amqp;
 
 import com.alibaba.fastjson.JSON;
-import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
-import com.sandu.ximon.admin.manager.iot.amqp.processor.LightDataProcessor;
-import com.sandu.ximon.admin.manager.iot.frame.inner.report.*;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.sandu.ximon.admin.manager.iot.amqp.processor.*;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3ErrorCodeReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
 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.*;
 import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
+import com.sandu.ximon.admin.service.C3ChargingService;
+import com.sandu.ximon.admin.service.C3mOrderService;
+import com.sandu.ximon.admin.service.PoleBindingService;
+import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.vo.C3mOrderVO;
+import com.sandu.ximon.dao.domain.C3mCharging;
+import com.sandu.ximon.dao.domain.C3mOrder;
+import com.sandu.ximon.dao.domain.PoleBinding;
+import com.sandu.ximon.dao.enums.OrderStatus;
+import com.sandu.ximon.dao.enums.OrderType;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.jms.Message;
 import javax.jms.MessageListener;
+import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -26,9 +41,10 @@
 @Slf4j
 public class AmqpMessageListener implements MessageListener {
 
+
     protected final static ExecutorService EXECUTOR_SERVICE = new ThreadPoolExecutor(
-            Runtime.getRuntime().availableProcessors(),
-            Runtime.getRuntime().availableProcessors() * 2, 60, TimeUnit.SECONDS,
+            Runtime.getRuntime().availableProcessors()  * 2,
+            Runtime.getRuntime().availableProcessors() * 4, 60, TimeUnit.SECONDS,
             new LinkedBlockingQueue<>(50000), new NameTreadFactory());
 
     static class NameTreadFactory implements ThreadFactory {
@@ -90,44 +106,32 @@
         if (frame == null) {
             return;
         }
-        log.info("澶勭悊璁㈤槄");
-        log.info(frame.toString());
-        if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
-            // 鍗曠伅鏁版嵁涓婃姤澶勭悊
-            LightDataProcessor.getInstance().process(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())) {
-            // 澶ф皵鏁版嵁鎸囦护涓婃姤
-            AirDataProcessor.getInstance().process(productKey, deviceName, frame);
-//            atmosphereAnalysis(productKey, deviceName, frame);
+//        if (!deviceName.equals("3930364d485010ff803affff")){
+//            return;
+//        }
+        log.info("澶勭悊璁㈤槄:\nmac:{},frame:{}",deviceName,frame.toString());
+        if (frame.getFunctionCode().equals("A5")){
+            log.info("A5");
+            if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_LIGHT_DATA.getCode())) {
+                // 鍗曠伅鏁版嵁涓婃姤澶勭悊
+                LightDataProcessor.getInstance().process(productKey, deviceName, frame);
+            } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_C3_DATA.getCode())) {
+                // C3鍏呯數妗╀笂鎶ュ鐞�
+                c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
+            } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
+                // 澶ф皵鏁版嵁鎸囦护涓婃姤
+                AirDataProcessor.getInstance().process(productKey, deviceName, frame);
+            } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_POLE_MONITOR_DATA.getCode())) {
+                PoleMonitorDataProcessor.getInstance().process(productKey, deviceName, frame);
+            }
+        } else if (frame.getFunctionCode().equals("A7")) {
+            log.info("A7");
+
+            if (frame.getOrderType().equals(A7OrderEnum.RESPONSE_PLC_DATA.getCode())){
+//                PLC
+                PlcDataProcessor.getInstance().process(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());
     }
 }

--
Gitblit v1.9.3