From 605c6779265fbd3d4c960f0748b74fcde1a8da21 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 八月 2026 18:06:50 +0800
Subject: [PATCH] feat: adjust card order export fields
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TCardChargingOrderServiceImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TCardChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TCardChargingOrderServiceImpl.java
index 48e5e0d..87eb888 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TCardChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TCardChargingOrderServiceImpl.java
@@ -14,6 +14,8 @@
import com.ruoyi.order.mapper.TCardChargingOrderMapper;
import com.ruoyi.order.service.TCardChargingOrderService;
import com.ruoyi.chargingPile.api.model.Site;
+import com.ruoyi.integration.api.model.UploadRealTimeMonitoringData;
+import com.ruoyi.order.util.mongodb.service.UploadRealTimeMonitoringDataService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -40,6 +42,8 @@
private ChargingPileClient chargingPileClient;
@Resource
private ChargingGunClient chargingGunClient;
+ @Resource
+ private UploadRealTimeMonitoringDataService uploadRealTimeMonitoringDataService;
@Override
public PageInfo<ChargingOrderVO> pageList(CardChargingOrderQuery query) {
@@ -139,6 +143,12 @@
if (item.getStartTime() != null && item.getEndTime() != null) {
item.setChargingSecond(ChronoUnit.SECONDS.between(item.getStartTime(), item.getEndTime()));
}
+ UploadRealTimeMonitoringData monitoringData = uploadRealTimeMonitoringDataService.getLastDataById(item.getCode());
+ if (monitoringData != null) {
+ item.setChargeCurrent(monitoringData.getOutput_current());
+ item.setChargeVoltage(monitoringData.getOutput_voltage());
+ item.setChargePower(monitoringData.getPower());
+ }
item.setPlatformIncome(BigDecimal.ZERO);
item.setPartnerIncome(BigDecimal.ZERO);
}
--
Gitblit v1.7.1