feat(设备管理): 添加设备在线记录查询功能并优化设备列表排序

添加FindLatestDeviceOnlineRecord接口用于查询设备最新在线记录实现GetOnlineDeviceLoginTime方法获取设备登录时间优化设备列表查询按最后活动时间排序移除未使用的依赖项
2025-11-27 23:24:48 -08:00
parent 236fa6c4e6
commit 2442831cd7
12 changed files with 210 additions and 130 deletions
@@ -1,36 +1,39 @@
 package svc

 import (
-    "context"
-    "fmt"
-    "time"
+	"context"
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"strings"
+	"time"

-    "github.com/perfect-panel/server/internal/model/client"
-    "github.com/perfect-panel/server/internal/model/node"
-    "github.com/perfect-panel/server/pkg/device"
+	"github.com/perfect-panel/server/internal/model/client"
+	"github.com/perfect-panel/server/internal/model/node"
+	"github.com/perfect-panel/server/pkg/device"

-    "github.com/perfect-panel/server/internal/config"
-    "github.com/perfect-panel/server/internal/model/ads"
-    "github.com/perfect-panel/server/internal/model/announcement"
-    "github.com/perfect-panel/server/internal/model/auth"
-    "github.com/perfect-panel/server/internal/model/coupon"
-    "github.com/perfect-panel/server/internal/model/document"
-    "github.com/perfect-panel/server/internal/model/log"
-    "github.com/perfect-panel/server/internal/model/order"
-    "github.com/perfect-panel/server/internal/model/payment"
-    "github.com/perfect-panel/server/internal/model/subscribe"
-    "github.com/perfect-panel/server/internal/model/system"
-    "github.com/perfect-panel/server/internal/model/ticket"
-    "github.com/perfect-panel/server/internal/model/traffic"
-    "github.com/perfect-panel/server/internal/model/user"
-    "github.com/perfect-panel/server/pkg/limit"
-    "github.com/perfect-panel/server/pkg/nodeMultiplier"
-    "github.com/perfect-panel/server/pkg/orm"
+	"github.com/perfect-panel/server/internal/config"
+	"github.com/perfect-panel/server/internal/model/ads"
+	"github.com/perfect-panel/server/internal/model/announcement"
+	"github.com/perfect-panel/server/internal/model/auth"
+	"github.com/perfect-panel/server/internal/model/coupon"
+	"github.com/perfect-panel/server/internal/model/document"
+	"github.com/perfect-panel/server/internal/model/log"
+	"github.com/perfect-panel/server/internal/model/order"
+	"github.com/perfect-panel/server/internal/model/payment"
+	"github.com/perfect-panel/server/internal/model/subscribe"
+	"github.com/perfect-panel/server/internal/model/system"
+	"github.com/perfect-panel/server/internal/model/ticket"
+	"github.com/perfect-panel/server/internal/model/traffic"
+	"github.com/perfect-panel/server/internal/model/user"
+	"github.com/perfect-panel/server/pkg/limit"
+	"github.com/perfect-panel/server/pkg/nodeMultiplier"
+	"github.com/perfect-panel/server/pkg/orm"

-    tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
-    "github.com/hibiken/asynq"
-    "github.com/redis/go-redis/v9"
-    "gorm.io/gorm"
+	tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5"
+	"github.com/hibiken/asynq"
+	"github.com/redis/go-redis/v9"
+	"gorm.io/gorm"
 )

 type ServiceContext struct {
@@ -110,34 +113,68 @@ func NewServiceContext(c config.Config) *ServiceContext {
 		TrafficLogModel:   traffic.NewModel(db),
 		AnnouncementModel: announcement.NewModel(db, rds),
 	}
-    srv.DeviceManager = NewDeviceManager(srv)
-    return srv
+	srv.DeviceManager = NewDeviceManager(srv)
+	return srv

 }

+func (srv *ServiceContext) SessionLimit() int64 {
+	cd := srv.Config.Site.CustomData
+	if cd != "" {
+		var obj map[string]interface{}
+		if json.Unmarshal([]byte(cd), &obj) == nil {
+			if v, ok := obj["deviceLimit"]; ok {
+				switch val := v.(type) {
+				case float64:
+					if val > 0 {
+						return int64(val)
+					}
+				case string:
+					if n, err := strconv.ParseInt(strings.TrimSpace(val), 10, 64); err == nil && n > 0 {
+						return n
+					}
+				}
+			}
+			if v, ok := obj["DeviceLimit"]; ok {
+				switch val := v.(type) {
+				case float64:
+					if val > 0 {
+						return int64(val)
+					}
+				case string:
+					if n, err := strconv.ParseInt(strings.TrimSpace(val), 10, 64); err == nil && n > 0 {
+						return n
+					}
+				}
+			}
+		}
+	}
+	return srv.Config.JwtAuth.MaxSessionsPerUser
+}
+
 func (srv *ServiceContext) EnforceUserSessionLimit(ctx context.Context, userId int64, newSessionId string, max int64) error {
-    if max <= 0 {
-        return nil
-    }
-    sessionsKey := fmt.Sprintf("%s%v", config.UserSessionsKeyPrefix, userId)
-    now := time.Now().Unix()
-    if err := srv.Redis.ZAdd(ctx, sessionsKey, redis.Z{Score: float64(now), Member: newSessionId}).Err(); err != nil {
-        return err
-    }
-    count, err := srv.Redis.ZCard(ctx, sessionsKey).Result()
-    if err != nil {
-        return err
-    }
-    if count > max {
-        popped, err := srv.Redis.ZPopMin(ctx, sessionsKey, count-max).Result()
-        if err != nil {
-            return err
-        }
-        for _, z := range popped {
-            sid := fmt.Sprintf("%v", z.Member)
-            _ = srv.Redis.Del(ctx, fmt.Sprintf("%v:%v", config.SessionIdKey, sid)).Err()
-        }
-    }
-    _ = srv.Redis.Expire(ctx, sessionsKey, time.Duration(srv.Config.JwtAuth.AccessExpire)*time.Second).Err()
-    return nil
+	if max <= 0 {
+		return nil
+	}
+	sessionsKey := fmt.Sprintf("%s%v", config.UserSessionsKeyPrefix, userId)
+	now := time.Now().Unix()
+	if err := srv.Redis.ZAdd(ctx, sessionsKey, redis.Z{Score: float64(now), Member: newSessionId}).Err(); err != nil {
+		return err
+	}
+	count, err := srv.Redis.ZCard(ctx, sessionsKey).Result()
+	if err != nil {
+		return err
+	}
+	if count > max {
+		popped, err := srv.Redis.ZPopMin(ctx, sessionsKey, count-max).Result()
+		if err != nil {
+			return err
+		}
+		for _, z := range popped {
+			sid := fmt.Sprintf("%v", z.Member)
+			_ = srv.Redis.Del(ctx, fmt.Sprintf("%v:%v", config.SessionIdKey, sid)).Err()
+		}
+	}
+	_ = srv.Redis.Expire(ctx, sessionsKey, time.Duration(srv.Config.JwtAuth.AccessExpire)*time.Second).Err()
+	return nil
 }