update 高德

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.primitives.Bytes;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
@@ -26,14 +27,13 @@ import com.jsowell.common.util.http.HttpUtils;
 import com.jsowell.common.util.id.SnUtils;
 import com.jsowell.common.util.id.SnowflakeIdWorker;
 import com.jsowell.common.util.ip.AddressUtils;
-import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand;
-import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand;
 import com.jsowell.netty.handler.HeartbeatRequestHandler;
 import com.jsowell.netty.service.yunkuaichong.YKCBusinessService;
-import com.jsowell.pile.dto.amap.GetStationInfoDTO;
-import com.jsowell.pile.service.YKCPushCommandService;
 import com.jsowell.pile.domain.*;
+import com.jsowell.pile.domain.ykcCommond.IssueQRCodeCommand;
+import com.jsowell.pile.domain.ykcCommond.ProofreadTimeCommand;
 import com.jsowell.pile.dto.*;
+import com.jsowell.pile.dto.amap.GetStationInfoDTO;
 import com.jsowell.pile.mapper.MemberBasicInfoMapper;
 import com.jsowell.pile.mapper.PileBillingTemplateMapper;
 import com.jsowell.pile.service.*;
@@ -45,6 +45,7 @@ import com.jsowell.service.MemberService;
 import com.jsowell.service.OrderService;
 import com.jsowell.service.PileRemoteService;
 import com.jsowell.service.PileService;
+import com.jsowell.thirdparty.amap.domain.AMapEquipmentInfo;
 import com.jsowell.thirdparty.amap.service.AMapService;
 import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
@@ -57,7 +58,6 @@ import com.jsowell.wxpay.dto.WeChatRefundDTO;
 import com.jsowell.wxpay.response.WechatPayRefundRequest;
 import com.jsowell.wxpay.service.WxAppletRemoteService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.compress.utils.Lists;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -171,6 +171,13 @@ public class SpringBootTestController {
 	@Autowired
 	private AMapService aMapService;
 
+	@Test
+	public void testGetPileListByStationIdList() {
+		List<String> stationIdList = Lists.newArrayList("2");
+		Map<String, List<AMapEquipmentInfo>> pileListByStationIdList = aMapService.getPileListByStationIdList(stationIdList);
+		System.out.println(pileListByStationIdList);
+	}
+
 	@Test
 	public void testMultiSave() {
 		String prefix = "test_multi_save:";

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/AMapService.java

@@ -1,9 +1,11 @@
 package com.jsowell.thirdparty.amap.service;
 
 import com.jsowell.pile.dto.amap.GetStationInfoDTO;
+import com.jsowell.thirdparty.amap.domain.AMapEquipmentInfo;
 import com.jsowell.thirdparty.amap.domain.AMapStationInfo;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -37,4 +39,6 @@ public interface AMapService {
     String pushChargingOrderInfo(String orderCode);
 
     List<AMapStationInfo> getStationInfosV2(GetStationInfoDTO dto);
+
+    Map<String, List<AMapEquipmentInfo>> getPileListByStationIdList(List<String> stationIdList);
 }

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java

@@ -452,7 +452,8 @@ public class AMapServiceImpl implements AMapService {
      * @param stationIdList
      * @return
      */
-    private Map<String, List<AMapEquipmentInfo>> getPileListByStationIdList(List<String> stationIdList) {
+    @Override
+    public Map<String, List<AMapEquipmentInfo>> getPileListByStationIdList(List<String> stationIdList) {
         Map<String, List<AMapEquipmentInfo>> resultMap = Maps.newHashMap();
         List<PileInfoVO> pileInfoVOS = pileBasicInfoService.queryPileDetailList(stationIdList);
         if (CollectionUtils.isEmpty(pileInfoVOS)) {
@@ -501,8 +502,8 @@ public class AMapServiceImpl implements AMapService {
                     connectorInfos.add(connectorInfo);
                 }
                 info.setConnectorInfos(connectorInfos);
-            }
                 pileList.add(info);
+            }
             resultMap.put(stationId, pileList);
         }
         return resultMap;