xieyinlu/zhilu-admin
1
0
Fork 0
mirror of https://github.com/ccmjga/zhilu-admin synced 2026-03-19 17:03:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

add field order

Browse Source
This commit is contained in:
ccmjga
2025-05-18 16:55:50 +08:00
parent 0226e329d4
commit 94a69d999b
11 changed files with 143 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/main/java/com/zl/mjga/dto/PageRequestDto.java
View File

@@ -1,8 +1,10 @@
package com.zl.mjga.dto;
import static com.zl.mjga.utils.StringCaseUtils.convertCamelCaseToSnake;
import static org.jooq.impl.DSL.field;
import static org.jooq.impl.DSL.name;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -17,11 +19,12 @@ public class PageRequestDto {
public static final String REGEX = "^[a-zA-Z][a-zA-Z0-9_]*$";
public static final String SPACE = " ";
public static final String COLON = ":";
private long page;
private long size;
@Schema(description = "排序字段", example = "name:asc,age:desc", type = "string")
private Map<String, Direction> sortBy = new HashMap<>();
public PageRequestDto(int page, int size) {
@@ -68,10 +71,12 @@ public class PageRequestDto {
}
public List<SortField<Object>> getSortFields() {
List<SortField<Object>> sortFields = sortBy.entrySet().stream()
List<SortField<Object>> sortFields =
sortBy.entrySet().stream()
.map(
(entry) ->
field(name(entry.getKey())).sort(SortOrder.valueOf(entry.getValue().getKeyword())))
(entry) ->
field(name(convertCamelCaseToSnake(entry.getKey())))
.sort(SortOrder.valueOf(entry.getValue().getKeyword())))
.toList();
if (sortFields.isEmpty()) {
return List.of(field(name("id")).sort(SortOrder.ASC));
@@ -108,7 +113,7 @@ public class PageRequestDto {
return result;
}
for (String fieldSpaceDirection : sortBy.split(",")) {
String[] fieldDirectionArray = fieldSpaceDirection.split(SPACE);
String[] fieldDirectionArray = fieldSpaceDirection.split(COLON);
if (fieldDirectionArray.length != 2) {
throw new IllegalArgumentException(
String.format(