From 4f9263aeee1c7e5a87a7ff58d008fb1c47ceed6b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 28 九月 2025 10:12:19 +0800
Subject: [PATCH] 增加同步引流平台的开关的功能
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
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 4297ea2..6ade2d6 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
@@ -797,6 +797,7 @@
String key = "AQJC_" + chargingOrder.getChargingGunId();
List<PlatformStartChargingReply> data = platformStartChargingReplyService.getPlatformStartChargingReply(code);
log.info(code + "：-------------------开始检查调起充电结果-------------------" + data.toString());
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
if (data.size() != 0) {
PlatformStartChargingReply platformStartChargingReply = data.get(1);
Integer startup_result = platformStartChargingReply.getStartup_result();
@@ -842,7 +843,7 @@
redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
//推送三方平台订单状态
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
}
return true;
@@ -876,7 +877,7 @@
this.updateById(order);
redisService.setCacheObject(key, preChargeCheck1, 24L, TimeUnit.HOURS);
//推送三方平台订单状态
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
}
return true;
@@ -917,6 +918,7 @@
if (order.getStatus() != 2) {
return;
}
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
String code = order.getCode();
PreChargeCheck preChargeCheck1 = redisService.getCacheObject("AQJC_" + order.getChargingGunId());
if (null != preChargeCheck1) {
@@ -940,8 +942,10 @@
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
chargingGun.setStatus(4);
chargingGunClient.updateChargingGunById(chargingGun);
- //推送状态给三方平台
- tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 4);
+ if(1 == site.getIsOpenSynchronization()){
+ //推送状态给三方平台
+ tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 4);
+ }
}
redisService.setCacheObject("AQJC_" + order.getChargingGunId(), preChargeCheck1, 24L, TimeUnit.HOURS);
this.updateById(order);
@@ -963,9 +967,12 @@
result.setStartTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
Operator operator = operatorClient.getOperatorById(order.getOperatorId()).getData();
result.setOperatorID(operator.getOperatorId());
- tcecClient.notificationStartChargeResult(result);
+ if(1 == site.getIsOpenSynchronization()){
+ tcecClient.notificationStartChargeResult(result);
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ }
- tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+
}
}
@@ -1291,8 +1298,9 @@
log.info(code1 + "：-------------------远程停止充电请求-------------------");
log.info(platformStopCharging.toString());
});
+ Site site = siteClient.getSiteByIds(Arrays.asList(order.getSiteId())).getData().get(0);
//推送三方平台
- if (2 == order.getOrderSource()) {
+ if (2 == order.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
}
@@ -2594,9 +2602,9 @@
redisService.setCacheObject("chargingOrderStatus:" + vo.getTransaction_serial_number(), 5, 100L, TimeUnit.SECONDS);
chargingOrder = this.getById(chargingOrder.getId());
-
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
//推送三方平台
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
TChargingOrder finalChargingOrder = chargingOrder;
new Thread(new Runnable() {
@Override
@@ -2632,7 +2640,7 @@
chargingGunClient.updateChargingGunById(chargingGun);
chargingGun = chargingGunClient.getChargingGunById(chargingOrder.getChargingGunId()).getData();
//推送状态给三方平台
- if (2 == chargingOrder.getOrderSource()) {
+ if (2 == chargingOrder.getOrderSource() && 1 == site.getIsOpenSynchronization()) {
tcecClient.pushChargingGunStatus(chargingGun.getFullNumber(), 2);
}
@@ -4108,9 +4116,11 @@
// scheduler.shutdown();
// }
// }, 5, 1, TimeUnit.SECONDS);
-
- //推送三方平台订单状态
- tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
+ if(1 == site.getIsOpenSynchronization()){
+ //推送三方平台订单状态
+ tcecClient.notificationEquipChargeStatus(chargingOrder.getStartChargeSeq(), chargingOrder.getOperatorId());
+ }
return R.ok();
}
@@ -4138,7 +4148,10 @@
chargingOrder.setStatus(4);
chargingOrder.setEndMode(1);
this.updateById(chargingOrder);
- tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ Site site = siteClient.getSiteByIds(Arrays.asList(chargingOrder.getSiteId())).getData().get(0);
+ if(1 == site.getIsOpenSynchronization()){
+ tcecClient.notificationEquipChargeStatus(order.getStartChargeSeq(), order.getOperatorId());
+ }
String code1 = order.getCode();
TChargingGun chargingGun = chargingGunClient.getChargingGunById(order.getChargingGunId()).getData();
--
Gitblit v1.7.1