fix #177

Author: xlorne

springboot-starter/src/main/java/com/codingapi/springboot/framework/context/CurrentPageOffsetContext.java

@@ -0,0 +1,7 @@
+package com.codingapi.springboot.framework.dto.offset;
+
+public interface ICurrentOffset {
+
+    void setCurrent(int  current);
+
+}

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/offset/ICurrentOffset.java

@@ -0,0 +1,7 @@
+package com.codingapi.springboot.framework.dto.offset;
+
+public interface ICurrentPageOffset {
+
+    int getCurrentPage(ICurrentOffset target, int current);
+
+}

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/offset/ICurrentPageOffset.java

@@ -0,0 +1,32 @@
+package com.codingapi.springboot.framework.dto.offset.context;
+
+
+import com.codingapi.springboot.framework.dto.offset.ICurrentOffset;
+import com.codingapi.springboot.framework.dto.offset.ICurrentPageOffset;
+import com.codingapi.springboot.framework.dto.request.PageRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+public class CurrentPageOffsetContext implements ICurrentPageOffset {
+
+    @Getter
+    private static final CurrentPageOffsetContext instance = new CurrentPageOffsetContext();
+
+    private CurrentPageOffsetContext(){}
+
+    @Setter
+    private ICurrentPageOffset currentPageOffset = new ICurrentPageOffset(){
+        @Override
+        public int getCurrentPage(ICurrentOffset target, int current) {
+            if(target instanceof PageRequest){
+                return current;
+            }
+            return current - 1;
+        }
+    };
+
+    public int getCurrentPage(ICurrentOffset target, int current) {
+        return currentPageOffset.getCurrentPage(target,current);
+    }
+
+}

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/offset/context/CurrentPageOffsetContext.java

@@ -1,11 +1,12 @@
 package com.codingapi.springboot.framework.dto.request;
 
-import com.codingapi.springboot.framework.context.CurrentPageOffsetContext;
+import com.codingapi.springboot.framework.dto.offset.ICurrentOffset;
+import com.codingapi.springboot.framework.dto.offset.context.CurrentPageOffsetContext;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.data.domain.Sort;
 
-public class PageRequest extends org.springframework.data.domain.PageRequest {
+public class PageRequest extends org.springframework.data.domain.PageRequest implements ICurrentOffset {
 
     @Getter
     private int current;
@@ -33,7 +34,7 @@ public PageRequest() {
     }
 
     public void setCurrent(int current) {
-        this.current = CurrentPageOffsetContext.getInstance().getCurrentPage(current);
+        this.current = CurrentPageOffsetContext.getInstance().getCurrentPage(this,current);
     }
 
     public String getStringFilter(String key) {

springboot-starter/src/main/java/com/codingapi/springboot/framework/dto/request/PageRequest.java

@@ -3,7 +3,8 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.codingapi.springboot.framework.context.CurrentPageOffsetContext;
+import com.codingapi.springboot.framework.dto.offset.ICurrentOffset;
+import com.codingapi.springboot.framework.dto.offset.context.CurrentPageOffsetContext;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.Getter;
 import lombok.Setter;
@@ -21,7 +22,7 @@
 /**
  * HttpServletRequest 请求参数解析成 PageRequest对象
  */
-public class SearchRequest {
+public class SearchRequest implements ICurrentOffset {
 
     @Getter
     private int current;
@@ -41,7 +42,7 @@ public SearchRequest() {
     }
 
     public void setCurrent(int current) {
-        this.current = CurrentPageOffsetContext.getInstance().getCurrentPage(current);
+        this.current = CurrentPageOffsetContext.getInstance().getCurrentPage(this,current);
         this.removeKeys.add("current");
     }