From d9e5b2ed36c56c0e25f28723eb99a8e6b2f06208 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 26 Sep 2023 17:13:39 +0800 Subject: [PATCH] update --- .../pile/service/impl/PileStationInfoServiceImpl.java | 1 + .../src/main/java/com/jsowell/pile/vo/web/PileStationVO.java | 5 +++++ .../thirdparty/nanrui/service/impl/NRServiceImpl.java | 4 +--- 3 files changed, 7 insertions(+), 3 deletions(-) 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 571c6b6c9..182d0afde 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 @@ -156,6 +156,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { } vo.setStationLat(pileStationInfo.getStationLat()); vo.setStationLng(pileStationInfo.getStationLng()); + vo.setCountryCode(pileStationInfo.getCountryCode()); vo.setConstruction(pileStationInfo.getConstruction()); vo.setBusinessHours(pileStationInfo.getBusinessHours()); // vo.setOrganizationCode(pileStationInfo.getor); 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 750a596c7..8196caffc 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 @@ -54,6 +54,11 @@ public class PileStationVO { */ private String address; + /** + * 充电站国家代码 + */ + private String countryCode; + /** * 二维码前缀 */ diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java index fde79788f..486574e76 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java @@ -65,16 +65,14 @@ public class NRServiceImpl implements NRService { .operatorID(Constants.OPERATORID_LIANLIAN) .equipmentOwnerID(Constants.OPERATORID_LIANLIAN) .stationName(stationInfoVO.getStationName()) - .countryCode("CN") + .countryCode(stationInfoVO.getCountryCode()) .areaCode(stationInfoVO.getAreaCode()) .address(stationInfoVO.getAddress()) .serviceTel(stationInfoVO.getStationTel()) - // .stationType() .stationStatus(stationInfoVO.getStationStatus()) .parkNums(0) .stationLng(new BigDecimal(stationInfoVO.getStationLng()).setScale(6, BigDecimal.ROUND_HALF_UP)) .stationLat(new BigDecimal(stationInfoVO.getStationLat()).setScale(6, BigDecimal.ROUND_HALF_UP)) - // .construction() .openForBusinessDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, DateUtils.parseDate(stationInfoVO.getCreateTime()))) .openAllDay(Integer.parseInt(stationInfoVO.getOpenAllDay())) .busineHours(stationInfoVO.getBusinessHours())