From 3f8d6fb524fc56a569063ad6459a75ddbc37912c Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 10 十月 2025 15:46:56 +0800
Subject: [PATCH] 联调修改E路通bug
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 4347bdb..36e3f98 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
@@ -18,6 +18,7 @@
import com.ruoyi.chargingPile.api.domain.SiteMenu;
import com.ruoyi.chargingPile.mapper.SiteMapper;
import com.ruoyi.chargingPile.service.*;
+import com.ruoyi.chargingPile.util.UUIDUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
@@ -210,13 +211,14 @@
threadPoolExecutor.execute(()->{
StationInfoReq stationInfoReq = new StationInfoReq();
stationInfoReq.setOperatorId("91510903906171535D");
- stationInfoReq.setStationId(site.getId().toString());
+ stationInfoReq.setStationId(site.getCode());
OperatorInfo operatorInfo = new OperatorInfo();
operatorInfo.setOperatorId("91510903906171535D");
operatorInfo.setOperatorName("四川明星新能源科技有限公司");
operatorInfo.setOperatorTel1("18683346252");
operatorInfo.setOperatorTel2("13982508784");
operatorInfo.setOperatorRegAddress("遂宁市船山区渠河南路18号");
+ operatorInfo.setOperatorNote("");
stationInfoReq.setOperatorInfo(operatorInfo);
List<StationInfo> stationInfos = new ArrayList<>();
stationInfos.add(buildStationInfo(site));
@@ -236,7 +238,7 @@
StationInfo stationInfo = new StationInfo();
stationInfo.setSerAreaCode(site.getSerAreaCode());
stationInfo.setOperatorId("91510903906171535D");
- stationInfo.setStationId(site.getId().toString());
+ stationInfo.setStationId(site.getCode());
stationInfo.setStationName(site.getName());
stationInfo.setStationMode("CD");
stationInfo.setAreaCode(site.getDistrictsCode());
@@ -321,7 +323,15 @@
stationInfo.setPictures(Arrays.asList(site.getImgUrl().split(",")));
}
stationInfo.setMatchCars(site.getVehicleDescription());
- stationInfo.setBusineHours(site.getStartServiceTime() + " - " + site.getEndServiceTime());
+ stationInfo.setBusinessHours(site.getStartServiceTime() + " - " + site.getEndServiceTime());
+ stationInfo.setSiteGuide("");
+ stationInfo.setPictures(new ArrayList<>());
+ stationInfo.setMatchCars("");
+ stationInfo.setElectricityFee(BigDecimal.ZERO);
+ stationInfo.setServiceFee(BigDecimal.ZERO);
+ stationInfo.setParkFee(BigDecimal.ZERO);
+ stationInfo.setPayment("2");
+ stationInfo.setSupportOrder(0);
stationInfo.setEquipmentInfos(buildEquipmentInfo(site));
return stationInfo;
}
@@ -332,13 +342,15 @@
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(chargingPile.getManufacturerCode());
- equipmentInfo.setManufacturerName(chargingPile.getManufacturer());
- equipmentInfo.setEquipmentModel(chargingPile.getEquipmentType());
+ equipmentInfo.setManufacturerId(StringUtils.isNotEmpty(chargingPile.getManufacturerCode()) ? chargingPile.getManufacturerCode() : "91510900MACPB4NJ4E");
+ equipmentInfo.setManufacturerName(StringUtils.isNotEmpty(chargingPile.getManufacturer()) ? chargingPile.getManufacturer() : "");
+ equipmentInfo.setEquipmentModel(StringUtils.isNotEmpty(chargingPile.getEquipmentType()) ? chargingPile.getEquipmentType() : "");
if(null != chargingPile.getProductionDate()){
equipmentInfo.setProductionDate(chargingPile.getProductionDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ }else{
+ equipmentInfo.setProductionDate("");
}
equipmentInfo.setEquipmentType(0 == chargingPile.getType() ? 5 : chargingPile.getType());
if(StringUtils.isNotEmpty(chargingPile.getEquipmentLng())){
@@ -361,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());
@@ -370,6 +382,7 @@
connectorInfo.setPower(chargingGun.getRatedPower().doubleValue());
connectorInfo.setParkNo(chargingGun.getParkingNumber());
connectorInfo.setNationalStandard(Integer.parseInt(chargingGun.getNationalStandard()));
+ connectorInfo.setParkNo("");
add(connectorInfo);
}
}};
@@ -407,13 +420,14 @@
threadPoolExecutor.execute(()->{
StationInfoReq stationInfoReq = new StationInfoReq();
stationInfoReq.setOperatorId("91510903906171535D");
- stationInfoReq.setStationId(site.getId().toString());
+ stationInfoReq.setStationId(site.getCode());
OperatorInfo operatorInfo = new OperatorInfo();
operatorInfo.setOperatorId("91510903906171535D");
operatorInfo.setOperatorName("四川明星新能源科技有限公司");
operatorInfo.setOperatorTel1("18683346252");
operatorInfo.setOperatorTel2("13982508784");
operatorInfo.setOperatorRegAddress("遂宁市船山区渠河南路18号");
+ operatorInfo.setOperatorNote("");
stationInfoReq.setOperatorInfo(operatorInfo);
List<StationInfo> stationInfos = new ArrayList<>();
stationInfos.add(buildStationInfo(site));
--
Gitblit v1.7.1