fix PageRequest bug

Author: xlorne

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>com.codingapi.springboot</groupId>
 	<artifactId>springboot-parent</artifactId>
-	<version>0.1.1</version>
+	<version>0.1.2</version>
 
 	<url>https://github.com/codingapi/springboot-framewrok</url>
 	<name>springboot-parent</name>

springboot-example/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.codingapi.springboot</groupId>
 		<artifactId>springboot-parent</artifactId>
-		<version>0.1.1</version>
+		<version>0.1.2</version>
 	</parent>
 	<artifactId>springboot-example</artifactId>
 

springboot-starter-data-permission/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>0.1.1</version>
+        <version>0.1.2</version>
     </parent>
 
 

springboot-starter-security-jwt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>0.1.1</version>
+        <version>0.1.2</version>
     </parent>
 
     <artifactId>springboot-starter-security-jwt</artifactId>

springboot-starter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
 		<groupId>com.codingapi.springboot</groupId>
 		<artifactId>springboot-parent</artifactId>
-		<version>0.1.1</version>
+		<version>0.1.2</version>
 	</parent>
 	<artifactId>springboot-starter</artifactId>
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/AutoConfiguration.java

@@ -1,9 +1,18 @@
 package com.codingapi.springboot.framework;
 
+import com.codingapi.springboot.framework.properties.BootProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class AutoConfiguration {
 
 
+    @Bean
+    @ConfigurationProperties(prefix = "codingapi.boot")
+    public BootProperties bootProperties(){
+        return new BootProperties();
+    }
+
 }

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

@@ -1,25 +1,165 @@
 package com.codingapi.springboot.framework.dto.request;
 
-import lombok.Getter;
-import lombok.Setter;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 
-@Setter
-@Getter
+import java.util.Optional;
+
 public class PageRequest extends org.springframework.data.domain.PageRequest {
 
     private int current;
     private int pageSize;
 
+    public final static String CURRENT_FIX_VALUE = "CURRENT_FIX_VALUE";
+
+    private org.springframework.data.domain.PageRequest pageRequest;
+
     public PageRequest(int current, int pageSize, Sort sort) {
         super(current, pageSize, sort);
         this.current = current;
         this.pageSize = pageSize;
+        pageRequest = PageRequest.of(current, pageSize, sort);
     }
 
     public PageRequest() {
         this(0,20,Sort.unsorted());
     }
 
+    private void initPage(){
+        int fixValue=0;
+        try {
+            fixValue = Integer.parseInt(System.getProperty(CURRENT_FIX_VALUE));
+        }catch (Exception e){}
+        pageRequest = PageRequest.of(current-fixValue, pageSize, pageRequest.getSort());
+    }
+
+    public int getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(int current) {
+        this.current = current;
+        this.initPage();
+    }
+
+    @Override
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+        this.initPage();
+    }
+
+    public static org.springframework.data.domain.PageRequest of(int page, int size) {
+        return org.springframework.data.domain.PageRequest.of(page, size);
+    }
+
+    public static org.springframework.data.domain.PageRequest of(int page, int size, Sort sort) {
+        return org.springframework.data.domain.PageRequest.of(page, size, sort);
+    }
+
+    public static org.springframework.data.domain.PageRequest of(int page, int size, Sort.Direction direction, String... properties) {
+        return org.springframework.data.domain.PageRequest.of(page, size, direction, properties);
+    }
+
+    public static org.springframework.data.domain.PageRequest ofSize(int pageSize) {
+        return org.springframework.data.domain.PageRequest.ofSize(pageSize);
+    }
+
+    @Override
+    public Sort getSort() {
+        return pageRequest.getSort();
+    }
+
+    @Override
+    public org.springframework.data.domain.PageRequest next() {
+        return pageRequest.next();
+    }
+
+    @Override
+    public org.springframework.data.domain.PageRequest previous() {
+        return pageRequest.previous();
+    }
+
+    @Override
+    public org.springframework.data.domain.PageRequest first() {
+        return pageRequest.first();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return pageRequest.equals(obj);
+    }
+
+    @Override
+    public org.springframework.data.domain.PageRequest withPage(int pageNumber) {
+        return pageRequest.withPage(pageNumber);
+    }
+
+    @Override
+    public org.springframework.data.domain.PageRequest withSort(Sort.Direction direction, String... properties) {
+        return pageRequest.withSort(direction, properties);
+    }
+
+    @Override
+    public org.springframework.data.domain.PageRequest withSort(Sort sort) {
+        return pageRequest.withSort(sort);
+    }
+
+    @Override
+    public int hashCode() {
+        return pageRequest.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return pageRequest.toString();
+    }
+
+    @Override
+    public int getPageNumber() {
+        return pageRequest.getPageNumber();
+    }
+
+    @Override
+    public long getOffset() {
+        return pageRequest.getOffset();
+    }
+
+    @Override
+    public boolean hasPrevious() {
+        return pageRequest.hasPrevious();
+    }
+
+    @Override
+    public Pageable previousOrFirst() {
+        return pageRequest.previousOrFirst();
+    }
+
+    public static Pageable unpaged() {
+        return Pageable.unpaged();
+    }
+
+    @Override
+    public boolean isPaged() {
+        return pageRequest.isPaged();
+    }
+
+    @Override
+    public boolean isUnpaged() {
+        return pageRequest.isUnpaged();
+    }
+
+    @Override
+    public Sort getSortOr(Sort sort) {
+        return pageRequest.getSortOr(sort);
+    }
+
+    @Override
+    public Optional<Pageable> toOptional() {
+        return pageRequest.toOptional();
+    }
 }
 

springboot-starter/src/main/java/com/codingapi/springboot/framework/properties/BootProperties.java

@@ -0,0 +1,22 @@
+package com.codingapi.springboot.framework.properties;
+
+import com.codingapi.springboot.framework.dto.request.PageRequest;
+
+public class BootProperties {
+
+    private int pageCurrentFixValue = 1;
+
+
+    public int getPageCurrentFixValue() {
+        return pageCurrentFixValue;
+    }
+
+    public void setPageCurrentFixValue(int pageCurrentFixValue) {
+        this.pageCurrentFixValue = pageCurrentFixValue;
+        System.setProperty(PageRequest.CURRENT_FIX_VALUE,String.valueOf(pageCurrentFixValue));
+    }
+
+    public BootProperties() {
+        System.setProperty(PageRequest.CURRENT_FIX_VALUE,String.valueOf(pageCurrentFixValue));
+    }
+}