feature: 使用 PageHelper 分页插件, 查询语句支持字段排序

Author: myoss

src/main/java/app/myoss/cloud/mybatis/repository/service/impl/BaseCrudServiceImpl.java

@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -966,9 +967,18 @@ protected void pageQuery(Page<T> result, T param, Map<String, Object> extraInfo,
 
     @Override
     public <DTO> Page<DTO> findPageByHelper(Page<DTO> condition) {
+        List<Order> orders = convertToOrders(condition.getSort());
+        String orderBy = null;
+        if (!CollectionUtils.isEmpty(orders)) {
+            StringJoiner stringJoiner = new StringJoiner(", ");
+            for (Order order : orders) {
+                stringJoiner.add(order.getProperty() + " " + order.getDirection().name());
+            }
+            orderBy = stringJoiner.toString();
+        }
         int pageNum = condition.getPageNum();
         int pageSize = condition.getPageSize();
-        com.github.pagehelper.Page<DTO> page = com.github.pagehelper.PageHelper.startPage(pageNum, pageSize)
+        com.github.pagehelper.Page<DTO> page = com.github.pagehelper.PageHelper.startPage(pageNum, pageSize, orderBy)
                 .doSelectPage(() -> pageHelperQuery(condition.getParam(), condition));
         Page<DTO> pageResult = new Page<>();
         pageResult.setTotalCount(Math.toIntExact(page.getTotal()))

src/main/java/app/myoss/cloud/mybatis/repository/v2/service/impl/BaseCrudServiceImpl.java

@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -802,9 +803,18 @@ protected void pageQuery(Page<T> result, T param, Map<String, Object> extraInfo,
 
     @Override
     public <DTO> Page<DTO> findPageByHelper(Page<DTO> condition) {
+        List<Order> orders = convertToOrders(condition.getSort());
+        String orderBy = null;
+        if (!CollectionUtils.isEmpty(orders)) {
+            StringJoiner stringJoiner = new StringJoiner(", ");
+            for (Order order : orders) {
+                stringJoiner.add(order.getProperty() + " " + order.getDirection().name());
+            }
+            orderBy = stringJoiner.toString();
+        }
         int pageNum = condition.getPageNum();
         int pageSize = condition.getPageSize();
-        com.github.pagehelper.Page<DTO> page = com.github.pagehelper.PageHelper.startPage(pageNum, pageSize)
+        com.github.pagehelper.Page<DTO> page = com.github.pagehelper.PageHelper.startPage(pageNum, pageSize, orderBy)
                 .doSelectPage(() -> pageHelperQuery(condition.getParam(), condition));
         Page<DTO> pageResult = new Page<>();
         pageResult.setTotalCount(Math.toIntExact(page.getTotal()))