diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index 7ad31182f..f73d4140b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -120,6 +120,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { if (StringUtils.isNotBlank(pileStationInfo.getQrcodePrefix())) { vo.setQrcodePrefix(pileStationInfo.getQrcodePrefix()); } + if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) { + vo.setParkingNumber(pileStationInfo.getParkingNumber()); + } vo.setMerchantAdminName(pileStationInfo.getStationAdminName()); vo.setStationStatus(Integer.parseInt(pileStationInfo.getStationStatus())); vo.setStationType(pileStationInfo.getStationType()); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java index 06c2b9693..da6670743 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java @@ -112,6 +112,11 @@ public class PileStationVO { */ private String stationLat; + /** + * 停车场库编号 + */ + private String parkingNumber; + /** * 建设场所 */ diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java index fccfc4665..46ae0e8f0 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationInfo.java @@ -76,7 +76,8 @@ public class StationInfo { * 停车场库编号 N * 公共停车场库编号 */ - // private String ParkingLotNumber; + @JSONField(name = "ParkingLotNumber") + private String parkingLotNumber; /** * 充电站国家代码 Y diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index b5899ff8b..f7b42c2e4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -184,6 +184,9 @@ public class LianLianServiceImpl implements LianLianService { .build(); String payment = StationPaymentEnum.getPaymentByCode(pileStationInfo.getPayment()); info.setPayment(payment); + if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) { + info.setParkingLotNumber(pileStationInfo.getParkingNumber()); + } List pileList = getPileList(pileStationInfo); if (CollectionUtils.isNotEmpty(pileList)) { info.setEquipmentInfos(pileList); // 充电设备信息列表 diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue index 532e162a4..529fb46ea 100644 --- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue +++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue @@ -115,6 +115,11 @@ > + + + + + @@ -245,6 +250,7 @@ export default { address: "", stationTel: "", matchCars: "", + parkingNumber: "", selectMatchCars: [], publicFlag: "", openFlag: "",