Browse Source

一体化综合展示地图接口

hym 3 years ago
parent
commit
fbb01d8f5e

+ 6 - 1
smart-city-platform/src/main/java/com/bz/smart_city/service/sync/PlatformAapiServiceImpl.java

@@ -134,6 +134,9 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
             latitudeMax = northEastDouble[1];
         }
         List<ProgramItem>programItemDtos = userMapper.findAuthByTenantId(queryDeviceMonitorDto.getTenantId());
+        if(programItemDtos.isEmpty()){
+            return new ArrayList<>();
+        }
         List<BuildingInfoListDto>buildingInfoListDtos=buildingMapper.getBuildingStatistics(siteList, programItemDtos, null, null, null,
                 queryDeviceMonitorDto.getProvince(), queryDeviceMonitorDto.getCity(), queryDeviceMonitorDto.getRegion(),
                 queryDeviceMonitorDto.getCommunity(),queryDeviceMonitorDto.getType(),
@@ -144,8 +147,10 @@ public class PlatformAapiServiceImpl implements PlatformAapiService {
 
     @Override
     public Pagination<DeviceDto> getDeviceListInformation(QueryDeviceMonitorDto queryDeviceMonitorDto) {
-
         List<ProgramItem>programItemDtos = userMapper.findAuthByTenantId(queryDeviceMonitorDto.getTenantId());
+        if(programItemDtos.isEmpty()){
+            return new Pagination<>();
+        }
         PageHelper.startPage(queryDeviceMonitorDto.getPage(), queryDeviceMonitorDto.getSize());
         List<DeviceDto> list =deviceMapper.findDevicesOnTheMap(queryDeviceMonitorDto,programItemDtos);
         return new Pagination<>(list);