From a9de601f87f633f71b6e531da0b61da8665d6383 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 10 十月 2024 09:04:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/produce/ChargingMessageListener.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 521a8e3..6cebbaf 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
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.ruoyi.chargingPile.api.feignClient.AccountingStrategyDetailClient;
import com.ruoyi.chargingPile.api.feignClient.ChargingGunClient;
+import com.ruoyi.chargingPile.api.feignClient.ChargingPileClient;
import com.ruoyi.chargingPile.api.feignClient.FaultMessageClient;
import com.ruoyi.chargingPile.api.model.TAccountingStrategyDetail;
import com.ruoyi.chargingPile.api.model.TChargingGun;
@@ -18,6 +19,9 @@
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.query.UploadRealTimeMonitoringDataQuery;
+import com.ruoyi.order.api.vo.PlatformStartChargingReplyMessageVO;
+import com.ruoyi.order.api.vo.PlatformStopChargingReplyVO;
+import com.ruoyi.order.api.vo.SecurityDetectionVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.spring.annotation.MessageModel;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
@@ -112,6 +116,14 @@
private QrCodeDeliveryReplyService qrCodeDeliveryReplyService;
@Autowired
private SecurityDetectionService securityDetectionService;
+
+ @Resource
+ private ChargingPileClient chargingPileClient;
+
+
+
+
+
@StreamListener("input")
@Override
protected void handleMessage(ChargingMessage message) throws Exception {
@@ -135,6 +147,8 @@
Ping ping = new Ping();
BeanUtils.copyProperties(pingMessage,ping);
pingService.create(ping);
+
+ chargingPileClient.updateChargingPileStatus(pingMessage.getCharging_pile_code(), pingMessage.getCharging_gun_status());
break;
case SendTagConstant.END_CHARGE:
EndChargeMessage endChargeMessage = message.getEndChargeMessage();
@@ -316,7 +330,7 @@
BeanUtils.copyProperties(platformStartChargingReplyMessage,platformStartChargingReply);
platformStartChargingReplyService.create(platformStartChargingReply);
// 业务处理
- com.ruoyi.order.api.vo.PlatformStartChargingReplyMessage message1 = new com.ruoyi.order.api.vo.PlatformStartChargingReplyMessage();
+ PlatformStartChargingReplyMessageVO message1 = new com.ruoyi.order.api.vo.PlatformStartChargingReplyMessageVO();
BeanUtils.copyProperties(platformStartChargingReplyMessage, message1);
chargingOrderClient.startChargeSuccessfully(message1);
break;
@@ -327,6 +341,9 @@
PlatformStopChargingReply platformStopChargingReply = new PlatformStopChargingReply();
BeanUtils.copyProperties(platformStopChargingReplyMessage,platformStopChargingReply);
platformStopChargingReplyService.create(platformStopChargingReply);
+ PlatformStopChargingReplyVO platformStopChargingReply1 = new PlatformStopChargingReplyVO();
+ BeanUtils.copyProperties(platformStopChargingReply, platformStopChargingReply1);
+ chargingOrderClient.terminateSuccessfulResponse(platformStopChargingReply1);
break;
case SendTagConstant.TRANSACTION_RECORD:
TransactionRecordMessage transactionRecordMessage = message.getTransactionRecordMessage();
@@ -427,7 +444,7 @@
SecurityDetection securityDetection = new SecurityDetection();
BeanUtils.copyProperties(securityDetectionMessage,securityDetection);
securityDetectionService.create(securityDetection);
- com.ruoyi.order.api.vo.SecurityDetection securityDetection1 = new com.ruoyi.order.api.vo.SecurityDetection();
+ SecurityDetectionVO securityDetection1 = new SecurityDetectionVO();
BeanUtils.copyProperties(securityDetection, securityDetection1);
chargingOrderClient.securityDetection(securityDetection1);
break;
--
Gitblit v1.7.1