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 8ddd814..65c45d0 100644 --- a/boot-service/src/main/java/com/xwbing/demo/demo.java +++ b/boot-service/src/main/java/com/xwbing/demo/demo.java @@ -1,6 +1,6 @@ package com.xwbing.demo; -import java.util.concurrent.ExecutionException; +import com.alibaba.fastjson.JSONObject; /** * 项目名称: boot-module-demo @@ -9,8 +9,9 @@ import java.util.concurrent.ExecutionException; * 说明: 测试用 */ public class demo { - public static void main(String[] args) throws ExecutionException, InterruptedException { - int i = "222".compareTo("222"); - System.out.println(i); + public static void main(String[] args) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("aa", null); + System.out.println(jsonObject); } } 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 221541e..2a3322b 100644 --- a/boot-service/src/main/java/com/xwbing/util/PageUtil.java +++ b/boot-service/src/main/java/com/xwbing/util/PageUtil.java @@ -1,9 +1,8 @@ package com.xwbing.util; -import com.alibaba.fastjson.JSONArray; - import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -11,18 +10,16 @@ import java.util.Map; * 说明: 列表分页工具类 */ public class PageUtil { - private int start; - - public static Map page(JSONArray array, int currentPage, int pageSize) { + public static Map page(List list, int currentPage, int pageSize) { Map pageMap = new HashMap<>(); - int size = array.size(); + int size = list.size(); pageMap.put("count", size); int start = (currentPage - 1) * pageSize; if (start >= size) { pageMap.put("data", Collections.emptyList()); } - int end = pageSize * currentPage>size?size:pageSize * currentPage; - pageMap.put("data", array.subList(start, end)); + int end = pageSize * currentPage > size ? size : pageSize * currentPage; + pageMap.put("data", list.subList(start, end)); int totalPage = size % pageSize == 0 ? size / pageSize : size / pageSize + 1; pageMap.put("totalPage", totalPage); return pageMap;