From bcff6cd41a09c5b3f5db68db8b9dbb2f90fb78f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 28 十月 2024 11:11:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java
index afe00bd..15700f9 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java
@@ -201,7 +201,7 @@
uploadRealTimeMonitoringData.setElectrovalence_all(accountingStrategyDetail.getElectrovalence());
uploadRealTimeMonitoringData.setService_charge(accountingStrategyDetail.getServiceCharge());
if (Objects.nonNull(data)) {
- uploadRealTimeMonitoringData.setLast_time(data.getLast_time());
+ data.setLast_time(new Date());
uploadRealTimeMonitoringData.setPeriod_electric_price(uploadRealTimeMonitoringDataMessage.getPaid_amount().subtract(data.getPaid_amount()));
uploadRealTimeMonitoringData.setPeriod_charging_degree(uploadRealTimeMonitoringDataMessage.getCharging_degree().subtract(data.getCharging_degree()));
uploadRealTimeMonitoringData.setPeriod_service_price(uploadRealTimeMonitoringDataMessage.getCharging_degree().multiply(accountingStrategyDetail.getServiceCharge()).setScale(4, RoundingMode.HALF_UP));
@@ -214,8 +214,8 @@
uploadRealTimeMonitoringData.setOrderType(chargingOrder.getOrderType());
uploadRealTimeMonitoringData.setSiteId(chargingOrder.getSiteId());
uploadRealTimeMonitoringData.setStatus(chargingOrder.getStatus());
- uploadRealTimeMonitoringData.setStartTime(chargingOrder.getStartTime());
- uploadRealTimeMonitoringData.setEndTime(chargingOrder.getEndTime());
+// uploadRealTimeMonitoringData.setStartTime(chargingOrder.getStartTime());
+// uploadRealTimeMonitoringData.setEndTime(chargingOrder.getEndTime());
int i = uploadRealTimeMonitoringDataService.create(uploadRealTimeMonitoringData);
if(i == 0){
log.error("数据存储mongo失败");
@@ -375,6 +375,13 @@
TransactionRecordMessageVO vo = new TransactionRecordMessageVO();
BeanUtils.copyProperties(transactionRecordMessage,vo);
chargingOrderClient.endChargeBillingCharge(vo);
+ // 添加实时上传记录结束记录
+ // 查询mogondb上一条数据
+ UploadRealTimeMonitoringData data = uploadRealTimeMonitoringDataService.getLastDataById(transactionRecordMessage.getTransaction_serial_number());
+ UploadRealTimeMonitoringData uploadRealTimeMonitoringData = new UploadRealTimeMonitoringData();
+ BeanUtils.copyProperties(data,uploadRealTimeMonitoringData);
+ uploadRealTimeMonitoringData.setStatus(5);
+ uploadRealTimeMonitoringDataService.create(uploadRealTimeMonitoringData);
break;
case SendTagConstant.UPDATE_BALANCE_REPLY:
UpdateBalanceReplyMessage updateBalanceReplyMessage = message.getUpdateBalanceReplyMessage();
--
Gitblit v1.7.1