|
@@ -69,8 +69,15 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<MonitorDeviceListVO> monitorDeviceList(String siteName) {
|
|
|
- List<MonitorDeviceListVO> monitorDeviceList = baseMapper.monitorDeviceList(siteName);
|
|
|
- return monitorDeviceList;
|
|
|
+ public CommonPage<MonitorDeviceListVO> monitorDeviceList(String siteName ,Integer size,Integer current) {
|
|
|
+ List<MonitorDeviceListVO> monitorDeviceListOne = baseMapper.monitorDeviceList(siteName,null,0);
|
|
|
+ Integer total = 0;
|
|
|
+ if (monitorDeviceListOne.size()>0){
|
|
|
+ total = monitorDeviceListOne.size();
|
|
|
+ }
|
|
|
+ IPage<DeviceAttribute> page = new Page<DeviceAttribute>(current, size);
|
|
|
+ List<MonitorDeviceListVO> monitorDeviceList = baseMapper.monitorDeviceList(siteName,0,size);
|
|
|
+// return monitorDeviceList;
|
|
|
+ return new CommonPage<>(monitorDeviceList, total, page.getSize(),page.getCurrent());
|
|
|
}
|
|
|
}
|