From 3939ebb82144f784bf8edf6643aa24cfbc9efbc8 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 26 八月 2022 10:46:36 +0800
Subject: [PATCH] 充电桩FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 152 ++++++++++++++++++--------------------------------
1 files changed, 55 insertions(+), 97 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 fae7404..7645eec 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
@@ -1,9 +1,7 @@
package com.sandu.ximon.admin.manager.iot.amqp.processor;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.util.SpringContextHolder;
-import com.sandu.ximon.admin.config.RedisConfig;
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;
@@ -11,23 +9,16 @@
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
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.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.service.*;
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.Pole;
-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 java.util.Date;
+import java.math.BigDecimal;
/**
* @author ZZQ
@@ -68,10 +59,10 @@
//淇濆瓨鍏呯數妗╃‖浠朵俊鎭�
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(C3mOrderService.class).recoverContinueCharing(netRequestFrame.getDestinationAddress(), netRequestFrame.getMcuUdid());
+// if (!b) {
+// return;
+// }
}
} else if (C3ChargingEnum.QR_CODE_REQUEST.getCode().equals(functionCode)) {
// 缃戦〉鎿嶄綔浜岀淮鐮佽姹�(41)
@@ -81,6 +72,12 @@
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) {
@@ -115,112 +112,73 @@
/**
* 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
*/
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress());
+ A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(completeRequestFrame.getDestinationAddress(), true);
if (aPackage == null) {
LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
return;
}
- refund(aPackage);
+ 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());
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + stopRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
- }
- refund(aPackage);
-
} else if (C3ChargingEnum.ERROR_CODE.getCode().equals(functionCode)) {
+ log.info("蹇冭烦鍝嶅簲鈥斺�旀晠闅�");
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
log.info(errorCodeRequestFrame.toString());
- A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage = c3ChargingService.ReadTheHeartbeatPackage(errorCodeRequestFrame.getDestinationAddress());
- if (aPackage == null) {
- LogUtils.error("{ 鍏呯數妗�(" + errorCodeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
- return;
+
+ /**
+ * 淇濆瓨C3鍏呯數妗╂晠闅滄暟鎹�
+ */
+ if (errorCodeRequestFrame.isValidate() && errorCodeRequestFrame.getErrorMessage() != null) {
+ SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
+ } else {
+ System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
}
- refund(aPackage);
+
} 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());
-// if (operationReportInnerFrame.isValidate()) {
-// SpringContextHolder.getBean(C3ChargingService.class).saveReportData(deviceName, operationReportInnerFrame.getHeartBeatDataPackage());
-// }
}
}
- private void refund(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {
-// private void refund(A5C3CommonReportInnerFrame completeRequestFrame,String code){
- /**
- * 璇诲彇蹇冭烦鍖咃紝鍒ゆ柇鍓╀綑閲戦鍜屽凡鍏呯數閲忥紝缁熻鍒扮紦瀛樹腑姝ｅ湪杩涜鐨勮鍗曘��
- */
- String c3Mac = aPackage.getC3Mac();
- // 鑾峰彇蹇冭烦鍖呬腑鐨勫墿浣欓噾棰濆拰宸插厖鐢甸噺锛屼笌缂撳瓨涓鍦ㄨ繘琛岀殑璁㈠崟杩涜瀵规瘮
- String chargingOrderJson = RedisUtils.getBean().get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3Mac);
- if (chargingOrderJson.isEmpty() || null == chargingOrderJson) {
- C3mCharging c3m = c3ChargingService.getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac));
- PoleBinding binding = bindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class)
- .eq(PoleBinding::getDeviceCode, aPackage.getC3Mac())
- .eq(PoleBinding::getDeviceType, 2));
- // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
- C3mOrder order = new C3mOrderVO().generateOrder(binding.getPoleId() == null ? 0L : binding.getPoleId()
- , c3m.getPoleDevicesCode(), c3m.getC3Mac(), OrderType.ERROR, Double.valueOf(aPackage.getRemainingAmount()),
- Integer.parseInt(new java.text.DecimalFormat("0").format(aPackage.getReservedCapacity()))
- );
- order.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity()));
- order.setOrderStatus(OrderStatus.REFUNDING.getStatus());
- order.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount()));
- orderService.save(order);
- String s = c3ChargingService.finishCharging(c3Mac);
-// if(C3ChargingEnum.CHARGE_COMPLETE.getCode().equals(code)){
-//
-// }
- //鏄惁闇�瑕佸尯鍒唋og绫诲瀷 寰呭畾
- LogUtils.error("{ 鍏呯數妗�(" + c3Mac + ")涓嶅瓨鍦ㄦ鍦ㄨ繘琛岀殑璁㈠崟锛岃妫�鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰!缁撴潫璁㈠崟,缁撴灉涓�" + s + "}");
- } else {
- C3mOrder c3mOrderEntity = JSON.parseObject(chargingOrderJson, C3mOrder.class);
- // 璁剧疆宸插厖鐢甸噺锛岃鍗曠姸鎬侊紝閫�娆鹃噾棰濓紝璁㈠崟閫�娆炬椂闂存埑锛岃鍗曢��娆捐鏄庯紝缁撴潫鍏呯數鏃堕棿鎴筹紝
- c3mOrderEntity.setActualChargingCapacity(Double.valueOf(aPackage.getChargedCapacity()));
- c3mOrderEntity.setOrderStatus(OrderStatus.REFUNDING.getStatus());
- c3mOrderEntity.setRefundAmount(Double.valueOf(aPackage.getRemainingAmount()));
- // 鑾峰彇鍓╀綑閲戦杩涜閫�娆撅紝骞跺啓鍏ュ綋鍓嶆鍦ㄨ繘琛岀殑璁㈠崟
- boolean b = orderService.orderRefund(c3mOrderEntity.getOutTradeNo(), c3mOrderEntity.getRefundAmount());
- c3mOrderEntity.setRefundTimestamp(new Date().getTime());
- if (b) {
- c3mOrderEntity.setOrderStatus(OrderStatus.REFUND.getStatus());
- c3mOrderEntity.setRefundMsg("鍏呯數缁撴潫,璁㈠崟閫�娆炬垚鍔�");
- } else {
- c3mOrderEntity.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus());
- c3mOrderEntity.setRefundMsg(
- "鍏呯數缁撴潫,璁㈠崟閫�娆惧け璐�,璇疯繘琛屾墜鍔ㄩ��娆�(璁㈠崟鍙�(" +
- c3mOrderEntity.getOutTradeNo() + "),鎬婚噾棰�(" +
- c3mOrderEntity.getTotalAmount() + ",閫�娆鹃噾棰�(" +
- aPackage.getRemainingAmount() + "))"
- );
- }
- c3mOrderEntity.setStopChargingTimestamp(new Date().getTime());
- orderService.updateById(c3mOrderEntity);
- // 娓呴櫎缂撳瓨涓鍦ㄨ繘琛屼腑鐨勮鍗�
- b = RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac());
- if (!b) {
- try {
- Thread.sleep(2000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- RedisUtils.getBean().delete(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3mOrderEntity.getC3Mac());
- }
- // 鍙戦�佺粨鏉熻鍗�
- String s = c3ChargingService.finishCharging(c3Mac);
- LogUtils.error("{ 鍏呯數妗�(" + c3Mac + ")涓嶅瓨鍦ㄦ鍦ㄨ繘琛岀殑璁㈠崟锛岃妫�鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰!缁撴潫璁㈠崟,缁撴灉涓�" + s + "}");
- }
+ /**
+ * 璁㈠崟澶勭悊
+ *
+ * @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()));
+ //璁剧疆閫�娆鹃噾棰�
+ lastOrderByC3Mac.setRefundAmount(Double.parseDouble(aPackage.getRemainingAmount()));
+ //鍏呯數鏃堕暱
+ lastOrderByC3Mac.setAlreadyChargingTime(aPackage.getAlreadyChargingTime());
+ SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
+ }
}
}
--
Gitblit v1.9.3