fix #177

Author: xlorne

pom.xml

@@ -15,7 +15,7 @@
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>2.10.29</version>
+    <version>2.10.30</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>

springboot-starter-data-authorization/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.29</version>
+        <version>2.10.30</version>
     </parent>
 
     <name>springboot-starter-data-authorization</name>

springboot-starter-data-fast/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.29</version>
+        <version>2.10.30</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

springboot-starter-flow/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.29</version>
+        <version>2.10.30</version>
     </parent>
 
     <name>springboot-starter-flow</name>

springboot-starter-security/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>2.10.29</version>
+        <version>2.10.30</version>
     </parent>
 
     <artifactId>springboot-starter-security</artifactId>

springboot-starter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.springboot</groupId>
         <artifactId>springboot-parent</artifactId>
-        <version>2.10.29</version>
+        <version>2.10.30</version>
     </parent>
     <artifactId>springboot-starter</artifactId>
 

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

@@ -0,0 +1,30 @@
+package com.codingapi.springboot.framework.context;
+
+import com.codingapi.springboot.framework.dto.ICurrentOffset;
+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/context/ICurrentPageOffset.java

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

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

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

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

@@ -1,13 +1,14 @@
 package com.codingapi.springboot.framework.dto.request;
 
+import com.codingapi.springboot.framework.context.CurrentPageOffsetContext;
+import com.codingapi.springboot.framework.dto.ICurrentOffset;
 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
-    @Setter
     private int current;
 
     @Setter
@@ -32,6 +33,10 @@ public PageRequest() {
         this(0, 20, Sort.unsorted());
     }
 
+    public void setCurrent(int current) {
+        this.current = CurrentPageOffsetContext.getInstance().getCurrentPage(this,current);
+    }
+
     public String getStringFilter(String key) {
         return requestFilter.getStringFilter(key);
     }