From f8743bb430dcf13406059366d233f7e5200a951b Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 25 Apr 2025 10:19:32 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E5=86=85=E8=92=99=E5=8F=A4?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=B7=BB=E5=8A=A0=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PileBasicInfoServiceImpl.java | 5 ++++ .../pile/thirdparty/EquipmentInfo.java | 30 +++++++++++++++++++ .../platform/common/StationInfo.java | 2 +- .../platform/domain/SupStationInfo.java | 2 +- .../impl/NeiMengGuPlatformServiceImpl.java | 16 ++++++++-- 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 6df36df1d..553007469 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -1259,6 +1259,11 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { equipmentInfo.setEquipmentPower(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); equipmentInfo.setNewNationalStandard(1); equipmentInfo.setVinFlag(1); + equipmentInfo.setSvin(1); + equipmentInfo.setSautoPower(1); + equipmentInfo.setVoltageUpperLimits(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); + equipmentInfo.setVoltageLowerLimits(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP)); + equipmentInfo.setCurrent(new BigDecimal(pileDetailInfoVO.getRatedCurrent()).setScale(1, BigDecimal.ROUND_HALF_UP)); equipmentInfo.setEquipmentName(pileSn); equipmentInfo.setEquipmentApplication(Constants.ONE); equipmentInfo.setEquipmentInvestment(new BigDecimal("0.0")); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java index d16846af0..4c9caa5cd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/thirdparty/EquipmentInfo.java @@ -169,6 +169,36 @@ public class EquipmentInfo { @JSONField(name = "ProductSN") private String productSN; + /** + * 是否支持自动识别VIN码 + */ + @JSONField(name = "SVIN") + private Integer svin; + + /** + * 是否支持有序充电 + */ + @JSONField(name = "SautoPower") + private Integer sautoPower; + + /** + * 额定电压上限 + */ + @JSONField(name = "VoltageUpperLimits") + private BigDecimal voltageUpperLimits; + + /** + * 额定电压下限 + */ + @JSONField(name = "VoltageLowerLimits") + private BigDecimal voltageLowerLimits; + + /** + * 额定电流 + */ + @JSONField(name = "Current") + private BigDecimal current; + /** * 站点额定功率 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java index b2c92b55f..8feb6c8c4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java @@ -190,7 +190,7 @@ public class StationInfo extends BaseStationInfo { * <=100字符 */ @JSONField(name = "MatchCars") - private String matchCars; + private List matchCars; /** * 车位楼层及数量描述 N diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java index c50add64b..7ca37cc27 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java @@ -93,7 +93,7 @@ public class SupStationInfo extends StationInfo { * 建站时间 */ @JSONField(name = "BuildTime") - private String BuildTime; + private String buildTime; /** * 充换电站方位 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java index a8215d158..2f29f5e68 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java @@ -249,7 +249,13 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService { stationInfo.setIsAloneApply(Integer.valueOf(pileStationInfo.getAloneApply())); stationInfo.setIsPublicParkingLot(Integer.valueOf(pileStationInfo.getPublicParking())); stationInfo.setCountryCode(pileStationInfo.getCountryCode()); - stationInfo.setAreaCode(pileStationInfo.getAreaCode()); + // stationInfo.setAreaCode(pileStationInfo.getAreaCode()); + // AreaCode根据逗号分组 + String[] split = StringUtils.split(pileStationInfo.getAreaCode(), ","); + // 只取最后一部分 330213 + String subAreaCode = split[split.length - 1]; + stationInfo.setAreaCode(subAreaCode); + GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress()); if (geoCode != null) { String areaCodeCountryside = geoCode.getCounty_code(); @@ -270,7 +276,7 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService { pictures = Lists.newArrayList(pileStationInfo.getPictures().split(",")); } stationInfo.setPictures(pictures); - stationInfo.setMatchCars(pileStationInfo.getMatchCars()); + stationInfo.setMatchCars(Lists.newArrayList("电动汽车")); stationInfo.setBusineHours(getBusineHours()); stationInfo.setRoundTheClock(Constants.one); Map feeMap = getFeeMap(stationId); @@ -300,6 +306,12 @@ public class NeiMengGuPlatformServiceImpl implements ThirdPartyPlatformService { if (CollectionUtils.isNotEmpty(pileList)) { stationInfo.setEquipmentInfos(pileList); // 充电设备信息列表 } + // 额定功率 + BigDecimal stationRatedPower = pileList.stream() + .map(EquipmentInfo::getEquipmentPower) + .reduce(BigDecimal.ZERO, BigDecimal::add); + stationInfo.setRatedPower(stationRatedPower); + resultList.add(stationInfo); } Map map = new LinkedHashMap<>();