From 866daa61219e1d3fa3d46cb361c7099e27507f68 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 23 Apr 2024 14:20:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9F=A5=E8=AF=A2=E7=AB=99=E7=82=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=8F=AA=E6=9F=A5=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E5=BA=94=E5=B9=B3=E5=8F=B0=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E7=AB=99=E7=82=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thirdparty/zhongdianlian/ZDLController.java | 2 +- .../xindiantu/service/impl/XDTServiceImpl.java | 14 +------------- .../service/impl/YCBCServiceImpl.java | 11 +---------- .../zhongdianlian/service/impl/ZDLServiceImpl.java | 12 ++++++++++++ 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java index 41d20bbf6..9caa0e434 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/zhongdianlian/ZDLController.java +++ b/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 map = zdlService.queryStationsInfo(queryStationInfoDTO); logger.info("中电联平台查询充电站信息 result:{}", JSON.toJSONString(map)); return CommonResult.success(0, "查询充电站信息成功！", map.get("Data"), map.get("Sig")); diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java index d61b0597e..29837bc17 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/xindiantu/service/impl/XDTServiceImpl.java +++ b/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 queryStationsInfo(QueryStationInfoDTO dto) { - // 查询出要查询的充电站id并set进 dto 的stationIds - ThirdPartyStationRelation relation = new ThirdPartyStationRelation(); - relation.setThirdPartyType(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode()); - List xdtList = relationService.selectThirdPartyStationRelationList(relation); - if (CollectionUtils.isNotEmpty(xdtList)) { - List stationList = xdtList.stream() - .map(x -> String.valueOf(x.getStationId())) - .collect(Collectors.toList()); - dto.setStationIds(stationList); - } + dto.setThirdPlatformType(ThirdPlatformTypeEnum.XIN_DIAN_TU.getTypeCode()); return zdlService.queryStationsInfo(dto); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java index 0b7d1ae1c..a5d9a1315 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/yongchengboche/service/impl/YCBCServiceImpl.java +++ b/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 queryStationsInfo(QueryStationInfoDTO dto) { - // 查询出要查询的充电站id并set进 dto 的stationIds - ThirdPartyStationRelation relation = new ThirdPartyStationRelation(); - relation.setThirdPartyType(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getTypeCode()); - List ycbcList = relationService.selectThirdPartyStationRelationList(relation); - if (CollectionUtils.isNotEmpty(ycbcList)) { - List stationList = ycbcList.stream() - .map(x -> String.valueOf(x.getStationId())) - .collect(Collectors.toList()); - dto.setStationIds(stationList); - } + dto.setThirdPlatformType(ThirdPlatformTypeEnum.YONG_CHENG_BO_CHE.getTypeCode()); return zdlService.queryStationsInfo(dto); } diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index d77624d8c..2eac38c8a 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/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 xdtList = thirdPartyStationRelationService.selectThirdPartyStationRelationList(relation); + if (CollectionUtils.isNotEmpty(xdtList)) { + List stationList = xdtList.stream() + .map(x -> String.valueOf(x.getStationId())) + .collect(Collectors.toList()); + dto.setStationIds(stationList); + } + PageUtils.startPage(pageNo, pageSize); List stationInfos = pileStationInfoService.getStationInfosByThirdParty(dto); if (CollectionUtils.isEmpty(stationInfos)) {