Sumuxi/fastbee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260507:项目版本梳理

Browse Source
This commit is contained in:
George 2026-05-07 21:29:18 +08:00
parent d4b147b78c
commit 584da2867b
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysRoleController.java
View File

@ -68,8 +68,8 @@ public class SysRoleController extends BaseController {
tableDataInfo.setRows(list); tableDataInfo.setRows(list);
tableDataInfo.setTotal(0); tableDataInfo.setTotal(0);
} else { } else {
List list1 = CollectionUtils.startPage(list, pageNum, pageSize); List<SysRole> result = CollectionUtils.startPage(list, pageNum, pageSize);
tableDataInfo.setRows(list1); tableDataInfo.setRows(result);
tableDataInfo.setTotal(new PageInfo(list).getTotal()); tableDataInfo.setTotal(new PageInfo(list).getTotal());
} }
return tableDataInfo; return tableDataInfo;

9
fastbee-common/src/main/java/com/fastbee/common/utils/collection/CollectionUtils.java
View File

@ -233,16 +233,15 @@ public class CollectionUtils {
* @param pageSize 每页多少条数据 * @param pageSize 每页多少条数据
* @return * @return
*/ */
public static List startPage(List list, Integer pageNum, public static <T> List<T> startPage(List<T> list, Integer pageNum, Integer pageSize) {
Integer pageSize) {
if (list == null) { if (list == null) {
return null; return null;
} }
if (list.size() == 0) { if (list.isEmpty()) {
return null; return null;
} }
Integer count = list.size(); // 记录总数 Integer count = list.size(); // 记录总数
Integer pageCount = 0; // 页数 int pageCount = 0; // 页数
if (count % pageSize == 0) { if (count % pageSize == 0) {
pageCount = count / pageSize; pageCount = count / pageSize;
} else { } else {
@ -257,7 +256,7 @@ public class CollectionUtils {
fromIndex = (pageNum - 1) * pageSize; fromIndex = (pageNum - 1) * pageSize;
toIndex = count; toIndex = count;
} }
List pageList = list.subList(fromIndex, toIndex); List<T> pageList = list.subList(fromIndex, toIndex);
return pageList; return pageList;
} }
} }

2
fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java
View File

@ -450,7 +450,7 @@ public class DeviceController extends BaseController {
list2 = list1; list2 = list1;
} }
if (CollectionUtils.isNotEmpty(list2)) { if (CollectionUtils.isNotEmpty(list2)) {
List resultList = com.fastbee.common.utils.collection.CollectionUtils.startPage(list2, pageNum, pageSize); List<ThingsModelDTO> resultList = com.fastbee.common.utils.collection.CollectionUtils.startPage(list2, pageNum, pageSize);
rspData.setRows(resultList); rspData.setRows(resultList);
} else { } else {
rspData.setRows(new ArrayList<>()); rspData.setRows(new ArrayList<>());