|
@@ -104,13 +104,12 @@ public class KwsAlarmService {
|
|
|
// list.add(vo);
|
|
// list.add(vo);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- List<AlarmLogThresholdVO> list1 = alarmMapper.selectDetailList(null, null);
|
|
|
|
|
- int count = CollectionUtils.isEmpty(list1) ? 0 : list1.size();
|
|
|
|
|
- info.setPageNum(query.getPage());
|
|
|
|
|
- info.setPageSize(query.getPageSize());
|
|
|
|
|
- info.setTotal(CollectionUtils.isEmpty(list1) ? 0 : list1.size());
|
|
|
|
|
- int totalPages = (int) Math.ceil((double) count / query.getPageSize());
|
|
|
|
|
- info.setPages(totalPages);
|
|
|
|
|
|
|
+// int count= alarmMapper.selectDetailCount();
|
|
|
|
|
+// info.setPageNum(query.getPage());
|
|
|
|
|
+// info.setPageSize(query.getPageSize());
|
|
|
|
|
+// info.setTotal(count);
|
|
|
|
|
+// int totalPages = (int) Math.ceil((double) count / query.getPageSize());
|
|
|
|
|
+// info.setPages(totalPages);
|
|
|
return PageRes.build(info, list);
|
|
return PageRes.build(info, list);
|
|
|
}
|
|
}
|
|
|
|
|
|