From d08aab9abf24fd6319a2d54d9c252745f111f275 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 26 八月 2022 15:14:22 +0800
Subject: [PATCH] 充电桩FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 73 +++++++++++-------------------------
1 files changed, 23 insertions(+), 50 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 0e43c46..a305df2 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,7 +12,6 @@
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;
@@ -58,12 +57,8 @@
if (netRequestFrame.isValidate()) {
//淇濆瓨鍏呯數妗╃‖浠朵俊鎭�
- boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
- //妫�鏌ユ槸鍚︽湁姝ｅ湪杩涜鐨勮鍗曪紝鏈夌殑璇濈户缁厖鐢�
- SpringContextHolder.getBean(C3mOrderService.class).recoverContinueCharing(netRequestFrame.getDestinationAddress(), netRequestFrame.getMcuUdid());
- if (!b) {
- return;
- }
+ SpringContextHolder.getBean(C3ChargingService.class)
+ .saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress());
}
} else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
// 缃戦〉鎿嶄綔浜岀淮鐮佽姹�(41)
@@ -73,12 +68,6 @@
if (codeRequestFrame.isValidate()) {
if (deviceName != null) {
-// C3mCharging c3mCharging = SpringContextHolder.getBean(C3ChargingService.class).
-// getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, codeRequestFrame.getDestinationAddress()).last("limit 1"));
-// if (c3mCharging == null) {
-// SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, codeRequestFrame.getMcuUdid(), codeRequestFrame.getDestinationAddress());
-// }
-
//璁剧疆浜岀淮鐮�
Pole pole = SpringContextHolder.getBean(PoleService.class).getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getDeviceCode, deviceName));
if (pole != null) {
@@ -113,18 +102,28 @@
/**
* 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
*/
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress());
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress(), true);
if (aPackage == null) {
LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
return;
}
- orderProcess(aPackage);
+ orderService.orderProcess(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());
+
+ /**
+ * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
+ */
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(stopRequestFrame.getDestinationAddress(), true);
+ if (aPackage == null) {
+ LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+ return;
+ }
+ orderService.stopCharingOrder(aPackage);
} else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�旀晠闅�");
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
@@ -135,47 +134,21 @@
* 淇濆瓨C3鍏呯數妗╂晠闅滄暟鎹�
*/
if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
+ //淇濆瓨鏁呴殰淇℃伅
SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
+// //鍏呯數妗╂晠闅滅粨鏉熻鍗�
+// A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress(), true);
+// if (aPackage == null) {
+// LogUtils.error("{ 鍏呯數妗�(" + errorCodeRequestFrame.getDestinationAddress() + ")鏁呴殰涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
+// return;
+// }
+// orderService.stopCharingOrder(aPackage);
+
} else {
System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
}
-
- } else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {
- log.info("蹇冭烦鍝嶅簲鈥斺�擟3鍏呯數妗╁紑濮嬪厖鐢�");
- A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(frame.getPayload());
- log.info("C3鍏呯數妗╀笂鎶ュ鐞哶heartbeatReportInnerFrame");
- log.info(operationReportInnerFrame.toString());
-
}
}
- /**
- * 璁㈠崟澶勭悊
- *
- * @param aPackage
- */
- private void orderProcess(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {
-
- String c3Mac = aPackage.getC3Mac();
- //缁撴潫鍏呯數 鏇存敼璁㈠崟鐘舵��
- C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
- if (lastOrderByC3Mac != null) {
- //璁剧疆璁㈠崟鐘舵�佷负宸插畬鎴�
- lastOrderByC3Mac.setOrderStatus(OrderStatus.COMPLETE.getStatus());
-
- BigDecimal actualChargingCapacity = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacity());
- BigDecimal actualChargingCapacityHide = BigDecimal.valueOf(lastOrderByC3Mac.getActualChargingCapacityHide());
- //璁剧疆瀹為檯鍏呯數鐢甸噺
- lastOrderByC3Mac.setActualChargingCapacity(actualChargingCapacity.add(actualChargingCapacityHide).doubleValue());
- //璁剧疆璁㈠崟缁撴潫鏃堕棿
- lastOrderByC3Mac.setStopChargingTimestamp(System.currentTimeMillis());
- lastOrderByC3Mac.setActualChargingCapacity(0.00);
- //璁剧疆璁㈠崟鐘舵�佷负鍏呯數缁撴潫
- lastOrderByC3Mac.setChargingStates(1);
- //璁剧疆鍓╀綑閲戦
- lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount()));
- SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
- }
- }
}
--
Gitblit v1.9.3