diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java index a43c3d2ea..39432b58e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/base/PileInfoVO.java @@ -56,7 +56,7 @@ public class PileInfoVO { private String modelName; /** - * 类型 + * 类型 1-快充;2-慢充 */ private String speedType; 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 671950890..269d800d5 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 @@ -158,9 +158,9 @@ public class AMapServiceImpl implements AMapService { aMapInfo = new AMapStationInfo(); String stationId = String.valueOf(stationInfo.getId()); aMapInfo.setStationID(stationId); - aMapInfo.setOperatorID(""); - aMapInfo.setEquipmentOwnerID(""); - aMapInfo.setOperatorName(""); + aMapInfo.setOperatorID(String.valueOf(stationInfo.getMerchantId())); + aMapInfo.setEquipmentOwnerID(Constants.OPERATORID_LIANLIAN); + aMapInfo.setOperatorName(Constants.JSOWELL); aMapInfo.setStationName(stationInfo.getStationName()); aMapInfo.setCountryCode(stationInfo.getCountryCode()); aMapInfo.setAreaCode(stationInfo.getAreaCode()); @@ -187,6 +187,22 @@ public class AMapServiceImpl implements AMapService { List equipmentInfos = equipmentInfoMap.get(stationId); aMapInfo.setEquipmentInfos(equipmentInfos); + int fastTotal = 0; + int slowTotal = 0; + + for (AMapEquipmentInfo equipmentInfo : equipmentInfos) { + Integer equipmentType = equipmentInfo.getEquipmentType(); + if (equipmentType == 1) { + fastTotal += 1; + } + if (equipmentType == 2) { + slowTotal += 1; + } + } + + + aMapInfo.setFastEquipmentNum(fastTotal); + aMapInfo.setSlowEquipmentNum(slowTotal); resultList.add(aMapInfo); } sw.stop(); @@ -445,7 +461,6 @@ public class AMapServiceImpl implements AMapService { // 根据站点id分组 Map> stationMap = pileInfoVOS.stream().collect(Collectors.groupingBy(PileInfoVO::getStationId)); - // 处理结果集 List pileList; AMapEquipmentInfo info;