From cacface6d1aa5e676e250122f6b51151285d28a4 Mon Sep 17 00:00:00 2001 From: Lemon Date: Wed, 25 Sep 2024 08:54:44 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E5=90=8E=E7=AE=A1=E5=85=85?= =?UTF-8?q?=E7=94=B5=E6=A1=A9=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E6=8C=89?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2=E5=8F=AA=E8=83=BD=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=BD=93=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/PileBasicInfoService.java | 2 ++ .../impl/PileBasicInfoServiceImpl.java | 21 ++++++++++++++++++- .../impl/SuZhouPlatformServiceImpl.java | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java index 5c92c803f..7db837018 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java @@ -89,6 +89,8 @@ public interface PileBasicInfoService { List queryPileInfoList(QueryPileDTO queryPileDTO); + public List queryPileInfoListNoPage(QueryPileDTO queryPileDTO); + /** * 通过pileId更改运营商、站点信息 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 152b213f2..3a780895a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -261,7 +261,7 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { // watch.start("首先不分页查询所有符合条件的充电桩"); log.info("queryPileInfos dto:{}", JSON.toJSONString(dto)); // 首先不分页查询所有符合条件的充电桩 - List pileInfoVOS = queryPileInfoList(dto); + List pileInfoVOS = queryPileInfoListNoPage(dto); // watch.stop(); // watch.start("查询充电桩状态"); @@ -347,6 +347,25 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService { return pileBasicInfoMapper.queryPileInfos(queryPileDTO); } + /** + * 查询充电桩列表 + * 后管使用，带权限过滤(不分页) + * @param queryPileDTO + * @return + */ + @Override + public List queryPileInfoListNoPage(QueryPileDTO queryPileDTO) { + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); + if (authorizedMap == null) { + // 为空表示没有权限，返回空数组 + return Lists.newArrayList(); + } + queryPileDTO.setStationDeptIds(authorizedMap.getStationDeptIds()); + queryPileDTO.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); + + return pileBasicInfoMapper.queryPileInfos(queryPileDTO); + } + /** * 通过pileId更改运营商、站点信息 * diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java index 271a93ff6..ab07d68ce 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/SuZhouPlatformServiceImpl.java @@ -173,7 +173,7 @@ public class SuZhouPlatformServiceImpl implements ThirdPartyPlatformService { String stationId = String.valueOf(pileStationInfo.getId()); stationInfo.setStationID(stationId); // MerchantInfoVO merchantInfo = pileMerchantInfoService.getMerchantInfo(String.valueOf(pileStationInfo.getMerchantId())); - stationInfo.setOperatorID(Constants.OPERATORID_LIANLIAN); // 组织机构代码 + stationInfo.setOperatorID(Constants.OPERATORID_JIANG_SU); // 组织机构代码 stationInfo.setEquipmentOwnerID(String.valueOf(pileStationInfo.getMerchantId())); stationInfo.setStationName(pileStationInfo.getStationName()); stationInfo.setIsAloneApply(Integer.valueOf(pileStationInfo.getAloneApply()));