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/service/C3mOrderService.java | 87 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 73 insertions(+), 14 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index 801027f..c6976da 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -15,20 +15,16 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.security.order.OrderQueryListener;
import com.sandu.ximon.admin.utils.AliPayUtils;
-import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
import com.sandu.ximon.dao.bo.C3mOrderBo;
-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.WxConfigEntity;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
@@ -40,6 +36,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -55,11 +53,9 @@
@AllArgsConstructor
public class C3mOrderService extends BaseServiceImpl<C3mOrderMapper, C3mOrder> {
- private final RedisUtils redisUtils;
private final PoleService poleService;
private final C3mOrderMapper c3mOrderMapper;
private final WxFastPayService fastPayService;
- private final OrderQueryListener orderQueryListener;
private final Snowflake snowflake;
private final C3ChargingService c3ChargingService;
@@ -146,7 +142,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity, String wxCode) {
+ Integer subscribeChargingCapacity, String wxCode) throws InterruptedException {
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
.eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));
@@ -187,6 +183,37 @@
c3mOrderEntity.setRefundAmount(totalAmount);
c3mOrderEntity.setSurplusAmount(totalAmount);
+ //纭鍏呯數妗╃姸鎬�
+ ChargingDto chargingInfo = c3ChargingService.getChargingInfo(streetlightId.toString());
+ if (chargingInfo.getStatusBit() != 1) {
+ throw new BusinessException("鍏呯數妗╅潪绌洪棽鐘舵��,鏃犳硶鍒涘缓璁㈠崟!");
+ }
+ Thread.sleep(500);
+
+ //鍚屾鏃堕棿鎴�
+ System.out.println("鍚屾鏃堕棿鎴冲紑濮�");
+ String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+ String s = c3ChargingService.SetCalendar(c3m.getC3Mac(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+ Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
+ Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
+ log.error("鍚屾鏃堕棿鎴崇粨鏋� : " + s);
+ if (!"鎿嶄綔鎴愬姛".equals(s)) {
+ throw new BusinessException(s + "!");
+ }
+ Thread.sleep(500);
+
+ //鍚屾璐圭巼
+ List<C3mChargingCharge> list = SpringContextHolder.getBean(C3mChargingChargeService.class)
+ .list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3m.getC3Id()));
+ if (list == null && list.size() == 0) {
+ //璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
+ SpringContextHolder.getBean(C3mChargingChargeService.class).initCharge((c3m.getC3Id()).intValue());
+ }
+ String rateState = c3ChargingService.setRate(c3m.getC3Mac(), list, true);
+ log.error("璐圭巼璁剧疆缁撴灉 : " + rateState);
+ if (!"鎿嶄綔鎴愬姛".equals(rateState)) {
+ throw new BusinessException(s + "!");
+ }
if (save(c3mOrderEntity)) {
return c3mOrderEntity;
@@ -363,19 +390,18 @@
}
-
/**
- * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴灉鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴潫鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
*
* @param dataPackage
*/
- public void stopCharingOrder(String c3Mac, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
- if (c3Mac.isEmpty() || c3Mac == null || dataPackage == null) {
+ public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (dataPackage == null) {
return;
}
//鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
.eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
//璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
@@ -397,4 +423,37 @@
}
}
+ /**
+ * 鍒锋柊鍏呯數涓鍗曚俊鎭�
+ *
+ * @param aPackage
+ */
+ public 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