Skip to content

Commit 8931d4b

Browse files
GoSimplicityGoSimplicity
committed
refactor: Standardize pagination parameter naming across services and enhance event list filtering logic
1 parent cd98484 commit 8931d4b

12 files changed

Lines changed: 40 additions & 55 deletions

‎internal/k8s/service/clusterrole_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (s *clusterRoleService) GetClusterRoleList(ctx context.Context, req *model.
102102

103103
// 分页处理
104104
page := req.Page
105-
size := req.PageSize
105+
size := req.Size
106106
if page <= 0 {
107107
page = 1
108108
}

‎internal/k8s/service/clusterrolebinding_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func (s *clusterRoleBindingService) GetClusterRoleBindingList(ctx context.Contex
102102
// 简单分页
103103
total := int64(len(filteredClusterRoleBindings))
104104
page := req.Page
105-
size := req.PageSize
105+
size := req.Size
106106
if page <= 0 {
107107
page = 1
108108
}

‎internal/k8s/service/event_service.go‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
"context"
3030
"fmt"
3131
"sort"
32-
"time"
3332

3433
"github.com/GoSimplicity/AI-CloudOps/internal/k8s/manager"
3534
"github.com/GoSimplicity/AI-CloudOps/internal/model"
@@ -85,26 +84,6 @@ func (s *eventService) GetEventList(ctx context.Context, req *model.GetEventList
8584
if req.EventType != "" && event.Type != req.EventType {
8685
continue
8786
}
88-
if req.Reason != "" && event.Reason != req.Reason {
89-
continue
90-
}
91-
if req.Source != "" && event.Source.Component != req.Source {
92-
continue
93-
}
94-
if req.InvolvedObjectKind != "" && event.InvolvedObject.Kind != req.InvolvedObjectKind {
95-
continue
96-
}
97-
if req.InvolvedObjectName != "" && event.InvolvedObject.Name != req.InvolvedObjectName {
98-
continue
99-
}
100-
101-
// 时间过滤
102-
if req.LimitDays > 0 {
103-
limitTime := time.Now().AddDate(0, 0, -req.LimitDays)
104-
if event.CreationTimestamp.Time.Before(limitTime) {
105-
continue
106-
}
107-
}
10887

10988
events = append(events, eventEntity)
11089
}
@@ -114,13 +93,33 @@ func (s *eventService) GetEventList(ctx context.Context, req *model.GetEventList
11493
return events[i].LastTimestamp.After(events[j].LastTimestamp)
11594
})
11695

117-
// 如果没有过滤条件，使用原始total；否则使用过滤后的数量
96+
// 如果有过滤条件，使用过滤后的数量；否则使用原始total
11897
filteredTotal := total
119-
if req.EventType != "" || req.Reason != "" || req.Source != "" ||
120-
req.InvolvedObjectKind != "" || req.InvolvedObjectName != "" || req.LimitDays > 0 {
98+
if req.EventType != "" {
12199
filteredTotal = int64(len(events))
122100
}
123101

102+
// 分页处理
103+
page := req.Page
104+
size := req.Size
105+
if page <= 0 {
106+
page = 1
107+
}
108+
if size <= 0 {
109+
size = 10 // 默认每页显示10条
110+
}
111+
112+
start := (page - 1) * size
113+
end := start + size
114+
115+
if start >= len(events) {
116+
events = []*model.K8sEvent{}
117+
} else if end > len(events) {
118+
events = events[start:]
119+
} else {
120+
events = events[start:end]
121+
}
122+
124123
return model.ListResp[*model.K8sEvent]{Items: events, Total: filteredTotal}, nil
125124
}
126125

@@ -147,10 +146,8 @@ func (s *eventService) GetEventsByObject(ctx context.Context, clusterID int, nam
147146
}
148147

149148
eventReq := &model.GetEventListReq{
150-
ClusterID: clusterID,
151-
Namespace: namespace,
152-
FieldSelector: fieldSelector,
153-
LimitDays: limitDays,
149+
ClusterID: clusterID,
150+
Namespace: namespace,
154151
}
155152

156153
return s.GetEventList(ctx, eventReq)

‎internal/k8s/service/role_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (s *roleService) GetRoleList(ctx context.Context, req *model.GetRoleListReq
9999
// 分页处理
100100
total := int64(len(filteredRoles))
101101
page := req.Page
102-
size := req.PageSize
102+
size := req.Size
103103
if page <= 0 {
104104
page = 1
105105
}

‎internal/k8s/service/rolebinding_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (s *roleBindingService) GetRoleBindingList(ctx context.Context, req *model.
7272
}
7373

7474
// 分页处理
75-
paginatedRoleBindings, err := k8sutils.PaginateK8sRoleBindings(roleBindings, req.Page, req.PageSize)
75+
paginatedRoleBindings, err := k8sutils.PaginateK8sRoleBindings(roleBindings, req.Page, req.Size)
7676
if err != nil {
7777
return model.ListResp[*model.K8sRoleBinding]{}, err
7878
}

‎internal/k8s/service/serviceaccount_service.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (s *serviceAccountService) GetServiceAccountList(ctx context.Context, req *
114114

115115
// 分页
116116
page := req.Page
117-
pageSize := req.PageSize
117+
pageSize := req.Size
118118
if page <= 0 {
119119
page = 1
120120
}

‎internal/model/k8s_clusterrole.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ import (
3131

3232
// GetClusterRoleListReq 获取ClusterRole列表请求
3333
type GetClusterRoleListReq struct {
34+
ListReq
3435
ClusterID int `json:"cluster_id" form:"cluster_id" binding:"required" comment:"集群ID"`
3536
Keyword string `json:"keyword" form:"keyword" comment:"关键字搜索"`
36-
Page int `json:"page" form:"page" comment:"页码"`
37-
PageSize int `json:"page_size" form:"page_size" comment:"页面大小"`
3837
}
3938

4039
// GetClusterRoleDetailsReq 获取ClusterRole详情请求

‎internal/model/k8s_clusterrolebinding.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ type K8sClusterRoleBinding struct {
4646

4747
// GetClusterRoleBindingListReq 获取ClusterRoleBinding列表请求
4848
type GetClusterRoleBindingListReq struct {
49+
ListReq
4950
ClusterID int `json:"cluster_id" form:"cluster_id" binding:"required" comment:"集群ID"`
5051
Keyword string `json:"keyword" form:"keyword" comment:"关键字搜索"`
51-
Page int `json:"page" form:"page" comment:"页码"`
52-
PageSize int `json:"page_size" form:"page_size" comment:"页面大小"`
5352
}
5453

5554
// GetClusterRoleBindingDetailsReq 获取ClusterRoleBinding详情请求

‎internal/model/k8s_event.go‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,11 @@ type EventTimeline struct {
175175

176176
// GetEventListReq 获取事件列表请求
177177
type GetEventListReq struct {
178-
ClusterID int `json:"cluster_id" form:"cluster_id" binding:"required" comment:"集群ID"`
179-
Namespace string `json:"namespace" form:"namespace" comment:"命名空间"`
180-
LabelSelector string `json:"label_selector" form:"label_selector" comment:"标签选择器"`
181-
FieldSelector string `json:"field_selector" form:"field_selector" comment:"字段选择器"`
182-
EventType string `json:"event_type" form:"event_type" comment:"事件类型：Normal,Warning"`
183-
Reason string `json:"reason" form:"reason" comment:"事件原因"`
184-
Source string `json:"source" form:"source" comment:"事件源组件"`
185-
InvolvedObjectKind string `json:"involved_object_kind" form:"involved_object_kind" comment:"涉及对象类型"`
186-
InvolvedObjectName string `json:"involved_object_name" form:"involved_object_name" comment:"涉及对象名称"`
187-
LimitDays int `json:"limit_days" form:"limit_days" comment:"限制天数"`
188-
Limit int64 `json:"limit" form:"limit" comment:"限制结果数量"`
189-
Continue string `json:"continue" form:"continue" comment:"分页续订令牌"`
178+
ListReq
179+
ClusterID int `json:"cluster_id" form:"cluster_id" binding:"required" comment:"集群ID"`
180+
Namespace string `json:"namespace" form:"namespace" comment:"命名空间"`
181+
LabelSelector string `json:"label_selector" form:"label_selector" comment:"标签选择器"`
182+
EventType string `json:"event_type" form:"event_type" comment:"事件类型：Normal,Warning"`
190183
}
191184

192185
// GetEventDetailReq 获取事件详情请求

‎internal/model/k8s_role.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@ import (
3131

3232
// GetRoleListReq 获取Role列表请求
3333
type GetRoleListReq struct {
34+
ListReq
3435
ClusterID int `json:"cluster_id" form:"cluster_id" binding:"required" comment:"集群ID"`
3536
Namespace string `json:"namespace" form:"namespace" comment:"命名空间"`
3637
Keyword string `json:"keyword" form:"keyword" comment:"关键字搜索"`
37-
Page int `json:"page" form:"page" comment:"页码"`
38-
PageSize int `json:"page_size" form:"page_size" comment:"页面大小"`
3938
}
4039

4140
// GetRoleDetailsReq 获取Role详情请求

0 commit comments

Comments
 (0)