From d336c87860f631ff912a10c9b3e6d6f0ad133aeb Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Wed, 16 Aug 2023 14:48:05 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=B0=B4=E5=88=A9=E5=B9=BF=E5=AE=81=E6=B0=B4?= =?UTF-8?q?=E5=88=A9=E5=B1=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/service/impl/AreaServiceImpl.java | 2 +- .../main/service/impl/WaterServiceImpl.java | 10 +++++----- .../station/service/impl/ImsDeptServiceImpl.java | 18 ++++++------------ .../station/service/impl/StationServiceImpl.java | 22 +++++++++++++++++++--- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaServiceImpl.java index 7b8f5f0..f00ff5b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaServiceImpl.java @@ -109,7 +109,7 @@ public class AreaServiceImpl implements AreaService { }}); if(CollectionUtil.isNotEmpty(configs)){ List stations =stationService.list(new LambdaQueryWrapper(){{ - eq(StationEntity::getType,HomePageConstant.HYDROPOWER); + in(StationEntity::getType,types); eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE); }}); if(CollectionUtil.isEmpty(stations)){ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java index 72ee28a..632479a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/WaterServiceImpl.java @@ -827,7 +827,7 @@ public class WaterServiceImpl implements IWaterService { @Override public WaterConservancyVo waterConservancy(Long deptId) { // 查询水利站点 - List stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,true); + List stations = stationService.getHomeStationList(deptId, HomePageConstant.waterList, HomePageConstant.HYDROPOWER_SERVETYPE,false); if (CollectionUtil.isEmpty(stations)) { return new WaterConservancyVo(); } @@ -888,7 +888,7 @@ public class WaterServiceImpl implements IWaterService { public List waterDetails(Long deptId) { // 获取区域map ： key-区域机构 value-水利站点集合 // 获取区域或者站点map结构 - Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true); + Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false); if(MapUtils.isEmpty(map)){ return null; } @@ -933,7 +933,7 @@ public class WaterServiceImpl implements IWaterService { @Override public List waterUseEleRanking(Long deptId) { // 获取区域map ： key-区域机构 value-水利站点集合 - Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,true); + Map> map = areaService.areaOrStaion(deptId,HomePageConstant.waterList,false); if(MapUtils.isEmpty(map)){ return null; } @@ -1002,7 +1002,7 @@ public class WaterServiceImpl implements IWaterService { return null; } // 获取水利站点 - List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true); + List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false); if(CollectionUtil.isEmpty(stationList)){ return null; } @@ -1062,7 +1062,7 @@ public class WaterServiceImpl implements IWaterService { return null; } // 获取水利站点 - List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,true); + List stationList = stationService.getStationList(R.getData(),deptId,HomePageConstant.waterList,HomePageConstant.HYDROPOWER_SERVETYPE,false); if(CollectionUtil.isEmpty(stationList)){ return null; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java index b3d5b64..630b930 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/ImsDeptServiceImpl.java @@ -208,7 +208,7 @@ public class ImsDeptServiceImpl extends ServiceImpl stationEntityList = stationService.getStationType(serveType, type ,value,true); + List stationEntityList = stationService.getStationType(serveType, type ,value,false); if(CollectionUtil.isEmpty(stationEntityList)){ return null; } @@ -319,21 +319,13 @@ public class ImsDeptServiceImpl extends ServiceImpl paramIdList = this.getParamIdList(R.getData(),dept); - if(CollectionUtil.isEmpty(paramIdList)){ - return null; - } // 所有站点 List value = R.getData().stream().filter(o->o.getDeptCategory().equals(4)).map(Dept::getId).collect(Collectors.toList()); List type = ObjectUtil.isNotEmpty(typeArea) ? Collections.singletonList(typeArea) : null; if(HomePageConstant.WATER_CONSERVANCY.equals(typeArea)){ type = HomePageConstant.waterList; } - List stationEntityList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, type ,value,true); + List stationEntityList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, type ,value,false); if(CollectionUtil.isEmpty(stationEntityList)){ return null; } @@ -344,8 +336,10 @@ public class ImsDeptServiceImpl extends ServiceImpl areaList = validList.stream().filter(o->paramIdList.contains(o.getId()) && o.getDeptCategory().equals(3)).collect(Collectors.toList()); - return areaList.stream().map(o-> new AreaTypeVo(o.getId(),o.getDeptName())).collect(Collectors.toList()); + if(ObjectUtil.isNotEmpty(deptId)){ + return validList.stream().filter(o->deptId.equals(o.getId()) && o.getDeptCategory().equals(3)).map(o-> new AreaTypeVo(o.getId(),o.getDeptName())).collect(Collectors.toList()); + } + return validList.stream().filter(o->o.getDeptCategory().equals(3)).map(o-> new AreaTypeVo(o.getId(),o.getDeptName())).collect(Collectors.toList()); } /** diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java index 78b0091..0ebfdab 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/StationServiceImpl.java @@ -8,6 +8,8 @@ import com.hnac.hzims.common.service.UserAuthDataService; import com.hnac.hzims.fdp.feign.IQuestionClient; import com.hnac.hzims.hzimsweather.response.air.Station; import com.hnac.hzims.operational.OperationalConstants; +import com.hnac.hzims.operational.main.entity.UserDeptEntity; +import com.hnac.hzims.operational.main.service.UserDeptService; import com.hnac.hzims.operational.main.vo.StationCountVo; import com.hnac.hzims.operational.station.StationConstants; import com.hnac.hzims.operational.main.constant.HomePageConstant; @@ -70,6 +72,7 @@ public class StationServiceImpl extends BaseServiceImpl()); + refDepList = this.getStationDeptList(authList, types,dept.getId(), new ArrayList<>()); } // 获取水利站点(过滤其他站点类型) return this.getWaterList(refDepList, types, servrType,make); @@ -527,7 +530,20 @@ public class StationServiceImpl extends BaseServiceImpl getStationDeptList(List departList, Long deptId, List list) { + private List getStationDeptList(List departList, List types,Long deptId, List list) { + List configs = userDeptService.list(new LambdaQueryWrapper(){{ + eq(UserDeptEntity::getUserId, AuthUtil.getUserId()); + }}); + if(CollectionUtil.isNotEmpty(configs)){ + List stations =this.list(new LambdaQueryWrapper(){{ + in(StationEntity::getType,types); + eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE); + }}); + if(CollectionUtil.isEmpty(stations)){ + return new ArrayList<>(); + } + return stations.stream().map(StationEntity::getRefDept).collect(Collectors.toList()); + } if (null == deptId || CollectionUtil.isEmpty(departList)) { return null; } @@ -536,7 +552,7 @@ public class StationServiceImpl extends BaseServiceImpl