autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 03:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 高德地图

Browse Source
This commit is contained in:
Lemon
2023-06-17 10:37:02 +08:00
parent bdea81a30b
commit 25b141ccdd
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapEquipmentInfo.java vendored
View File

@@ -35,7 +35,7 @@ public class AMapEquipmentInfo {
// 充电设备接口列表
@JSONField(name = "ConnectorInfos")
private List<AMapConnectorInfo> AMapConnectorInfos;
private List<AMapConnectorInfo> ConnectorInfos;
// 充电设备总功率 单位：kW
@JSONField(name = "Power")

4
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java vendored
View File

@@ -132,7 +132,7 @@ public class AMapStationInfo {
// 充电收费信息
@JSONField(name = "PriceChargingInfo")
private List<AMapPriceChargingInfo> AMapPriceChargingInfo;
private List<AMapPriceChargingInfo> PriceChargingInfo;
// 快充总桩数
@JSONField(name = "FastEquipmentNum")
@@ -144,5 +144,5 @@ public class AMapStationInfo {
// 充电设备信息列表
@JSONField(name = "EquipmentInfos")
private List<AMapEquipmentInfo> AMapEquipmentInfos;
private List<AMapEquipmentInfo> EquipmentInfos;
}

10
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java vendored
View File

@@ -1,17 +1,14 @@
package com.jsowell.thirdparty.amap.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.util.PageUtils;
import com.jsowell.common.util.StringUtils;
import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileBasicInfo;
import com.jsowell.pile.domain.PileStationInfo;
import com.jsowell.pile.dto.amap.ChargeDeviceDynamicsDTO;
import com.jsowell.pile.dto.amap.GetStationInfoDTO;
import com.jsowell.pile.service.*;
import com.jsowell.pile.service.impl.PileStationInfoServiceImpl;
import com.jsowell.pile.vo.base.ConnectorInfoVO;
import com.jsowell.pile.vo.uniapp.BillingPriceVO;
import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO;
@@ -25,7 +22,6 @@ import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -106,14 +102,14 @@ public class AMapServiceImpl implements AMapService {
aMapInfo.setBusineHours(stationInfo.getBusinessHours());
List<AMapPriceChargingInfo> priceList = getPriceInfoByStationId(String.valueOf(stationInfo.getId()));
aMapInfo.setAMapPriceChargingInfo(priceList);
aMapInfo.setPriceChargingInfo(priceList);
Map<String, Integer> pileNumMap = pileConnectorInfoService.getPileTypeNum(stationInfo.getId());
aMapInfo.setFastEquipmentNum(pileNumMap.get("fastTotal"));
aMapInfo.setSlowEquipmentNum(pileNumMap.get("slowTotal"));
List<AMapEquipmentInfo> aMapEquipmentInfos = getPileListByStationId(String.valueOf(stationInfo.getId()));
aMapInfo.setAMapEquipmentInfos(aMapEquipmentInfos);
aMapInfo.setEquipmentInfos(aMapEquipmentInfos);
resultList.add(aMapInfo);
}
@@ -225,7 +221,7 @@ public class AMapServiceImpl implements AMapService {
List<AMapConnectorInfo> aMapConnectorInfos = getConnectorListBySN(pileBasicInfo.getSn());
info.setAMapConnectorInfos(aMapConnectorInfos);
info.setConnectorInfos(aMapConnectorInfos);
pileList.add(info);
}

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/util/AMapUtils.java vendored
View File

@@ -29,7 +29,7 @@ public class AMapUtils {
private static String PRD_URL;
@Value("${aMap.merchantPrivateKey}")
public static void setMerchantPrivateKey(String merchantPrivateKey) {
public void setMerchantPrivateKey(String merchantPrivateKey) {
AMapUtils.MERCHANT_PRIVATE_KEY = merchantPrivateKey;
}