diff --git a/boot-service/src/main/java/com/xwbing/demo/demo.java b/boot-service/src/main/java/com/xwbing/demo/demo.java index 5380a2e..8ddd814 100644 --- a/boot-service/src/main/java/com/xwbing/demo/demo.java +++ b/boot-service/src/main/java/com/xwbing/demo/demo.java @@ -10,5 +10,7 @@ import java.util.concurrent.ExecutionException; */ public class demo { public static void main(String[] args) throws ExecutionException, InterruptedException { - int i = "222".compareTo("11111"); + int i = "222".compareTo("222"); System.out.println(i); + } +} diff --git a/boot-service/src/main/java/com/xwbing/util/PageUtil.java b/boot-service/src/main/java/com/xwbing/util/PageUtil.java index 305b055..221541e 100644 --- a/boot-service/src/main/java/com/xwbing/util/PageUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/PageUtil.java @@ -11,20 +11,18 @@ import java.util.Map; * 说明: 列表分页工具类 */ public class PageUtil { + private int start; + public static Map page(JSONArray array, int currentPage, int pageSize) { Map pageMap = new HashMap<>(); int size = array.size(); pageMap.put("count", size); int start = (currentPage - 1) * pageSize; - int end = pageSize * currentPage; - if (start >= end || start >= size) { + if (start >= size) { pageMap.put("data", Collections.emptyList()); - } else { - if (start < size && end > size) { - end = size; - } - pageMap.put("data", array.subList(start, end)); } + int end = pageSize * currentPage>size?size:pageSize * currentPage; + pageMap.put("data", array.subList(start, end)); int totalPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; pageMap.put("totalPage", totalPage); return pageMap;