|
@@ -75,9 +75,8 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
|
|
|
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());
|
|
|
+ Integer startCurrent = (current - 1) * size;
|
|
|
+ List<MonitorDeviceListVO> monitorDeviceList = baseMapper.monitorDeviceList(siteName,startCurrent,size);
|
|
|
+ return new CommonPage<>(monitorDeviceList, total, size,current);
|
|
|
}
|
|
|
}
|