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/HydropowerServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java index a71fbe6..e4369a1 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/HydropowerServiceImpl.java @@ -1594,7 +1594,7 @@ public class HydropowerServiceImpl implements HydropowerService { * @return */ private String intervalTemp(Map week, String code,boolean flag) { - if(MapUtils.isEmpty(week) || !week.containsKey(code)){ + if(MapUtils.isEmpty(week) || !week.containsKey(code) || ObjectUtil.isEmpty(week.get(code))){ return "21"; } if(flag){ 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..99c71b8 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 @@ -327,7 +327,7 @@ public class WaterServiceImpl implements IWaterService { */ private List getModelStationList() { // 水利站点(All) - List stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,true); + List stationList = stationService.getStationType(HomePageConstant.HYDROPOWER_SERVETYPE, null, null,false); if(CollectionUtil.isEmpty(stationList)){ return null; } @@ -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 ccf516a..21d2d28 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 @@ -9,6 +9,8 @@ import com.hnac.hzims.common.service.UserAuthDataService; import com.hnac.hzims.fdp.feign.IQuestionClient; import com.hnac.hzims.operational.OperationalConstants; import com.hnac.hzims.operational.main.constant.HomePageConstant; +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.station.dto.StationPushConfigDTO; @@ -33,7 +35,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.logger.BladeLogger; -import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -68,6 +69,7 @@ public class StationServiceImpl extends BaseServiceImpllambdaUpdate() + .set(StationEntity::getCode, req.getCode()) + .set(StationEntity::getName, req.getName()) + .set(StationEntity::getType, req.getType()) + .set(StationEntity::getCommissionTime, req.getCommissionTime()) + .set(StationEntity::getEnableControl, req.getEnableControl()) + .set(StationEntity::getLgtd, req.getLgtd()) + .set(StationEntity::getLttd, req.getLttd()) + .set(StationEntity::getRefDept, req.getRefDept()) + .set(StationEntity::getAreaCode, req.getAreaCode()) + .set(StationEntity::getRefDomain, req.getRefDomain()) + .set(StationEntity::getRefBasin, req.getRefBasin()) + .set(StationEntity::getRefArea, req.getRefArea()) + .set(StationEntity::getRemark, req.getRemark()) + .set(StationEntity::getPic, req.getPic()) + .set(StationEntity::getContact, req.getContact()) + .set(StationEntity::getContactor, req.getContactor()) + .set(StationEntity::getAddress, req.getAddress()) + .set(StationEntity::getCompany, req.getCompany()) + .set(StationEntity::getCreateDept, req.getCreateDept()) + .set(StationEntity::getServeType, req.getServeType()) + .set(StationEntity::getLimitWaterLevel, req.getLimitWaterLevel()) + .eq(StationEntity::getId, req.getId())); + } + + + @Override public List getInRefDept(List depeIds, String stationType, List types) { return this.baseMapper.selectInRefDept(depeIds, stationType, types); } @@ -515,7 +545,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; } @@ -524,7 +567,7 @@ public class StationServiceImpl extends BaseServiceImpl