|
|
@@ -313,7 +313,7 @@ public class ItMonitorServiceImpl implements ItMonitorService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days) {
|
|
|
+ public IPage<ItMonitorData> getDataByIds(Integer pageNo, Integer pageSize, Long resourceId, Long itemId, Integer days, Boolean desc) {
|
|
|
Page<ItMonitorData> page = new Page<>(pageNo, pageSize);
|
|
|
QueryWrapper<ItMonitorData> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("resource_id", resourceId);
|
|
|
@@ -322,6 +322,9 @@ public class ItMonitorServiceImpl implements ItMonitorService {
|
|
|
calendar.setTime(new Date());
|
|
|
calendar.add(Calendar.DATE, days * -1);
|
|
|
queryWrapper.ge("record_time", calendar.getTime());
|
|
|
+ if (desc) {
|
|
|
+ queryWrapper.orderByDesc("record_time");
|
|
|
+ }
|
|
|
return itMonitorDataMapper.selectPage(page, queryWrapper);
|
|
|
}
|
|
|
|