Skip to content

Commit 08aba4d

Browse files
committed
🎨 更新排序枚举,添加反向排序选项以支持更灵活的排序功能
1 parent 6065389 commit 08aba4d

File tree

4 files changed

+50
-50
lines changed

4 files changed

+50
-50
lines changed

packages/router/src/routes/system/action_log.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,30 @@ pub enum Action {
1616
/// 操作日志排序枚举
1717
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
1818
pub enum ActionLogSort {
19-
#[serde(rename = "action-")]
20-
Action,
21-
#[serde(rename = "deviceId-")]
22-
DeviceId,
23-
#[serde(rename = "id-")]
24-
Id,
25-
#[serde(rename = "ipv4-")]
26-
Ipv4,
27-
#[serde(rename = "isError-")]
28-
IsError,
2919
#[serde(rename = "action+")]
30-
SortAction,
20+
Action,
21+
#[serde(rename = "action-")]
22+
ActionReverse,
3123
#[serde(rename = "deviceId+")]
32-
SortDeviceId,
24+
DeviceId,
25+
#[serde(rename = "deviceId-")]
26+
DeviceIdReverse,
3327
#[serde(rename = "id+")]
34-
SortId,
28+
Id,
29+
#[serde(rename = "id-")]
30+
IdReverse,
3531
#[serde(rename = "ipv4+")]
36-
SortIpv4,
32+
Ipv4,
33+
#[serde(rename = "ipv4-")]
34+
Ipv4Reverse,
3735
#[serde(rename = "isError+")]
38-
SortIsError,
36+
IsError,
37+
#[serde(rename = "isError-")]
38+
IsErrorReverse,
3939
#[serde(rename = "updateTime+")]
40-
SortUpdateTime,
41-
#[serde(rename = "updateTime-")]
4240
UpdateTime,
41+
#[serde(rename = "updateTime-")]
42+
UpdateTimeReverse,
4343
}
4444

4545
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

packages/router/src/routes/system/device.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ use _utils::models::wrapper::Pagination;
99
/// 格式:字段+ 字段-
1010
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
1111
pub enum DeviceSort {
12-
#[serde(rename = "deviceId-")]
13-
DeviceId,
14-
#[serde(rename = "id-")]
15-
Id,
16-
#[serde(rename = "ipv4-")]
17-
Ipv4,
18-
#[serde(rename = "lastLoginTime-")]
19-
LastLoginTime,
2012
#[serde(rename = "deviceId+")]
21-
SortDeviceId,
13+
DeviceId,
14+
#[serde(rename = "deviceId-")]
15+
DeviceIdReverse,
2216
#[serde(rename = "id+")]
23-
SortId,
17+
Id,
18+
#[serde(rename = "id-")]
19+
IdReverse,
2420
#[serde(rename = "ipv4+")]
25-
SortIpv4,
21+
Ipv4,
22+
#[serde(rename = "ipv4-")]
23+
Ipv4Reverse,
2624
#[serde(rename = "lastLoginTime+")]
27-
SortLastLoginTime,
25+
LastLoginTime,
26+
#[serde(rename = "lastLoginTime-")]
27+
LastLoginTimeReverse,
2828
#[serde(rename = "status+")]
29-
SortStatus,
30-
#[serde(rename = "updateTime+")]
31-
SortUpdateTime,
32-
#[serde(rename = "status-")]
3329
Status,
34-
#[serde(rename = "updateTime-")]
30+
#[serde(rename = "status-")]
31+
StatusReverse,
32+
#[serde(rename = "updateTime+")]
3533
UpdateTime,
34+
#[serde(rename = "updateTime-")]
35+
UpdateTimeReverse,
3636
}
3737

3838
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

packages/router/src/routes/system/invitation.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,22 @@ pub struct InvitationListRequest {
2727
/// 邀请排序枚举
2828
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
2929
pub enum InvitationSort {
30-
#[serde(rename = "createTime-")]
31-
CreateTime,
32-
#[serde(rename = "id-")]
33-
Id,
3430
#[serde(rename = "createTime+")]
35-
SortCreateTime,
31+
CreateTime,
32+
#[serde(rename = "createTime-")]
33+
CreateTimeReverse,
3634
#[serde(rename = "id+")]
37-
SortId,
35+
Id,
36+
#[serde(rename = "id-")]
37+
IdReverse,
3838
#[serde(rename = "updateTime+")]
39-
SortUpdateTime,
40-
#[serde(rename = "username+")]
41-
SortUsername,
42-
#[serde(rename = "updateTime-")]
4339
UpdateTime,
44-
#[serde(rename = "username-")]
40+
#[serde(rename = "updateTime-")]
41+
UpdateTimeReverse,
42+
#[serde(rename = "username+")]
4543
Username,
44+
#[serde(rename = "username-")]
45+
UsernameReverse,
4646
}
4747

4848
/// 新增/更新用户邀请的请求参数

packages/router/src/routes/system/user.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ use _utils::{models::wrapper::Pagination, types::AccessPolicyItemEnum};
1414
pub enum UserSort {
1515
#[serde(rename = "createTime+")]
1616
CreateTime,
17+
#[serde(rename = "createTime-")]
18+
CreateTimeReverse,
1719
#[serde(rename = "id+")]
1820
Id,
21+
#[serde(rename = "id-")]
22+
IdReverse,
1923
#[serde(rename = "nickname+")]
2024
Nickname,
21-
#[serde(rename = "createTime-")]
22-
SortCreateTime,
23-
#[serde(rename = "id-")]
24-
SortId,
2525
#[serde(rename = "nickname-")]
26-
SortNickname,
26+
NicknameReverse,
2727
}
2828

2929
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

0 commit comments

Comments
 (0)