diff --git a/src/main/java/com/zteits/irain/portal/web/govclouds/RealTimeInfoController.java b/src/main/java/com/zteits/irain/portal/web/govclouds/RealTimeInfoController.java index c1cecca..d1d5f2e 100644 --- a/src/main/java/com/zteits/irain/portal/web/govclouds/RealTimeInfoController.java +++ b/src/main/java/com/zteits/irain/portal/web/govclouds/RealTimeInfoController.java @@ -117,34 +117,34 @@ public class RealTimeInfoController { // 获取所有空闲车位为零的停车场信息列表 List zeroBerthplDTOList = plBerthsService.getZeroBerthParkinglotList(request); - List warningInfoList = new ArrayList(); - logger.debug("zeroBerthplDTOList---->" + JSON.toJSONString(zeroBerthplDTOList, false)); - - for (ZeroBerthParkingLotDTO zeroBerthpl: zeroBerthplDTOList) { - - List plgInfoList = ParkingLotGeoCacheUtil.queryParkLotsWithDistanceAndCoordinateByAsc( - LonLatTypeEnum.LON_LAT_TYPE_1, zeroBerthpl.getLongitude(), zeroBerthpl.getLatitude(), 5000D, 50L); + if (null != zeroBerthplDTOList) { + logger.debug("zeroBerthplDTOList---->" + JSON.toJSONString(zeroBerthplDTOList, false)); - int notZeroBerthPlCount = 0;// 非零空闲泊位数的停车场个数 - if (null != plgInfoList && !CollectionUtils.isEmpty(plgInfoList)) { - WarningInfoDTO warningInfoDTO = new WarningInfoDTO(); - for (ParkinglotAndGeoInfoDTO ParkinglotAndGeoInfoDTO: plgInfoList) { - if (0 < ParkFreeBerthsCacheUtil.getFreeBerthsByPlNo(ParkinglotAndGeoInfoDTO.getPlNo())) - { - notZeroBerthPlCount += 1; - } - } + for (ZeroBerthParkingLotDTO zeroBerthpl: zeroBerthplDTOList) { + + List plgInfoList = ParkingLotGeoCacheUtil.queryParkLotsWithDistanceAndCoordinateByAsc( + LonLatTypeEnum.LON_LAT_TYPE_1, zeroBerthpl.getLongitude(), zeroBerthpl.getLatitude(), 5000D, 50L); - if (0 < notZeroBerthPlCount) { - warningInfoDTO.setParkingLotName(zeroBerthpl.getParkingLotName()); - warningInfoDTO.setPlCountHavingFreeBerth(notZeroBerthPlCount); + int notZeroBerthPlCount = 0;// 非零空闲泊位数的停车场个数 + if (null != plgInfoList && !CollectionUtils.isEmpty(plgInfoList)) { + WarningInfoDTO warningInfoDTO = new WarningInfoDTO(); + for (ParkinglotAndGeoInfoDTO ParkinglotAndGeoInfoDTO: plgInfoList) { + if (0 < ParkFreeBerthsCacheUtil.getFreeBerthsByPlNo(ParkinglotAndGeoInfoDTO.getPlNo())) + { + notZeroBerthPlCount += 1; + } + } - warningInfoList.add(warningInfoDTO); + if (0 < notZeroBerthPlCount) { + warningInfoDTO.setParkingLotName(zeroBerthpl.getParkingLotName()); + warningInfoDTO.setPlCountHavingFreeBerth(notZeroBerthPlCount); + + warningInfoList.add(warningInfoDTO); + } } } } - return new BizResultVO<>(new BizResult<>(warningInfoList)) ; } }