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/processor/c3ChargingProcessor.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 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 800126c..aec136d 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
@@ -12,6 +12,7 @@
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.OrderStatus;
@@ -49,14 +50,14 @@
@Override
public void process(String productKey, String deviceName, CommonFrame frame) {
- String functionCode = frame.getPayload().substring(2, 4);
//TODO
- if (!frame.getPayload().contains("0000048E")) {
+ if (!"32313243305005ffad36ffff".equals(deviceName)) {
log.info("涓嶈澶勭悊0000048E涔嬪鐨勫厖鐢垫々锛�");
return;
}
+ String functionCode = frame.getPayload().substring(2, 4);
if (C3ChargingEnum.NETWORK_REQUEST.getCode().equals(functionCode)) {
A5C3CommonReportInnerFrame netRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶netRequestFrame");
@@ -109,28 +110,44 @@
/**
* 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
*/
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
+ if (completeRequestFrame != null) {
+ C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
+ getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, completeRequestFrame.getMcuUdid()).last("limit 1"));
+ if (one == null) {
+ return;
+ }
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ orderService.stopCharingOrder(aPackage);
}
- orderService.stopCharingOrder(aPackage);
+
} else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�斿厖鐢典腑鏂�");
A5C3CommonReportInnerFrame stopRequestFrame = new A5C3CommonReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶stopRequestFrame");
log.info(stopRequestFrame.toString());
+ if (stopRequestFrame != null) {
+ C3mCharging one = SpringContextHolder.getBean(C3ChargingService.class).
+ getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, stopRequestFrame.getMcuUdid()).last("limit 1"));
+ if (one == null) {
+ return;
+ }
- /**
- * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
- */
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress(), true);
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(one.getC3Id(), true);
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ orderService.stopCharingOrder(aPackage);
}
- orderService.stopCharingOrder(aPackage);
+
} else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�旀晠闅�");
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
@@ -155,6 +172,7 @@
System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
}
}
+
}
--
Gitblit v1.9.3