修改分页插件

whepi-web/src/main/java/com/bofeng/excel/ExcelUtils.java

@@ -244,15 +244,15 @@ public class ExcelUtils {
     /**
      * 从当前请求中获取分页方法和内容
      */
-    public static PageDb parsePagination() {
-        HttpServletRequest request = currentRequest();
-        HttpParameterParser parser = HttpParameterParser.newInstance(request);
-        int page = parser.getIntValue("page", 1);
-        int start = parser.getIntValue("start", 0);
-        int limit = parser.getIntValue("limit", 10);
-
-        return new PageDb(page, limit);
-    }
+//    public static PageDb parsePagination() {
+//        HttpServletRequest request = currentRequest();
+//        HttpParameterParser parser = HttpParameterParser.newInstance(request);
+//        int page = parser.getIntValue("page", 1);
+//        int start = parser.getIntValue("start", 0);
+//        int limit = parser.getIntValue("limit", 10);
+//
+//        return new PageDb(page, limit);
+//    }
 
 
     /**

yvan-platform/src/main/java/com/yvan/mvc/PageDbResolver.java

@@ -22,13 +22,15 @@ public class PageDbResolver implements HandlerMethodArgumentResolver {
         //offset=20 limit=10 page=3 rows=10
         //offset=60 limit=10 page=7 rows=10
 
-        Object arg = webRequest.getParameter("offset");
-        if (arg == null) {
-            return new PageDb(false);
-        }
+//        Object arg = webRequest.getParameter("offset");
+//        if (arg == null) {
+//            return new PageDb(false);
+//        }
+//        int limit = Conv.NI(webRequest.getParameter("limit"), 10);
+//        int page = Conv.NI(arg, 1)/limit + 1;
 
-        int limit = Conv.NI(webRequest.getParameter("limit"), 10);
-        int page = Conv.NI(arg, 1)/limit + 1;
+        int limit = Conv.NI(webRequest.getParameter("rows"), 10);
+        int page = Integer.parseInt(webRequest.getParameter("page"));
         return new PageDb(page, limit);
     }
 }

yvan-platform/src/main/java/com/yvan/springmvc/HttpUtils.java

@@ -144,15 +144,15 @@ public class HttpUtils {
     /**
      * 从当前请求中获取分页方法和内容
      */
-    public static PageDb parsePagination() {
-        HttpServletRequest request = currentRequest();
-        HttpParameterParser parser = HttpParameterParser.newInstance(request);
-        int page = parser.getIntValue("page", 1);
-        int start = parser.getIntValue("start", 0);
-        int limit = parser.getIntValue("limit", 10);
-
-        return new PageDb(page, limit);
-    }
+//    public static PageDb parsePagination() {
+//        HttpServletRequest request = currentRequest();
+//        HttpParameterParser parser = HttpParameterParser.newInstance(request);
+//        int page = parser.getIntValue("page", 1);
+//        int start = parser.getIntValue("start", 0);
+//        int limit = parser.getIntValue("limit", 10);
+//
+//        return new PageDb(page, limit);
+//    }
 
 
     /**