From 8dcbf0608171abce431df0356f11efbbc6c2de40 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 七月 2022 15:45:52 +0800
Subject: [PATCH] 充电桩故障存储
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 bf56a56..403cd41 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,6 +1,5 @@
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.manager.iot.frame.inner.report.A5C3CommonReportInnerFrame;
@@ -10,24 +9,17 @@
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.math.BigDecimal;
-import java.util.Date;
/**
* @author ZZQ
@@ -126,7 +118,7 @@
LogUtils.error("{ 鍏呯數妗�(" + completeRequestFrame.getDestinationAddress() + ")鍏呯數缁撴潫涓婃姤璇诲彇蹇冭烦鍖呭け璐ワ紝璇锋鏌ュ厖鐢垫々鏄惁鍑虹幇鏁呴殰! }");
return;
}
- orderProcess(aPackage.getC3Mac());
+ orderProcess(aPackage);
} else if (C3ChargingEnum.CHARGE_STOP.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�斿厖鐢典腑鏂�");
@@ -138,6 +130,14 @@
A5C3ErrorCodeReportInnerFrame errorCodeRequestFrame = new A5C3ErrorCodeReportInnerFrame().transformFrame(frame.getPayload());
log.info("C3鍏呯數妗╀笂鎶ュ鐞哶errorCodeRequestFrame");
log.info(errorCodeRequestFrame.toString());
+
+ /**
+ * 淇濆瓨C3鍏呯數妗╂晠闅滄暟鎹�
+ */
+ if (errorCodeRequestFrame.isValidate() && (errorCodeRequestFrame.getErrorCode() != 0)) {
+ SpringContextHolder.getBean(C3mReportErrorService.class).saveReportError(errorCodeRequestFrame);
+ }
+
} else if (C3ChargingEnum.StartCharging.getCode().equals(functionCode)) {
log.info("蹇冭烦鍝嶅簲鈥斺�擟3鍏呯數妗╁紑濮嬪厖鐢�");
A5C3OperationReportInnerFrame operationReportInnerFrame = new A5C3OperationReportInnerFrame().transformFrame(frame.getPayload());
@@ -150,10 +150,11 @@
/**
* 璁㈠崟澶勭悊
*
- * @param c3Mac
+ * @param aPackage
*/
- private void orderProcess(String c3Mac) {
+ private void orderProcess(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage aPackage) {
+ String c3Mac = aPackage.getC3Mac();
//缁撴潫鍏呯數 鏇存敼璁㈠崟鐘舵��
C3mOrder lastOrderByC3Mac = SpringContextHolder.getBean(C3mOrderService.class).getLastOrderByC3Mac(c3Mac);
if (lastOrderByC3Mac != null) {
@@ -169,6 +170,8 @@
lastOrderByC3Mac.setActualChargingCapacity(0.00);
//璁剧疆璁㈠崟鐘舵�佷负鍏呯數缁撴潫
lastOrderByC3Mac.setChargingStates(1);
+ //璁剧疆鍓╀綑閲戦
+ lastOrderByC3Mac.setSurplusAmount(Double.parseDouble(aPackage.getRemainingAmount()));
SpringContextHolder.getBean(C3mOrderService.class).updateById(lastOrderByC3Mac);
}
}
--
Gitblit v1.9.3