calculate(int startRow)

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/id/UUIDGenerator.java

@@ -22,7 +22,6 @@ import java.util.UUID;
 public class UUIDGenerator implements IdentifierGenerator{
 
 	public String generate(Object object) {
-		// TODO Auto-generated method stub
 		return UUID.randomUUID().toString().toLowerCase();
 	}
 

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/IJpaBaseMapper.java

@@ -33,7 +33,7 @@ public interface IJpaBaseMapper<T> {
 	@SelectProvider(type = MapperSqlProvider.class, method = "query")
 	public List<T> query(T entity);
 	
-	//TODO follow function for Query
+	//follow function for Query
 	public List<T> queryPageResults(T entity);
 
 	@SelectProvider(type = MapperSqlProvider.class, method = "queryPageResultsCount")
@@ -51,7 +51,7 @@ public interface IJpaBaseMapper<T> {
 	public T get(@Param ("entityClass")Class<?> entityClass,@Param ("id") String id);
 	
 	
-	//TODO follow function for insert update and delete
+	//follow function for insert update and delete
 	@InsertProvider(type = MapperSqlProvider.class, method = "insert")
 	public Integer insert(T entity);
 	

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/JpaBaseService.java

@@ -68,7 +68,6 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 	@JsonIgnore
 	private IJpaBaseMapper<T> mapper = null;
 	
-	//TODO 
 	public JpaBaseService() {}
 	
 	/**
@@ -98,7 +97,7 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 		this.mapperClass = mapperClass;
 	}
 
-	//TODO get or set mapper
+	//get or set mapper
 	/**
 	 * Load Mapper from spring container by mapperClass as bean id
 	 * @return IBaseMapper
@@ -123,7 +122,7 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 		this.mapper = mapper;
 	}
 
-	//TODO follow function for Query
+	//follow function for Query
 	
 	/**
 	 * query page list entity by entity 
@@ -150,7 +149,7 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 	}
 	
 	
-	//TODO follow function for Query
+	//follow function for Query
 	
 	/**
 	 * query page list entity by entity 
@@ -272,7 +271,7 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 		return null;
 	}
 	
-	//TODO follow function for insert update and delete
+	//follow function for insert update and delete
 	/**
 	 * insert new entity
 	 * @param entity
@@ -363,7 +362,6 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 		return false;
 	}
 	
-	//TODO follow function for complex insert and delete
 	/**
 	 * batch insert entity
 	 * @param listEntity
@@ -415,7 +413,7 @@ public  class  JpaBaseService <T extends JpaBaseEntity> {
 	}
 
 	
-	//TODO follow is  for query grid paging
+	//follow is  for query grid paging
 	/**
 	 * parse Object Count to Integer
 	 * @param totalCount

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/JpaPagination.java

@@ -101,6 +101,7 @@ public class JpaPagination {
 		this.pageSize = rows;
 		calculate();
 	}
+	
 	@JsonIgnore
 	public int getPageNumber() {
 		return pageNumber;
@@ -110,6 +111,7 @@ public class JpaPagination {
 		this.pageNumber = pageNumber;
 		calculate();
 	}
+	
 	@JsonIgnore
 	public String getSidx() {
 		return sidx;
@@ -135,8 +137,10 @@ public class JpaPagination {
 	}
 
 	public void setStartRow(int startRow) {
-		this.startRow = startRow;
+		this.startRow 	= startRow;
+		
 	}
+	
 	@JsonIgnore
 	public int getEndRow() {
 		return endRow;
@@ -146,12 +150,25 @@ public class JpaPagination {
 		this.endRow = endRow;
 	}
 
+	public void calculate(int startRow) {
+		if(startRow <= pageSize) {
+			startRow = 0;
+			setPageNumber(1);
+		}else {
+			setPageNumber(startRow/pageSize + (startRow%pageSize == 0 ? 0 : 1));
+		}
+	}
+	
 	public void calculate() {
 		if (this.pageNumber >= 1 && this.pageSize > 0){
-				startRow = (this.pageNumber - 1) * this.pageSize;
-				endRow = startRow + this.pageSize;
-			}
+			startRow = (this.pageNumber - 1) * this.pageSize;
+			endRow = startRow + this.pageSize;
+		}else {
+			startRow = 0;
+			endRow	 = this.pageSize;
+		}
 	}
+	
 	@JsonIgnore
 	public int getPageSize() {
 		return pageSize;

mybatis-jpa-extra-core/src/main/java/org/apache/mybatis/jpa/persistence/provider/SqlProviderInsert.java

@@ -77,7 +77,7 @@ public class SqlProviderInsert <T extends JpaBaseEntity>{
 					}else if(generatedValue.strategy()==GenerationType.IDENTITY){
 						//skip
 					}else if(generatedValue.strategy()==GenerationType.TABLE){
-						//TODO
+						//skip
 					}
 				}else {
 					sql.VALUES(fieldColumnMapper.getColumnName(),"#{" + fieldColumnMapper.getFieldName() + "}");

mybatis-jpa-extra-core/src/test/java/org/apache/mybatis/jpa/test/MyBatisTestRunner.java

@@ -150,10 +150,11 @@ public class MyBatisTestRunner {
 		_logger.info("queryPageResults...");
 		 Students student=new Students();
 		 //student.setId("af04d610-6092-481e-9558-30bd63ef783c");
-		 student.setStdGender("M");
+		 //student.setStdGender("M");
 		 //student.setStdMajor(政治");
 		 student.setPageSize(10);
-		 student.setPageNumber(1);
+		 //student.setPageNumber(2);
+		 student.calculate(21);
 		 List<Students> allListStudents = 
 				 service.queryPageResults(student).getRows();
 		 for (Students s : allListStudents) {

mybatis-jpa-extra-core/src/test/java/org/apache/mybatis/jpa/test/SerialGeneratorTest.java

@@ -27,7 +27,6 @@ public class SerialGeneratorTest {
 	private static final Logger _logger = LoggerFactory.getLogger(SerialGeneratorTest.class);
 	@Test
 	public  void generator() {
-		// TODO Auto-generated method stub
 		SerialGenerator serialGenerator=new SerialGenerator();
 		_logger.info(serialGenerator.generate(""));
 		_logger.info(MacAddress.getAllHostMacAddress());

mybatis-jpa-extra-core/src/test/java/org/apache/mybatis/jpa/test/SnowFlakeIdGeneratorTest.java

@@ -18,7 +18,6 @@
 package org.apache.mybatis.jpa.test;
 
 import org.apache.mybatis.jpa.id.SnowFlakeIdGenerator;
-import org.apache.mybatis.jpa.id.UUIDHexGenerator;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,7 +26,6 @@ public class SnowFlakeIdGeneratorTest {
 	private static final Logger _logger = LoggerFactory.getLogger(SnowFlakeIdGeneratorTest.class);
 	@Test
 	public  void generator() {
-		// TODO Auto-generated method stub
 		SnowFlakeIdGenerator uhg=new SnowFlakeIdGenerator();
 		_logger.info(uhg.generate(""));
 		_logger.info(uhg.generate(""));

mybatis-jpa-extra-core/src/test/java/org/apache/mybatis/jpa/test/UUIDHexGeneratorTest.java

@@ -26,7 +26,6 @@ public class UUIDHexGeneratorTest {
 	private static final Logger _logger = LoggerFactory.getLogger(UUIDHexGeneratorTest.class);
 	@Test
 	public  void generator() {
-		// TODO Auto-generated method stub
 		UUIDHexGenerator uhg=new UUIDHexGenerator();
 		_logger.info(uhg.generate(""));
 		_logger.info(uhg.generate(""));

mybatis-jpa-extra-core/src/test/java/org/apache/mybatis/jpa/test/dao/service/StudentsService.java

@@ -36,7 +36,6 @@ public class StudentsService extends JpaBaseService<Students> {
 	 */
 	@Override
 	public StudentsMapper getMapper() {
-		// TODO Auto-generated method stub
 		return (StudentsMapper)super.getMapper();
 	}
 	

mybatis-jpa-extra-spring-boot-starter/src/test/java/org/apache/mybatis/jpa/test/MybatisJpaConfig.java

@@ -21,7 +21,6 @@ import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 
 import javax.sql.DataSource;
 
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

mybatis-jpa-extra-test/src/main/java/org/apache/mybatis/jpa/test/dao/service/StudentsService.java

@@ -36,7 +36,6 @@ public class StudentsService extends JpaBaseService<Students> {
 	 */
 	@Override
 	public StudentsMapper getMapper() {
-		// TODO Auto-generated method stub
 		return (StudentsMapper)super.getMapper();
 	}
 	

mybatis-jpa-extra-test/src/test/java/org/apache/mybatis/jpa/test/SerialGeneratorTest.java

@@ -27,7 +27,6 @@ public class SerialGeneratorTest {
 	private static final Logger _logger = LoggerFactory.getLogger(SerialGeneratorTest.class);
 	@Test
 	public  void generator() {
-		// TODO Auto-generated method stub
 		SerialGenerator serialGenerator=new SerialGenerator();
 		_logger.info(serialGenerator.generate(""));
 		_logger.info(MacAddress.getAllHostMacAddress());

mybatis-jpa-extra-test/src/test/java/org/apache/mybatis/jpa/test/UUIDHexGeneratorTest.java

@@ -26,7 +26,6 @@ public class UUIDHexGeneratorTest {
 	private static final Logger _logger = LoggerFactory.getLogger(UUIDHexGeneratorTest.class);
 	@Test
 	public  void generator() {
-		// TODO Auto-generated method stub
 		UUIDHexGenerator uhg=new UUIDHexGenerator();
 		_logger.info(uhg.generate(""));
 		_logger.info(uhg.generate(""));