From 74dbde1f3b2f42c42a67ccd1df82f4d89c729559 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 17:40:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index d826f95..2756dc1 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -342,7 +342,7 @@
return new ArrayList<EquipmentInfo>(){{
for (TChargingPile chargingPile : list) {
EquipmentInfo equipmentInfo = new EquipmentInfo();
- equipmentInfo.setEquipmentId(chargingPile.getId().toString());
+ equipmentInfo.setEquipmentId(chargingPile.getCode());
equipmentInfo.setEquipmentName(chargingPile.getName());
equipmentInfo.setManufacturerId(StringUtils.isNotEmpty(chargingPile.getManufacturerCode()) ? chargingPile.getManufacturerCode() : "91510900MACPB4NJ4E");
equipmentInfo.setManufacturerName(StringUtils.isNotEmpty(chargingPile.getManufacturer()) ? chargingPile.getManufacturer() : "");
@@ -373,7 +373,7 @@
return new ArrayList<ConnectorInfo>(){{
for (TChargingGun chargingGun : list) {
ConnectorInfo connectorInfo = new ConnectorInfo();
- connectorInfo.setConnectorId(chargingGun.getId().toString());
+ connectorInfo.setConnectorId(chargingGun.getCode());
connectorInfo.setConnectorName(chargingGun.getName());
connectorInfo.setConnectorType(0 == chargingGun.getType() ? 6 : chargingGun.getType());
connectorInfo.setVoltageUpperLimits(chargingGun.getUpperRatedVoltage().intValue());
@@ -728,7 +728,9 @@
integrationClient.setupBillingModel1(tChargingPile.getCode(), JSON.toJSONString(accountingStrategyDetails));
}
- //推送三方平台
- tcecClient.notificationStationChange(Arrays.asList(id));
+ if(1 == site.getIsOpenSynchronization()){
+ //推送三方平台
+ tcecClient.notificationStationChange(Arrays.asList(id));
+ }
}
}
--
Gitblit v1.7.1