update 第三方平台查询站点信息接口只查推送的对应平台下的站点信息

jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java

@@ -94,7 +94,7 @@ public class ZDLController extends BaseController {
             // 转换成相应对象
             QueryStationInfoDTO queryStationInfoDTO = JSONObject.parseObject(dataStr, QueryStationInfoDTO.class);
             queryStationInfoDTO.setOperatorId(dto.getOperatorID());
-            queryStationInfoDTO.setAddress("宁波");
+            queryStationInfoDTO.setThirdPlatformType(ThirdPlatformTypeEnum.ZHONG_DIAN_LIAN_PLATFORM.getTypeCode());
             Map<String, String> map = zdlService.queryStationsInfo(queryStationInfoDTO);
             logger.info("中电联平台查询充电站信息 result:{}", JSON.toJSONString(map));
             return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig"));

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java

@@ -31,9 +31,6 @@ public class XDTServiceImpl implements XDTService {
     @Autowired
     private ZDLService zdlService;
 
-    @Autowired
-    private ThirdPartyStationRelationService relationService;
-
     @Autowired
     private PileStationInfoService pileStationInfoService;
 
@@ -75,16 +72,7 @@ public class XDTServiceImpl implements XDTService {
      */
     @Override
     public Map<String, String> queryStationsInfo(QueryStationInfoDTO dto) {
-        // 查询出要查询的充电站id并set进 dto 的stationIds
+        dto.setThirdPlatformType(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode());
-        ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
-        relation.setThirdPartyType(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode());
-        List<ThirdPartyStationRelation> xdtList = relationService.selectThirdPartyStationRelationList(relation);
-        if (CollectionUtils.isNotEmpty(xdtList)) {
-            List<String> stationList = xdtList.stream()
-                    .map(x -> String.valueOf(x.getStationId()))
-                    .collect(Collectors.toList());
-            dto.setStationIds(stationList);
-        }
         return zdlService.queryStationsInfo(dto);
     }
 

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java

@@ -155,16 +155,7 @@ public class YCBCServiceImpl implements YCBCService {
      */
     @Override
     public Map<String, String> queryStationsInfo(QueryStationInfoDTO dto) {
-        // 查询出要查询的充电站id并set进 dto 的stationIds
+        dto.setThirdPlatformType(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getTypeCode());
-        ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
-        relation.setThirdPartyType(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getTypeCode());
-        List<ThirdPartyStationRelation> ycbcList = relationService.selectThirdPartyStationRelationList(relation);
-        if (CollectionUtils.isNotEmpty(ycbcList)) {
-            List<String> stationList = ycbcList.stream()
-                    .map(x -> String.valueOf(x.getStationId()))
-                    .collect(Collectors.toList());
-            dto.setStationIds(stationList);
-        }
         return zdlService.queryStationsInfo(dto);
     }
 

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java

@@ -42,6 +42,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 中电联 Service
@@ -321,6 +322,17 @@ public class ZDLServiceImpl implements ZDLService {
         int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
         int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
 
+        // 根据第三方平台类型查询出要查询的充电站id并set进 dto 的stationIds
+        ThirdPartyStationRelation relation = new ThirdPartyStationRelation();
+        relation.setThirdPartyType(dto.getThirdPlatformType());
+        List<ThirdPartyStationRelation> xdtList = thirdPartyStationRelationService.selectThirdPartyStationRelationList(relation);
+        if (CollectionUtils.isNotEmpty(xdtList)) {
+            List<String> stationList = xdtList.stream()
+                    .map(x -> String.valueOf(x.getStationId()))
+                    .collect(Collectors.toList());
+            dto.setStationIds(stationList);
+        }
+
         PageUtils.startPage(pageNo, pageSize);
         List<ThirdPartyStationInfoVO> stationInfos = pileStationInfoService.getStationInfosByThirdParty(dto);
         if (CollectionUtils.isEmpty(stationInfos)) {