active user

internal/api/msg.go

@@ -238,3 +238,7 @@ func (m *MessageApi) CheckMsgIsSendSuccess(c *gin.Context) {
 func (m *MessageApi) GetUsersOnlineStatus(c *gin.Context) {
 	a2r.Call(msg.MsgClient.GetSendMsgStatus, m.Client, c)
 }
+
+func (m *MessageApi) GetActiveUser(c *gin.Context) {
+	a2r.Call(msg.MsgClient.GetActiveUser, m.Client, c)
+}

internal/api/route.go

@@ -26,6 +26,7 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	log.ZInfo(context.Background(), "load config", "config", config.Config)
 	r.Use(gin.Recovery(), mw.CorsHandler(), mw.GinParseOperationID())
 	u := NewUserApi(discov)
+	m := NewMessageApi(discov)
 	if config.Config.Prometheus.Enable {
 		prome.NewApiRequestCounter()
 		prome.NewApiRequestFailedCounter()
@@ -117,7 +118,6 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 	//Message
 	msgGroup := r.Group("/msg", ParseToken)
 	{
-		m := NewMessageApi(discov)
 		msgGroup.POST("/newest_seq", m.GetSeq)
 		msgGroup.POST("/send_msg", m.SendMessage)
 		msgGroup.POST("/pull_msg_by_seq", m.PullMsgBySeqs)
@@ -151,7 +151,8 @@ func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.Unive
 
 	statisticsGroup := r.Group("/statistics", ParseToken)
 	{
-		statisticsGroup.POST("/user_register", u.UserRegisterCount)
+		statisticsGroup.POST("/user/register", u.UserRegisterCount)
+		statisticsGroup.POST("/user/active", m.GetActiveUser)
 	}
 	return r
 }

internal/rpc/msg/statistics.go

@@ -0,0 +1,44 @@
+package msg
+
+import (
+	"context"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/msg"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/sdkws"
+	"github.com/OpenIMSDK/Open-IM-Server/pkg/utils"
+	"time"
+)
+
+func (m *msgServer) GetActiveUser(ctx context.Context, req *msg.GetActiveUserReq) (*msg.GetActiveUserResp, error) {
+	msgCount, userCount, users, err := m.MsgDatabase.RangeUserSendCount(ctx, time.UnixMilli(req.Start), time.UnixMilli(req.End), req.Ase, req.Pagination.PageNumber, req.Pagination.ShowNumber)
+	if err != nil {
+		return nil, err
+	}
+	var pbUsers []*msg.ActiveUser
+	if len(users) > 0 {
+		userIDs := utils.Slice(users, func(e *unrelation.UserCount) string { return e.UserID })
+		userMap, err := m.User.GetUsersInfoMap(ctx, userIDs)
+		if err != nil {
+			return nil, err
+		}
+		pbUsers = make([]*msg.ActiveUser, 0, len(users))
+		for _, user := range users {
+			pbUser := userMap[user.UserID]
+			if pbUser == nil {
+				pbUser = &sdkws.UserInfo{
+					UserID:   user.UserID,
+					Nickname: user.UserID,
+				}
+			}
+			pbUsers = append(pbUsers, &msg.ActiveUser{
+				User:  pbUser,
+				Count: user.Count,
+			})
+		}
+	}
+	return &msg.GetActiveUserResp{
+		MsgCount:  msgCount,
+		UserCount: userCount,
+		Users:     pbUsers,
+	}, nil
+}