|
@@ -12,7 +12,6 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
*
|
|
*
|
|
|
* @author MrBird
|
|
* @author MrBird
|
|
|
*/
|
|
*/
|
|
|
-@SuppressWarnings("unchecked")
|
|
|
|
|
public class SortUtil {
|
|
public class SortUtil {
|
|
|
/**
|
|
/**
|
|
|
* 处理排序(分页情况下) for mybatis-plus
|
|
* 处理排序(分页情况下) for mybatis-plus
|
|
@@ -23,7 +22,7 @@ public class SortUtil {
|
|
|
* @param defaultOrder 默认排序规则
|
|
* @param defaultOrder 默认排序规则
|
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
|
*/
|
|
*/
|
|
|
- public static void handlePageSort(QueryRequest request, Page page, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
|
|
|
|
|
|
|
+ public static void handlePageSort(QueryRequest request, Page<?> page, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
|
|
|
page.setCurrent(request.getPageNum());
|
|
page.setCurrent(request.getPageNum());
|
|
|
page.setSize(request.getPageSize());
|
|
page.setSize(request.getPageSize());
|
|
|
String sortField = request.getField();
|
|
String sortField = request.getField();
|
|
@@ -55,7 +54,7 @@ public class SortUtil {
|
|
|
* @param request QueryRequest
|
|
* @param request QueryRequest
|
|
|
* @param page Page
|
|
* @param page Page
|
|
|
*/
|
|
*/
|
|
|
- public static void handlePageSort(QueryRequest request, Page page) {
|
|
|
|
|
|
|
+ public static void handlePageSort(QueryRequest request, Page<?> page) {
|
|
|
handlePageSort(request, page, null, null, false);
|
|
handlePageSort(request, page, null, null, false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -66,7 +65,7 @@ public class SortUtil {
|
|
|
* @param page Page
|
|
* @param page Page
|
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
|
*/
|
|
*/
|
|
|
- public static void handlePageSort(QueryRequest request, Page page, boolean camelToUnderscore) {
|
|
|
|
|
|
|
+ public static void handlePageSort(QueryRequest request, Page<?> page, boolean camelToUnderscore) {
|
|
|
handlePageSort(request, page, null, null, camelToUnderscore);
|
|
handlePageSort(request, page, null, null, camelToUnderscore);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -79,7 +78,7 @@ public class SortUtil {
|
|
|
* @param defaultOrder 默认排序规则
|
|
* @param defaultOrder 默认排序规则
|
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
|
*/
|
|
*/
|
|
|
- public static void handleWrapperSort(QueryRequest request, QueryWrapper wrapper, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
|
|
|
|
|
|
|
+ public static void handleWrapperSort(QueryRequest request, QueryWrapper<?> wrapper, String defaultSort, String defaultOrder, boolean camelToUnderscore) {
|
|
|
String sortField = request.getField();
|
|
String sortField = request.getField();
|
|
|
if (camelToUnderscore) {
|
|
if (camelToUnderscore) {
|
|
|
sortField = FebsUtil.camelToUnderscore(sortField);
|
|
sortField = FebsUtil.camelToUnderscore(sortField);
|
|
@@ -109,7 +108,7 @@ public class SortUtil {
|
|
|
* @param request QueryRequest
|
|
* @param request QueryRequest
|
|
|
* @param wrapper wrapper
|
|
* @param wrapper wrapper
|
|
|
*/
|
|
*/
|
|
|
- public static void handleWrapperSort(QueryRequest request, QueryWrapper wrapper) {
|
|
|
|
|
|
|
+ public static void handleWrapperSort(QueryRequest request, QueryWrapper<?> wrapper) {
|
|
|
handleWrapperSort(request, wrapper, null, null, false);
|
|
handleWrapperSort(request, wrapper, null, null, false);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -120,7 +119,7 @@ public class SortUtil {
|
|
|
* @param wrapper wrapper
|
|
* @param wrapper wrapper
|
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
* @param camelToUnderscore 是否开启驼峰转下划线
|
|
|
*/
|
|
*/
|
|
|
- public static void handleWrapperSort(QueryRequest request, QueryWrapper wrapper, boolean camelToUnderscore) {
|
|
|
|
|
|
|
+ public static void handleWrapperSort(QueryRequest request, QueryWrapper<?> wrapper, boolean camelToUnderscore) {
|
|
|
handleWrapperSort(request, wrapper, null, null, camelToUnderscore);
|
|
handleWrapperSort(request, wrapper, null, null, camelToUnderscore);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|