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 | 77 +++++++++++++++-----------------------
1 files changed, 31 insertions(+), 46 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 ce40a71..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
@@ -2,19 +2,14 @@
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.amqp.processor.PoleMonitorDataProcessor;
-import com.sandu.ximon.admin.manager.iot.amqp.processor.c3ChargingProcessor;
+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.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.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;
@@ -48,8 +43,8 @@
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 {
@@ -79,8 +74,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")) {
// 涓婁笅绾夸笂鎶ュ鐞�
@@ -111,42 +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); //TODO 姝ｅ紡涓婄嚎鎵撳紑
- } */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);
- }
- }
+// 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");
- private void c3ChargingReportAnalysis(String productKey, String deviceName, CommonFrame frame) {
- String functionCode = frame.getPayload().substring(2, 4);
- if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.HEART_BEAT.getCode().equals(functionCode)) {
- // 蹇冭烦鍖呬笂鎶�(42) 鑻ヤ簲鍒嗛挓鏃犲績璺冲寘鏁版嵁锛屽垯鍒ゆ柇绂荤嚎
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
- } else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
- c3ChargingProcessor.c3ChargingProcessorgetInstance().process(productKey, deviceName, frame);
+ if (frame.getOrderType().equals(A7OrderEnum.RESPONSE_PLC_DATA.getCode())){
+// PLC
+ PlcDataProcessor.getInstance().process(productKey, deviceName,frame);
+ }
}
- }
+ }
}
--
Gitblit v1.9.3