From 29f93d75f1bae1466e29f42e348b2af361c6824d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 01 七月 2022 11:26:01 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/AmqpMessageListener.java | 79 +++++++++++++++------------------------
1 files changed, 31 insertions(+), 48 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 a6b034d..75a9dbc 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,39 @@
package com.sandu.ximon.admin.manager.iot.amqp;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.sandu.ximon.admin.manager.iot.amqp.processor.PoleMonitorDataProcessor;
+import com.sandu.ximon.admin.manager.iot.amqp.processor.c3ChargingProcessor;
+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.C3ChargingEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
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;
@@ -25,6 +45,7 @@
*/
@Slf4j
public class AmqpMessageListener implements MessageListener {
+
protected final static ExecutorService EXECUTOR_SERVICE = new ThreadPoolExecutor(
Runtime.getRuntime().availableProcessors(),
@@ -58,8 +79,8 @@
String topic = message.getStringProperty("topic");
String messageId = message.getStringProperty("messageId");
-// log.info("鏀跺埌璁㈤槄" + topic + "," + messageId);
-// log.info(content);
+ log.info("鏀跺埌璁㈤槄" + topic + "," + messageId);
+ log.info(content);
if (null != map.get("status")) {
// 涓婁笅绾夸笂鎶ュ鐞�
@@ -90,57 +111,19 @@
if (frame == null) {
return;
}
-// log.info("澶勭悊璁㈤槄");
-// log.info(frame.toString());
+ 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);
+ c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
} else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_ATMOSPHERE_DATA.getCode())) {
-// //娴嬭瘯鐢ㄧ殑
-// String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101010907640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
-// CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
// 澶ф皵鏁版嵁鎸囦护涓婃姤
AirDataProcessor.getInstance().process(productKey, deviceName, frame);
-// atmosphereAnalysis(productKey, deviceName, frame);
+ } else if (frame.getOrderType().equals(A5OrderEnum.RESPONSE_POLE_MONITOR_DATA.getCode())) {
+ PoleMonitorDataProcessor.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());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
- log.info(netRequestFrame.toString());
- } else if (A5C3ReportEnum.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)) {
- A5C3HeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5C3HeartbeatReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶heartbeatReportInnerFrame");
- log.info(heartbeatReportInnerFrame.toString());
- } else if (A5C3ReportEnum.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)) {
- A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
- log.info(stopRequestFrame.toString());
- } else if (A5C3ReportEnum.ERROR_CODE.getCode().equals(functionCode)) {
- A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
- log.info(errorCodeRequestFrame.toString());
-
- }
- }
-
- 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