diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml index c0b6462..dfa346b 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml @@ -19,6 +19,7 @@ left join type ty on ty.id = dinfo.type_id WHERE dinfo.flag != 1 AND basic_monitoring_asset.flag != 1 + AND (dinfo.device_id LIKE '%\_85' or dinfo.device_id LIKE '%\_85_9003' or dinfo.device_id LIKE '%\_131_5') AND basic_space.flag != 1 AND basic_floor.flag != 1 AND basic_building.flag != 1 AND basic_building.building_id = #{buildingId} diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/FavoritedDeviceServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/FavoritedDeviceServiceImpl.java index 14dd629..433ef4e 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/FavoritedDeviceServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/FavoritedDeviceServiceImpl.java @@ -125,7 +125,18 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService { resultList.add(data); } - return new PageInfo<>(resultList); + // -------------------- 保留 PageHelper 分页信息 -------------------- + PageInfo pageInfo = new PageInfo<>(favoritedDeviceVOList); + PageInfo resultPageInfo = new PageInfo<>(); + resultPageInfo.setList(resultList); + resultPageInfo.setPageNum(pageInfo.getPageNum()); + resultPageInfo.setPageSize(pageInfo.getPageSize()); + resultPageInfo.setTotal(pageInfo.getTotal()); + resultPageInfo.setPages(pageInfo.getPages()); + resultPageInfo.setHasNextPage(pageInfo.isHasNextPage()); + resultPageInfo.setHasPreviousPage(pageInfo.isHasPreviousPage()); + + return resultPageInfo; } private Map buildAlarmDataMap(Long companyId, Integer languageType, List deviceIds) {