autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-17 08:18:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 高德地图

Browse Source
This commit is contained in:
Lemon
2023-06-27 14:20:14 +08:00
parent f4a332aa58
commit 16128b10bb
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -72,6 +72,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutionException;
@ActiveProfiles("dev") @ActiveProfiles("dev")
@SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -173,9 +174,14 @@ public class SpringBootTestController {
@Test @Test
public void testGetPileListByStationIdList() { public void testGetPileListByStationIdList() {
List<String> stationIdList = Lists.newArrayList("2");
Map<String, List<AMapEquipmentInfo>> pileListByStationIdList = aMapService.getPileListByStationIdList(stationIdList); // List<String> stationIdList = Lists.newArrayList("2");
System.out.println(pileListByStationIdList); // Map<String, List<AMapEquipmentInfo>> pileListByStationIdList = aMapService.getPileListByStationIdList(stationIdList);
// System.out.println(pileListByStationIdList);
GetStationInfoDTO dto = new GetStationInfoDTO();
dto.setType("page");
aMapService.getStationInfosV2(dto);
} }
@Test @Test

2
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/common/AMapCommonResult.java vendored
View File

@@ -24,7 +24,7 @@ public class AMapCommonResult {
*/ */
public AMapCommonResult successResponse(Object responseData) { public AMapCommonResult successResponse(Object responseData) {
AMapResponse response = new AMapResponse(); AMapResponse response = new AMapResponse();
response.setCode("1000"); response.setCode("10000");
response.setMsg("请求成功!"); response.setMsg("请求成功!");
response.setData(responseData); response.setData(responseData);
return new AMapCommonResult(response); return new AMapCommonResult(response);

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

@@ -158,7 +158,7 @@ public class AMapServiceImpl implements AMapService {
aMapInfo = new AMapStationInfo(); aMapInfo = new AMapStationInfo();
String stationId = String.valueOf(stationInfo.getId()); String stationId = String.valueOf(stationInfo.getId());
aMapInfo.setStationID(stationId); aMapInfo.setStationID(stationId);
aMapInfo.setOperatorID(String.valueOf(stationInfo.getMerchantId())); aMapInfo.setOperatorID(Constants.OPERATORID_LIANLIAN);
aMapInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); aMapInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN);
aMapInfo.setOperatorName(Constants.JSOWELL); aMapInfo.setOperatorName(Constants.JSOWELL);
aMapInfo.setStationName(stationInfo.getStationName()); aMapInfo.setStationName(stationInfo.getStationName());
@@ -403,8 +403,8 @@ public class AMapServiceImpl implements AMapService {
for (String s : applyTime) { for (String s : applyTime) {
info = new AMapPriceChargingInfo(); info = new AMapPriceChargingInfo();
info.setFeeTime(s); info.setFeeTime(s);
info.setElectricityFee(billingDetailVO.getElectricityPrice()); info.setElectricityFee(billingDetailVO.getElectricityPrice().setScale(4, BigDecimal.ROUND_HALF_UP));
info.setServiceFee(billingDetailVO.getServicePrice()); info.setServiceFee(billingDetailVO.getServicePrice().setScale(4, BigDecimal.ROUND_HALF_UP));
priceList.add(info); priceList.add(info);
} }
} }
@@ -436,7 +436,7 @@ public class AMapServiceImpl implements AMapService {
PileModelInfoVO modelInfo = pileModelInfoService.getPileModelInfoByModelId(pileBasicInfo.getModelId()); PileModelInfoVO modelInfo = pileModelInfoService.getPileModelInfoByModelId(pileBasicInfo.getModelId());
info.setEquipmentType(Integer.parseInt(modelInfo.getSpeedType())); info.setEquipmentType(Integer.parseInt(modelInfo.getSpeedType()));
info.setPower(new BigDecimal(modelInfo.getRatedPower()).setScale(1, RoundingMode.HALF_UP)); info.setPower(new BigDecimal(modelInfo.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP));
List<AMapConnectorInfo> aMapConnectorInfos = getConnectorListBySN(pileBasicInfo.getSn()); List<AMapConnectorInfo> aMapConnectorInfos = getConnectorListBySN(pileBasicInfo.getSn());
@@ -486,7 +486,7 @@ public class AMapServiceImpl implements AMapService {
info.setEquipmentID(pileSn); info.setEquipmentID(pileSn);
info.setManufacturerName(Constants.JSOWELL); info.setManufacturerName(Constants.JSOWELL);
info.setEquipmentType(Integer.valueOf(pileInfoVO.getSpeedType())); info.setEquipmentType(Integer.valueOf(pileInfoVO.getSpeedType()));
info.setPower(new BigDecimal(pileInfoVO.getRatedPower())); info.setPower(new BigDecimal(pileInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP));
connectorInfos = Lists.newArrayList(); connectorInfos = Lists.newArrayList();
for (PileInfoVO infoVO : value) { for (PileInfoVO infoVO : value) {
connectorInfo = new AMapConnectorInfo(); connectorInfo = new AMapConnectorInfo();