diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index 832fcf99c..30d5baefe 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -386,12 +386,23 @@ public class PileBillingTemplateServiceImpl implements IPileBillingTemplateServi */ @Override public int changeStationTemplate(PileBillingTemplate pileBillingTemplate) { + PileBillingTemplate template = new PileBillingTemplate(); // 先将以前正在使用的模板查出来,状态改为0 + BillingTemplateVO billingTemplateVO = queryUsedBillingTemplate(String.valueOf(pileBillingTemplate.getStationId())); + if (billingTemplateVO != null) { + template.setId(Long.parseLong(billingTemplateVO.getTemplateId())); + template.setStatus("0"); + updatePileBillingTemplate(template); + } // 将当前这条模板状态改为1 + template.setId(pileBillingTemplate.getId()); + template.setStatus("1"); + + updatePileBillingTemplate(template); // 下发站点下所有桩 - + // pileRemoteService.publishBillingTemplate() return 0; } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java index 187296de7..5909c6dee 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java @@ -35,7 +35,7 @@ public class AMapEquipmentInfo { // 充电设备接口列表 @JSONField(name = "ConnectorInfos") - private List ConnectorInfos; + private List connectorInfos; // 充电设备总功率 单位:kW @JSONField(name = "Power") diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java index 135512b7c..4103674a6 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java @@ -164,6 +164,7 @@ public class AMapServiceImpl implements AMapService { aMapInfo.setStationName(stationInfo.getStationName()); aMapInfo.setCountryCode(stationInfo.getCountryCode()); aMapInfo.setAreaCode(stationInfo.getAreaCode()); + aMapInfo.setServiceTel(stationInfo.getStationTel()); aMapInfo.setAddress(stationInfo.getAddress()); aMapInfo.setServiceTel(stationInfo.getServiceTel()); aMapInfo.setStationType(Integer.parseInt(stationInfo.getStationType()));