From 08049e5ac27458241cf3b054c1d38dbcb6ac91ac Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 十月 2024 13:59:21 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 7 +++++++
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java | 1 +
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
index e00f706..58d5b85 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/UploadRealTimeMonitoringData.java
@@ -26,6 +26,7 @@
private Integer insertion_status; // 是否插枪（0：否，1：是）
private BigDecimal output_voltage; // 输出电压，精确到小数点后一位；待机置零
private BigDecimal output_current; // 输出电流，精确到小数点后一位；待机置零
+ private BigDecimal power; // 功率
private Integer gun_line_temperature; // 枪线温度，整形，偏移量-50；待机置零
private String gun_line_code; // 枪线编码，没有置零
private Integer soc; // SOC待机置零；交流桩置零
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index d3d0d55..921dedc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1515,6 +1515,13 @@
if (chargingOrder.getCode()!=null){
List<UploadRealTimeMonitoringData> data6 = uploadRealTimeMonitoringDataClient.getDataByOrderCode(chargingOrder.getCode()).getData();
if (data6!=null){
+ for (UploadRealTimeMonitoringData uploadRealTimeMonitoringData : data6) {
+ if (uploadRealTimeMonitoringData.getOutput_current()!=null&&
+ uploadRealTimeMonitoringData.getOutput_voltage()!=null){
+ uploadRealTimeMonitoringData.setPower(uploadRealTimeMonitoringData.getOutput_voltage()
+ .multiply(uploadRealTimeMonitoringData.getOutput_current()));
+ }
+ }
if (!data6.isEmpty()){
// 第一条数据soc为开始 最后一条数据soc为结束soc
chargingOrderListInfoVO.setStartSoc(data6.get(0).getSoc().toString());
--
Gitblit v1.7.1