Skip to content

fix(dashboard): 修复用户统计错误 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yokowu merged 1 commit into from
Jul 4, 2025
Merged

fix(dashboard): 修复用户统计错误 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions backend/docs/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@
},
{
"type": "string",
"description": "用户ID，可jj",
"description": "用户ID，可选参数",
"name": "user_id",
"in": "query"
}
Expand Down Expand Up @@ -716,7 +716,7 @@
},
{
"type": "string",
"description": "用户ID，可jj",
"description": "用户ID，可选参数",
"name": "user_id",
"in": "query"
}
Expand Down Expand Up @@ -781,7 +781,7 @@
},
{
"type": "string",
"description": "用户ID，可jj",
"description": "用户ID，可选参数",
"name": "user_id",
"in": "query"
}
Expand Down Expand Up @@ -849,7 +849,7 @@
},
{
"type": "string",
"description": "用户ID，可jj",
"description": "用户ID，可选参数",
"name": "user_id",
"in": "query"
}
Expand Down Expand Up @@ -962,7 +962,7 @@
},
{
"type": "string",
"description": "用户ID，可jj",
"description": "用户ID，可选参数",
"name": "user_id",
"in": "query"
}
Expand Down
2 changes: 1 addition & 1 deletion backend/domain/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Statistics struct {
type StatisticsFilter struct {
Precision string `json:"precision" query:"precision" validate:"required,oneof=hour day" default:"day"` // 精度: "hour", "day"
Duration int `json:"duration" query:"duration" validate:"gte=24,lte=90" default:"90"` // 持续时间 (小时或天数)`
UserID string `json:"user_id,omitempty" query:"user_id"` // 用户ID，可jj
UserID string `json:"user_id,omitempty" query:"user_id"` // 用户ID，可选参数
}

func (s StatisticsFilter) StartTime() time.Time {
Expand Down
10 changes: 7 additions & 3 deletions backend/internal/dashboard/handler/v1/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func NewDashboardHandler(
g.GET("/category-stat", web.BindHandler(h.CategoryStat))
g.GET("/time-stat", web.BindHandler(h.TimeStat))
g.GET("/user-stat", web.BindHandler(h.UserStat))
g.GET("/user-events", web.BindHandler(h.UserEvents))
g.GET("/user-events", web.BaseHandler(h.UserEvents))
g.GET("/user-code-rank", web.BindHandler(h.UserCodeRank))
g.GET("/user-heatmap", web.BaseHandler(h.UserHeatmap))

Expand Down Expand Up @@ -117,8 +117,12 @@ func (h *DashboardHandler) UserStat(c *web.Context, req domain.StatisticsFilter)
// @Param filter query domain.StatisticsFilter true "筛选参数"
// @Success 200 {object} web.Resp{data=[]domain.UserEvent}
// @Router /api/v1/dashboard/user-events [get]
func (h *DashboardHandler) UserEvents(c *web.Context, req domain.StatisticsFilter) error {
userEvents, err := h.usecase.UserEvents(c.Request().Context(), req)
func (h *DashboardHandler) UserEvents(c *web.Context) error {
userEvents, err := h.usecase.UserEvents(c.Request().Context(), domain.StatisticsFilter{
Precision: "day",
Duration: 90,
UserID: c.QueryParam("user_id"),
})
if err != nil {
return err
}
Expand Down
19 changes: 14 additions & 5 deletions backend/internal/dashboard/repo/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ func (d *DashboardRepo) UserEvents(ctx context.Context, req domain.StatisticsFil
}
rs, err := d.db.Task.Query().
WithUser().
WithTaskRecords().
Where(task.ModelType(consts.ModelTypeLLM)).
Where(task.CreatedAtGTE(req.StartTime())).
Where(task.HasUserWith(user.ID(id))).
Order(task.ByCreatedAt(sql.OrderDesc())).
Expand All @@ -228,11 +230,18 @@ func (d *DashboardRepo) UserEvents(ctx context.Context, req domain.StatisticsFil
return nil, err
}

return cvt.Iter(rs, func(_ int, v *db.Task) *domain.UserEvent {
return cvt.Filter(rs, func(_ int, v *db.Task) (*domain.UserEvent, bool) {
name := ""
for _, r := range v.Edges.TaskRecords {
if r.Role == consts.ChatRoleUser {
name = r.Prompt
break
}
}
return &domain.UserEvent{
Name: v.Edges.User.Username,
Name: name,
CreatedAt: v.CreatedAt.Unix(),
}
}, name != ""
}), nil
}

Expand Down Expand Up @@ -265,7 +274,7 @@ func (d *DashboardRepo) UserStat(ctx context.Context, req domain.StatisticsFilte
if err := d.db.Task.Query().
Where(task.CreatedAtGTE(req.StartTime())).
Where(task.HasUserWith(user.ID(id))).
Where(task.WorkModeNotNil()).
Where(task.WorkModeNEQ("")).
Modify(func(s *sql.Selector) {
s.Select(
sql.As("work_mode", "category"),
Expand All @@ -280,7 +289,7 @@ func (d *DashboardRepo) UserStat(ctx context.Context, req domain.StatisticsFilte
if err := d.db.Task.Query().
Where(task.CreatedAtGTE(req.StartTime())).
Where(task.HasUserWith(user.ID(id))).
Where(task.ProgramLanguageNotNil()).
Where(task.ProgramLanguageNEQ("")).
Modify(func(s *sql.Selector) {
s.Select(
sql.As("program_language", "category"),
Expand Down
Loading